From 66cb770a982a2502456d10d73838df2b7239fd89 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 4 Mar 2013 07:23:42 +0000 Subject: new subclassing functions applied to all plugins git-svn-id: http://svn.miranda-ng.org/main/trunk@3880 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/FloatingContacts/src/main.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'plugins/FloatingContacts/src/main.cpp') diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index 900e6e7c7b..47d17555c5 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -62,9 +62,6 @@ static INT_PTR OnMainMenu_HideAll ( WPARAM wParam, LPARAM lParam ); static INT_PTR OnHotKey_HideWhenCListShow( WPARAM wParam, LPARAM lParam ); static VOID CALLBACK ToTopTimerProc ( HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime); -WNDPROC oldMirandaWndProc; - - HINSTANCE hInst = NULL; HMODULE hUserDll = NULL; HFONT hFont[FLT_FONTIDS] = {NULL}; @@ -260,12 +257,9 @@ static int OnModulesLoded( WPARAM wParam, LPARAM lParam ) hevPrebuildMenu = HookEvent( ME_CLIST_PREBUILDCONTACTMENU, OnPrebuildContactMenu ); hwndMiranda = (HWND)CallService( MS_CLUI_GETHWND, 0, 0 ); - oldMirandaWndProc = (WNDPROC)SetWindowLongPtr( hwndMiranda, GWLP_WNDPROC, (LONG)newMirandaWndProc); - - + mir_subclassWindow(hwndMiranda, newMirandaWndProc); // No thumbs yet -// pThumbsList = NULL; bEnableTip = ServiceExists("mToolTip/ShowTip"); RegisterWindowClass(); @@ -1222,5 +1216,5 @@ static LRESULT __stdcall newMirandaWndProc( HWND hwnd, UINT uMsg, WPARAM wParam, } } } - return( CallWindowProc(oldMirandaWndProc, hwnd, uMsg, wParam, lParam)); + return mir_callNextSubclass(hwnd, newMirandaWndProc, uMsg, wParam, lParam); } -- cgit v1.2.3