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

3 files changed, 6 insertions, 3 deletions

diff --git a/plugins/AutoShutdown/src/frame.cpp b/plugins/AutoShutdown/src/frame.cpp
index e66b12998e..fb443ccadb 100644
--- a/plugins/AutoShutdown/src/frame.cpp
+++ b/plugins/AutoShutdown/src/frame.cpp
@@ -516,7 +516,7 @@ void ShowCountdownFrame(WORD fTimeFlags)
 	                                  0, 0,

 	                                  GetSystemMetrics(SM_CXICON)+103,

 	                                  GetSystemMetrics(SM_CYICON)+2,

-	                                  (HWND)CallService(MS_CLUI_GETHWND,0,0),

+	                                  pcli->hwndContactList,

 	                                  NULL,

 	                                  hInst,

 	                                  &fTimeFlags);

@@ -538,7 +538,7 @@ void ShowCountdownFrame(WORD fTimeFlags)
 			/* HACKS TO FIX CLUI FRAMES:

 			 * *** why is CLUIFrames is horribly buggy??! *** date: sept 2005, nothing changed until sept 2006

 			 * workaround #1: MS_CLIST_FRAMES_REMOVEFRAME does not finish with destroy cycle (clist_modern, clist_nicer crashes) */

-			SendMessage((HWND)CallService(MS_CLUI_GETHWND,0,0),WM_SIZE,0,0);

+			SendMessage(pcli->hwndContactList, WM_SIZE, 0, 0);

 			/* workaround #2: drawing glitch after adding a frame (frame positioned wrongly when hidden) */

 			CallService(MS_CLIST_FRAMES_UPDATEFRAME,hFrame,FU_FMPOS|FU_FMREDRAW);

 			/* workaround #3: MS_CLIST_FRAMES_SETFRAMEOPTIONS does cause redrawing problems */

diff --git a/plugins/AutoShutdown/src/main.cpp b/plugins/AutoShutdown/src/main.cpp
index e7cdf5ac2d..480debca46 100644
--- a/plugins/AutoShutdown/src/main.cpp
+++ b/plugins/AutoShutdown/src/main.cpp
@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "stdafx.h"

 

+CLIST_INTERFACE *pcli;

 HINSTANCE hInst;

 int hLangpack;

 

@@ -68,6 +69,8 @@ extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 extern "C" __declspec(dllexport) int Load(void)

 {

 	mir_getLP(&pluginInfo);

+	mir_getCLI();

+

 	INITCOMMONCONTROLSEX icc;

 	icc.dwSize=sizeof(icc);

 	icc.dwICC=ICC_DATE_CLASSES|ICC_UPDOWN_CLASS|ICC_PROGRESS_CLASS;

diff --git a/plugins/AutoShutdown/src/shutdownsvc.cpp b/plugins/AutoShutdown/src/shutdownsvc.cpp
index a19adbb2fa..778fcd79e2 100644
--- a/plugins/AutoShutdown/src/shutdownsvc.cpp
+++ b/plugins/AutoShutdown/src/shutdownsvc.cpp
@@ -146,7 +146,7 @@ static DWORD ShutdownNow(BYTE shutdownType)
 				OutputDebugStringA("Not ready to exit. Waiting...\n"); /* tell others, all ascii */

 			}

 			/* shutdown service must be called from main thread anyway */

-			if (!DestroyWindow((HWND)CallService(MS_CLUI_GETHWND,0,0)))

+			if (!DestroyWindow(pcli->hwndContactList))

 				dwErrCode=GetLastError();

 		}

 		break;