From aa6e7ad7b8fd0fa24faf08eb44e5432e66fe890f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 6 Apr 2018 18:23:20 +0300 Subject: CLIST_INTERFACE::pfnEventsProcessTrayDoubleClick => Clist_EventsProcessTrayDoubleClick --- src/mir_app/src/clc.h | 2 -- src/mir_app/src/clistevents.cpp | 2 +- src/mir_app/src/clisttray.cpp | 2 +- src/mir_app/src/keyboard.cpp | 2 +- src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + 6 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h index 4b1f11877f..6a031f6e07 100644 --- a/src/mir_app/src/clc.h +++ b/src/mir_app/src/clc.h @@ -118,7 +118,6 @@ void RebuildMenuOrder(void); void fnGetDefaultFontSetting(int i, LOGFONT *lf, COLORREF * colour); void fnInvalidateDisplayNameCacheEntry(MCONTACT hContact); -ClcCacheEntry* fnGetCacheEntry(MCONTACT hContact); ClcCacheEntry* fnCreateCacheItem(MCONTACT hContact); void fnCheckCacheItem(ClcCacheEntry *p); void fnFreeCacheItem(ClcCacheEntry *p); @@ -137,7 +136,6 @@ int fnGetImlIconIndex(HICON hIcon); int fnRemoveEvent(MCONTACT hContact, MEVENT dbEvent); int EventsProcessContactDoubleClick(MCONTACT hContact); -int EventsProcessTrayDoubleClick(int); /* clistmod.c */ int fnIconFromStatusMode(const char *szProto, int status, MCONTACT hContact); diff --git a/src/mir_app/src/clistevents.cpp b/src/mir_app/src/clistevents.cpp index 0bd3951cc9..192bf7b704 100644 --- a/src/mir_app/src/clistevents.cpp +++ b/src/mir_app/src/clistevents.cpp @@ -277,7 +277,7 @@ int EventsProcessContactDoubleClick(MCONTACT hContact) return 1; } -int EventsProcessTrayDoubleClick(int index) +MIR_APP_DLL(int) Clist_EventsProcessTrayDoubleClick(int index) { BOOL click_in_first_icon = FALSE; if (g_cliEvents.getCount() == 0) diff --git a/src/mir_app/src/clisttray.cpp b/src/mir_app/src/clisttray.cpp index 72ad947983..3789bd7ce3 100644 --- a/src/mir_app/src/clisttray.cpp +++ b/src/mir_app/src/clisttray.cpp @@ -711,7 +711,7 @@ INT_PTR fnTrayIconProcessMessage(WPARAM wParam, LPARAM lParam) GetCursorPos(&pt); TrackPopupMenu(hMenu, TPM_TOPALIGN | TPM_LEFTALIGN | TPM_LEFTBUTTON, pt.x, pt.y, 0, msg->hwnd, nullptr); } - else if (EventsProcessTrayDoubleClick(msg->wParam)) + else if (Clist_EventsProcessTrayDoubleClick(msg->wParam)) cli.pfnShowHide(); } else if (msg->lParam == WM_RBUTTONUP) { diff --git a/src/mir_app/src/keyboard.cpp b/src/mir_app/src/keyboard.cpp index 5c5c47a9b1..3517ceb001 100644 --- a/src/mir_app/src/keyboard.cpp +++ b/src/mir_app/src/keyboard.cpp @@ -34,7 +34,7 @@ static INT_PTR hkHideShow(WPARAM, LPARAM) static INT_PTR hkRead(WPARAM, LPARAM) { - if (EventsProcessTrayDoubleClick(0) == 0) + if (Clist_EventsProcessTrayDoubleClick(0) == 0) return true; SetForegroundWindow(cli.hwndContactList); diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index d6d6715df8..37d849b6a3 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -556,3 +556,4 @@ Clist_TrayIconAdd @575 Clist_TraySetTimer @576 Clist_GetContactDisplayName @577 Clist_GetCacheEntry @578 +Clist_EventsProcessTrayDoubleClick @579 diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index f1ffdd88ea..9721b041c1 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -556,3 +556,4 @@ Clist_TrayIconAdd @575 Clist_TraySetTimer @576 Clist_GetContactDisplayName @577 Clist_GetCacheEntry @578 +Clist_EventsProcessTrayDoubleClick @579 -- cgit v1.2.3