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

5 files changed, 4 insertions, 18 deletions

diff --git a/src/mir_app/src/cluiservices.cpp b/src/mir_app/src/cluiservices.cpp
index cdb2577093..455c7b0614 100644
--- a/src/mir_app/src/cluiservices.cpp
+++ b/src/mir_app/src/cluiservices.cpp
@@ -25,16 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "stdafx.h"

 #include "clc.h"

 

-static INT_PTR GetHwnd(WPARAM, LPARAM)

-{

-	return (INT_PTR)cli.hwndContactList;

-}

-

-static INT_PTR GetHwndTree(WPARAM, LPARAM)

-{

-	return (INT_PTR)cli.hwndContactTree;

-}

-

 static INT_PTR GroupAdded(WPARAM wParam, LPARAM lParam)

 {

 	//CLC does this automatically unless it's a new group

@@ -126,8 +116,6 @@ static INT_PTR GetCaps(WPARAM wParam, LPARAM)
 

 void LoadCluiServices(void)

 {

-	CreateServiceFunction(MS_CLUI_GETHWND, GetHwnd);

-	CreateServiceFunction(MS_CLUI_GETHWNDTREE, GetHwndTree);

 	CreateServiceFunction(MS_CLUI_GROUPADDED, GroupAdded);

 	CreateServiceFunction(MS_CLUI_CONTACTSETICON, ContactSetIcon);

 	CreateServiceFunction(MS_CLUI_CONTACTADDED, ContactAdded);

diff --git a/src/mir_app/src/meta_addto.cpp b/src/mir_app/src/meta_addto.cpp
index 0d48ea2c34..6b461e3a82 100644
--- a/src/mir_app/src/meta_addto.cpp
+++ b/src/mir_app/src/meta_addto.cpp
@@ -218,7 +218,6 @@ static INT_PTR CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT msg, WPARAM wPa
 

 INT_PTR Meta_AddTo(WPARAM hContact, LPARAM)

 {

-	HWND clui = (HWND)CallService(MS_CLUI_GETHWND, 0, 0);

-	DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_METASELECT), clui, &Meta_SelectDialogProc, hContact);

+	DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_METASELECT), cli.hwndContactList, &Meta_SelectDialogProc, hContact);

 	return 0;

 }

diff --git a/src/mir_app/src/meta_edit.cpp b/src/mir_app/src/meta_edit.cpp
index b82d3f531c..75becf41ab 100644
--- a/src/mir_app/src/meta_edit.cpp
+++ b/src/mir_app/src/meta_edit.cpp
@@ -446,7 +446,6 @@ static INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wPara
 

 INT_PTR Meta_Edit(WPARAM wParam, LPARAM)

 {

-	HWND clui = (HWND)CallService(MS_CLUI_GETHWND, 0, 0);

-	DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_METAEDIT), clui, Meta_EditDialogProc, (LPARAM)wParam);

+	DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_METAEDIT), cli.hwndContactList, Meta_EditDialogProc, (LPARAM)wParam);

 	return 0;

 }

diff --git a/src/mir_app/src/meta_menu.cpp b/src/mir_app/src/meta_menu.cpp
index 2c04f2d3d4..d4bb4734ae 100644
--- a/src/mir_app/src/meta_menu.cpp
+++ b/src/mir_app/src/meta_menu.cpp
@@ -190,7 +190,7 @@ INT_PTR Meta_Delete(WPARAM hContact, LPARAM bSkipQuestion)
 	if (cc->IsMeta()) {

 		// check from recursion - see second half of this function

 		if (!bSkipQuestion && IDYES != 

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

+			MessageBox(cli.hwndContactList,

 				TranslateT("This will remove the metacontact permanently.\n\nProceed anyway?"),

 				TranslateT("Are you sure?"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON2))

 			return 0;

diff --git a/src/mir_app/src/meta_services.cpp b/src/mir_app/src/meta_services.cpp
index 20b09ae5c4..6bb8e3a315 100644
--- a/src/mir_app/src/meta_services.cpp
+++ b/src/mir_app/src/meta_services.cpp
@@ -663,7 +663,7 @@ static VOID CALLBACK sttMenuThread(PVOID param)
 

 	TPMPARAMS tpmp = { 0 };

 	tpmp.cbSize = sizeof(tpmp);

-	BOOL menuRet = TrackPopupMenuEx(hMenu, TPM_RETURNCMD, menuMousePoint.x, menuMousePoint.y, (HWND)CallService(MS_CLUI_GETHWND, 0, 0), &tpmp);

+	BOOL menuRet = TrackPopupMenuEx(hMenu, TPM_RETURNCMD, menuMousePoint.x, menuMousePoint.y, cli.hwndContactList, &tpmp);

 

 	CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(menuRet), MPCF_CONTACTMENU), (LPARAM)param);