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/BasicHistory/src/HistoryWindow.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'plugins/BasicHistory/src/HistoryWindow.cpp') diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp index 98ca26771c..8fefc1062b 100644 --- a/plugins/BasicHistory/src/HistoryWindow.cpp +++ b/plugins/BasicHistory/src/HistoryWindow.cpp @@ -40,7 +40,6 @@ void ResetCList(HWND hWnd); HistoryWindow::HistoryWindow(HANDLE _hContact) : isDestroyed(true), - OldSplitterProc(0), splitterY(0), splitterOrgY(0), splitterX(0), @@ -1174,8 +1173,8 @@ void HistoryWindow::Initialise() { splitterXhWnd = GetDlgItem(hWnd, IDC_SPLITTER); splitterYhWnd = GetDlgItem(hWnd, IDC_SPLITTERV); - OldSplitterProc = (WNDPROC)SetWindowLongPtr(splitterXhWnd, GWLP_WNDPROC, (LONG_PTR) SplitterSubclassProc); - SetWindowLongPtr(splitterYhWnd, GWLP_WNDPROC, (LONG_PTR) SplitterSubclassProc); + mir_subclassWindow(splitterXhWnd, SplitterSubclassProc); + mir_subclassWindow(splitterYhWnd, SplitterSubclassProc); editWindow = GetDlgItem(hWnd, IDC_EDIT); findWindow = GetDlgItem(hWnd, IDC_FIND_TEXT); @@ -1327,10 +1326,6 @@ void HistoryWindow::Destroy() hIcon = (HICON)SendMessage(hWnd, WM_SETICON, ICON_SMALL, 0); Skin_ReleaseIcon(hIcon); - - UnregisterHotkeyControl(GetDlgItem(hWnd, IDC_SHOWHIDE)); - UnregisterHotkeyControl(GetDlgItem(hWnd, IDC_LIST_CONTACTS)); - UnregisterHotkeyControl(findWindow); isDestroyed = true; HistoryWindow::Close(this); @@ -1749,7 +1744,7 @@ LRESULT CALLBACK HistoryWindow::SplitterSubclassProc(HWND hwnd, UINT msg, WPARAM return 0; } } - return CallWindowProc(dat->OldSplitterProc, hwnd, msg, wParam, lParam); + return mir_callNextSubclass(hwnd, HistoryWindow::SplitterSubclassProc, msg, wParam, lParam); } void HistoryWindow::EnableWindows(BOOL enable) -- cgit v1.2.3