time to get rid of some DlgProc defined just to handle WM_SIZE issues

4 files changed, 19 insertions, 12 deletions

diff --git a/src/mir_core/src/Windows/CCtrlTreeView.cpp b/src/mir_core/src/Windows/CCtrlTreeView.cpp
index 390f1618fc..e5e97e8cd4 100644
--- a/src/mir_core/src/Windows/CCtrlTreeView.cpp
+++ b/src/mir_core/src/Windows/CCtrlTreeView.cpp
@@ -760,8 +760,8 @@ void CCtrlTreeView::SetCheckState(HTREEITEM hItem, uint32_t state)
 {	TreeView_SetCheckState(m_hwnd, hItem, state);
 }
 
-void CCtrlTreeView::SetImageList(HIMAGELIST hIml, int iImage)
-{	TreeView_SetImageList(m_hwnd, hIml, iImage);
+HIMAGELIST CCtrlTreeView::SetImageList(HIMAGELIST hIml, int iImage)
+{	return TreeView_SetImageList(m_hwnd, hIml, iImage);
 }
 
 void CCtrlTreeView::SetIndent(int iIndent)
diff --git a/src/mir_core/src/Windows/CDlgBase.cpp b/src/mir_core/src/Windows/CDlgBase.cpp
index 6eca57b417..84066de414 100644
--- a/src/mir_core/src/Windows/CDlgBase.cpp
+++ b/src/mir_core/src/Windows/CDlgBase.cpp
@@ -180,6 +180,18 @@ void CDlgBase::CreateLink(CCtrlData& ctrl, const char *szSetting, wchar_t *szVal
 /////////////////////////////////////////////////////////////////////////////////////////
 // virtual methods
 
+int CDlgBase::GlobalDlgResizer(HWND hwnd, LPARAM, UTILRESIZECONTROL *urc)
+{
+	CDlgBase *wnd = CDlgBase::Find(hwnd);
+	return (wnd == nullptr) ? 0 : wnd->Resizer(urc);
+}
+
+void CDlgBase::OnResize()
+{
+	if (m_forceResizable || (GetWindowLongPtr(m_hwnd, GWL_STYLE) & WS_THICKFRAME))
+		Utils_ResizeDialog(m_hwnd, m_pPlugin.getInst(), MAKEINTRESOURCEA(m_idDialog), GlobalDlgResizer);
+}
+
 int CDlgBase::Resizer(UTILRESIZECONTROL*)
 {
 	return RD_ANCHORX_LEFT | RD_ANCHORY_TOP;
@@ -383,8 +395,7 @@ INT_PTR CDlgBase::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 		break;
 
 	case WM_SIZE:
-		if (m_forceResizable || (GetWindowLongPtr(m_hwnd, GWL_STYLE) & WS_THICKFRAME))
-			Utils_ResizeDialog(m_hwnd, m_pPlugin.getInst(), MAKEINTRESOURCEA(m_idDialog), GlobalDlgResizer);
+		OnResize();
 		return TRUE;
 
 	case WM_TIMER:
@@ -441,12 +452,6 @@ INT_PTR CALLBACK CDlgBase::GlobalDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPA
 	return (wnd == nullptr) ? FALSE : wnd->DlgProc(msg, wParam, lParam);
 }
 
-int CDlgBase::GlobalDlgResizer(HWND hwnd, LPARAM, UTILRESIZECONTROL *urc)
-{
-	CDlgBase *wnd = CDlgBase::Find(hwnd);
-	return (wnd == nullptr) ? 0 : wnd->Resizer(urc);
-}
-
 void CDlgBase::ThemeDialogBackground(BOOL tabbed)
 {
 	EnableThemeDialogTexture(m_hwnd, (tabbed ? ETDT_ENABLE : ETDT_DISABLE) | ETDT_USETABTEXTURE);
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index 558e90dc3e..9409e6d133 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -808,7 +808,7 @@ mir_wstrcmpi                  @280
 ?SetHoverTime@CCtrlListView@@QAEXI@Z @1000 NONAME

 ?SetIconSpacing@CCtrlListView@@QAEIHH@Z @1001 NONAME

 ?SetImageList@CCtrlListView@@QAEPAU_IMAGELIST@@PAU2@H@Z @1002 NONAME

-?SetImageList@CCtrlTreeView@@QAEXPAU_IMAGELIST@@H@Z @1003 NONAME

+?SetImageList@CCtrlTreeView@@QAEPAU_IMAGELIST@@PAU2@H@Z @1003 NONAME

 ?SetIndent@CCtrlTreeView@@QAEXH@Z @1005 NONAME

 ?SetInfoTip@CCtrlListView@@QAEHPAUtagLVSETINFOTIP@@@Z @1006 NONAME

 ?SetInsertMark@CCtrlListView@@QAEHPAULVINSERTMARK@@@Z @1007 NONAME

@@ -1540,3 +1540,4 @@ Miranda_SetTerminated @1759
 Miranda_WaitOnHandle @1760

 Miranda_WaitOnHandleEx @1761

 _Utils_CorrectFontSize@4 @1762 NONAME

+?OnResize@CDlgBase@@MAEXXZ @1763 NONAME

diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index a3f03dab57..94e8c1d2a9 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -808,7 +808,7 @@ mir_wstrcmpi                  @280
 ?SetHoverTime@CCtrlListView@@QEAAXI@Z @1000 NONAME

 ?SetIconSpacing@CCtrlListView@@QEAAIHH@Z @1001 NONAME

 ?SetImageList@CCtrlListView@@QEAAPEAU_IMAGELIST@@PEAU2@H@Z @1002 NONAME

-?SetImageList@CCtrlTreeView@@QEAAXPEAU_IMAGELIST@@H@Z @1003 NONAME

+?SetImageList@CCtrlTreeView@@QEAAPEAU_IMAGELIST@@PEAU2@H@Z @1003 NONAME

 ?SetIndent@CCtrlTreeView@@QEAAXH@Z @1005 NONAME

 ?SetInfoTip@CCtrlListView@@QEAAHPEAUtagLVSETINFOTIP@@@Z @1006 NONAME

 ?SetInsertMark@CCtrlListView@@QEAAHPEAULVINSERTMARK@@@Z @1007 NONAME

@@ -1540,3 +1540,4 @@ Miranda_SetTerminated @1759
 Miranda_WaitOnHandle @1760

 Miranda_WaitOnHandleEx @1761

 Utils_CorrectFontSize @1762 NONAME

+?OnResize@CDlgBase@@MEAAXXZ @1763 NONAME