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, 11 insertions, 11 deletions

diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp
index 9ec67477e1..753bf9b454 100644
--- a/protocols/Gadu-Gadu/src/image.cpp
+++ b/protocols/Gadu-Gadu/src/image.cpp
@@ -707,7 +707,7 @@ static INT_PTR CALLBACK gg_img_dlgproc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 

 void __cdecl GGPROTO::img_dlgcallthread(void *param)

 {

-	HWND hMIWnd = 0; //(HWND) CallService(MS_CLUI_GETHWND, 0, 0);

+	HWND hMIWnd = 0;

 

 	debugLogA("img_dlgcallthread(): started.");

 	GGIMAGEDLGDATA *dat = (GGIMAGEDLGDATA *)param;

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 71050641ed..22f63119f3 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -1180,17 +1180,17 @@ static void sttNickListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK*
 		break;

 

 	case IDM_CPY_NICK:

-		JabberCopyText((HWND)CallService(MS_CLUI_GETHWND, 0, 0), him->m_tszResourceName);

+		JabberCopyText(pcli->hwndContactList, him->m_tszResourceName);

 		break;

 

 	case IDM_RJID_COPY:

 	case IDM_CPY_RJID:

-		JabberCopyText((HWND)CallService(MS_CLUI_GETHWND, 0, 0), him->m_tszRealJid);

+		JabberCopyText(pcli->hwndContactList, him->m_tszRealJid);

 		break;

 

 	case IDM_CPY_INROOMJID:

 		szBuffer.Format(_T("%s/%s"), item->jid, him->m_tszResourceName);

-		JabberCopyText((HWND)CallService(MS_CLUI_GETHWND, 0, 0), szBuffer);

+		JabberCopyText(pcli->hwndContactList, szBuffer);

 		break;

 

 	case IDM_RJID_VCARD:

@@ -1220,7 +1220,7 @@ static void sttNickListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK*
 			acs.handleType = HANDLE_SEARCHRESULT;

 			acs.szProto = ppro->m_szModuleName;

 			acs.psr = &psr;

-			CallService(MS_ADDCONTACT_SHOW, (WPARAM)CallService(MS_CLUI_GETHWND, 0, 0), (LPARAM)&acs);

+			CallService(MS_ADDCONTACT_SHOW, (WPARAM)pcli->hwndContactList, (LPARAM)&acs);

 		}

 		break;

 	}

@@ -1342,11 +1342,11 @@ static void sttLogListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK* g
 		break;

 

 	case IDM_CPY_RJID:

-		JabberCopyText((HWND)CallService(MS_CLUI_GETHWND, 0, 0), item->jid);

+		JabberCopyText(pcli->hwndContactList, item->jid);

 		break;

 

 	case IDM_CPY_TOPIC:

-		JabberCopyText((HWND)CallService(MS_CLUI_GETHWND, 0, 0), item->getTemp()->m_tszStatusMessage);

+		JabberCopyText(pcli->hwndContactList, item->getTemp()->m_tszStatusMessage);

 		break;

 	}

 }

diff --git a/protocols/JabberG/src/jabber_frame.cpp b/protocols/JabberG/src/jabber_frame.cpp
index 127092a778..63ef368c46 100644
--- a/protocols/JabberG/src/jabber_frame.cpp
+++ b/protocols/JabberG/src/jabber_frame.cpp
@@ -79,7 +79,7 @@ CJabberInfoFrame::CJabberInfoFrame(CJabberProto *proto):
 		InitClass();

 

 		CLISTFrame frame = { sizeof(frame) };

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

+		HWND hwndClist = pcli->hwndContactList;

 		frame.hWnd = CreateWindowEx(0, _T("JabberInfoFrameClass"), NULL, WS_CHILD|WS_VISIBLE, 0, 0, 100, 100, hwndClist, NULL, hInst, this);

 		frame.align = alBottom;

 		frame.height = 2 * SZ_FRAMEPADDING + GetSystemMetrics(SM_CYSMICON) + SZ_LINEPADDING; // compact height by default

@@ -181,7 +181,7 @@ LRESULT CJabberInfoFrame::WndProc(UINT msg, WPARAM wParam, LPARAM lParam)
 			POINT pt = { LOWORD(lParam), HIWORD(lParam) };

 			MapWindowPoints(m_hwnd, NULL, &pt, 1);

 			HMENU hMenu = (HMENU)CallService(MS_CLIST_MENUBUILDFRAMECONTEXT, m_frameId, 0);

-			int res = TrackPopupMenu(hMenu, TPM_RETURNCMD, pt.x, pt.y, 0, (HWND)CallService(MS_CLUI_GETHWND, 0, 0), NULL);

+			int res = TrackPopupMenu(hMenu, TPM_RETURNCMD, pt.x, pt.y, 0, pcli->hwndContactList, NULL);

 			CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(res, 0), m_frameId);

 			return 0;

 		}

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 1eb5bbfb1e..68b948cff9 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -1299,7 +1299,7 @@ void CJabberProto::InfoFrame_OnTransport(CJabberInfoFrame_Event *evt)
 		HMENU hContactMenu = (HMENU)CallService(MS_CLIST_MENUBUILDCONTACT, hContact, 0);

 		POINT pt;

 		GetCursorPos(&pt);

-		int res = TrackPopupMenu(hContactMenu, TPM_RETURNCMD, pt.x, pt.y, 0, (HWND)CallService(MS_CLUI_GETHWND, 0, 0), NULL);

+		int res = TrackPopupMenu(hContactMenu, TPM_RETURNCMD, pt.x, pt.y, 0, pcli->hwndContactList, NULL);

 		CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(res, MPCF_CONTACTMENU), hContact);

 	}

 }

diff --git a/protocols/WhatsApp/src/chat.cpp b/protocols/WhatsApp/src/chat.cpp
index 766bb63425..32e3a07a40 100644
--- a/protocols/WhatsApp/src/chat.cpp
+++ b/protocols/WhatsApp/src/chat.cpp
@@ -233,7 +233,7 @@ void WhatsAppProto::AddChatUser(WAChatInfo *pInfo, const TCHAR *ptszJid)
 	acs.handleType = HANDLE_SEARCHRESULT;

 	acs.szProto = m_szModuleName;

 	acs.psr = &psr;

-	CallService(MS_ADDCONTACT_SHOW, (WPARAM)CallService(MS_CLUI_GETHWND, 0, 0), (LPARAM)&acs);

+	CallService(MS_ADDCONTACT_SHOW, (WPARAM)pcli->hwndContactList, (LPARAM)&acs);

 }

 

 void WhatsAppProto::KickChatUser(WAChatInfo *pInfo, const TCHAR *ptszJid)