diff options
author | George Hazan <george.hazan@gmail.com> | 2015-06-25 21:53:56 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2015-06-25 21:53:56 +0000 |
commit | 06bb38dfa357a731e16980d03ab100b84e5cb989 (patch) | |
tree | 686bd8edc9e71087bb943ec3fe6dbb5193d09247 /plugins/Popup | |
parent | cc6abc9eed963a2659c121ddec136f1ab4256535 (diff) |
MS_CLUI_GETHWND & MS_CLUI_GETHWNDTREE replaced with pcli->hwndContactList & pcli->hwndContactTree respectively
git-svn-id: http://svn.miranda-ng.org/main/trunk@14386 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Popup')
-rw-r--r-- | plugins/Popup/src/headers.h | 1 | ||||
-rw-r--r-- | plugins/Popup/src/main.cpp | 3 | ||||
-rw-r--r-- | plugins/Popup/src/popup_thread.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/plugins/Popup/src/headers.h b/plugins/Popup/src/headers.h index 4db076f80a..811cefa0b2 100644 --- a/plugins/Popup/src/headers.h +++ b/plugins/Popup/src/headers.h @@ -64,6 +64,7 @@ http://miranda-ng.org/distr/ #include <win2k.h>
#include <m_clui.h>
#include <m_clist.h>
+#include <m_clistint.h>
#include <m_options.h>
#include <m_skin.h>
#include <m_langpack.h>
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index 8bd25c587d..2adce19774 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -37,6 +37,7 @@ void UpgradeDb(); static int OkToExit(WPARAM, LPARAM);
bool OptionLoaded = false;
int hLangpack = 0;
+CLIST_INTERFACE *pcli;
//===== Global variables ================================================================
HMODULE hUserDll = 0;
@@ -325,6 +326,7 @@ MIRAPI int Load(void) DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &hMainThread, THREAD_SET_CONTEXT, FALSE, 0);
mir_getLP(&pluginInfoEx);
+ mir_getCLI();
CreateServiceFunction(MS_POPUP_GETSTATUS, GetStatus);
@@ -442,6 +444,5 @@ MIRAPI int Unload(void) UnloadTreeData();
CloseHandle(hMainThread);
-
return 0;
}
diff --git a/plugins/Popup/src/popup_thread.cpp b/plugins/Popup/src/popup_thread.cpp index 2bbda488f6..a586cf3eb5 100644 --- a/plugins/Popup/src/popup_thread.cpp +++ b/plugins/Popup/src/popup_thread.cpp @@ -68,7 +68,7 @@ bool UpdatePopupPosition(PopupWnd2 *prev, PopupWnd2 *wnd) else { // Multimonitor stuff (we have more then 1)
HWND hWnd;
if (PopupOptions.Monitor == MN_MIRANDA)
- hWnd = (HWND)CallService(MS_CLUI_GETHWND, 0, 0);
+ hWnd = pcli->hwndContactList;
else // PopupOptions.Monitor == MN_ACTIVE
hWnd = GetForegroundWindow();
|