From 2fa4d8fd0f2c29517025dfc3bebc8a5e07c3d380 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 13 Apr 2015 14:39:35 +0000
Subject: - nasty crutch removed from Options_AddPage; - HWND hwndParent
 removed from the CDlgBase constructor; - method CDlgBase::SetParent() added
 for the rare occasions where it's needed;

git-svn-id: http://svn.miranda-ng.org/main/trunk@12785 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/mir_core/src/mir_core.def   | 6 +++---
 src/mir_core/src/mir_core64.def | 7 ++++---
 src/mir_core/src/ui_utils.cpp   | 8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'src/mir_core')

diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index 8ddcd7f9ef..3809861dc2 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -641,9 +641,9 @@ mir_wstrcmpi                  @280
 ??0CDbLink@@QAE@PBD0EK@Z @639 NONAME
 ??0CDbLink@@QAE@PBD0EPA_W@Z @640 NONAME
 ??0CDlgBase@@QAE@ABV0@@Z @641 NONAME
-??0CDlgBase@@QAE@PAUHINSTANCE__@@HPAUHWND__@@@Z @642 NONAME
+??0CDlgBase@@QAE@PAUHINSTANCE__@@H@Z @642 NONAME
 ??0CProtoIntDlgBase@@QAE@ABV0@@Z @643 NONAME
-??0CProtoIntDlgBase@@QAE@PAUPROTO_INTERFACE@@HPAUHWND__@@_N@Z @644 NONAME
+??0CProtoIntDlgBase@@QAE@PAUPROTO_INTERFACE@@H_N@Z @644 NONAME
 ??1CCtrlBase@@UAE@XZ @645 NONAME
 ??1CCtrlButton@@UAE@XZ @646 NONAME
 ??1CCtrlCheck@@UAE@XZ @647 NONAME
@@ -739,7 +739,7 @@ mir_wstrcmpi                  @280
 ?DlgProc@CDlgBase@@MAEHIIJ@Z @737 NONAME
 ?DlgProc@CProtoIntDlgBase@@MAEHIIJ@Z @738 NONAME
 ?DoModal@CDlgBase@@QAEHXZ @739 NONAME
-?DynamicDlgProc@CDlgBase@@SGHPAUHWND__@@IIJ@Z @740 NONAME
+?SetParent@CDlgBase@@QAEXPAUHWND__@@@Z @740 NONAME
 ?EditLabel@CCtrlClc@@QAEXPAX@Z @741 NONAME
 ?EditLabel@CCtrlListView@@QAEPAUHWND__@@H@Z @742 NONAME
 ?EditLabel@CCtrlTreeView@@QAEPAUHWND__@@PAU_TREEITEM@@@Z @743 NONAME
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index e934009cf4..0308488cca 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -641,9 +641,9 @@ mir_wstrcmpi                  @280
 ??0CDbLink@@QEAA@PEBD0EK@Z @639 NONAME
 ??0CDbLink@@QEAA@PEBD0EPEA_W@Z @640 NONAME
 ??0CDlgBase@@QEAA@AEBV0@@Z @641 NONAME
-??0CDlgBase@@QEAA@PEAUHINSTANCE__@@HPEAUHWND__@@@Z @642 NONAME
+??0CDlgBase@@QEAA@PEAUHINSTANCE__@@H@Z @642 NONAME
 ??0CProtoIntDlgBase@@QEAA@AEBV0@@Z @643 NONAME
-??0CProtoIntDlgBase@@QEAA@PEAUPROTO_INTERFACE@@HPEAUHWND__@@_N@Z @644 NONAME
+??0CProtoIntDlgBase@@QEAA@PEAUPROTO_INTERFACE@@H_N@Z @644 NONAME
 ??1CCtrlBase@@UEAA@XZ @645 NONAME
 ??1CCtrlButton@@UEAA@XZ @646 NONAME
 ??1CCtrlCheck@@UEAA@XZ @647 NONAME
@@ -739,7 +739,7 @@ mir_wstrcmpi                  @280
 ?DlgProc@CDlgBase@@MEAA_JI_K_J@Z @737 NONAME
 ?DlgProc@CProtoIntDlgBase@@MEAA_JI_K_J@Z @738 NONAME
 ?DoModal@CDlgBase@@QEAAHXZ @739 NONAME
-?DynamicDlgProc@CDlgBase@@SA_JPEAUHWND__@@I_K_J@Z @740 NONAME
+?SetParent@CDlgBase@@QEAAXPEAUHWND__@@@Z @740 NONAME
 ?EditLabel@CCtrlClc@@QEAAXPEAX@Z @741 NONAME
 ?EditLabel@CCtrlListView@@QEAAPEAUHWND__@@H@Z @742 NONAME
 ?EditLabel@CCtrlTreeView@@QEAAPEAUHWND__@@PEAU_TREEITEM@@@Z @743 NONAME
@@ -1074,3 +1074,4 @@ ProtoWindowAdd @1071 NONAME
 ProtoWindowRemove @1072 NONAME
 Proto_IsProtocolLoaded @1073 NONAME
 Proto_RegisterModule @1074 NONAME
+
diff --git a/src/mir_core/src/ui_utils.cpp b/src/mir_core/src/ui_utils.cpp
index 22f46ea743..4f574896f8 100644
--- a/src/mir_core/src/ui_utils.cpp
+++ b/src/mir_core/src/ui_utils.cpp
@@ -29,12 +29,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #pragma comment(lib, "uxtheme")
 
-CDlgBase::CDlgBase(HINSTANCE hInst, int idDialog, HWND hwndParent) :
+CDlgBase::CDlgBase(HINSTANCE hInst, int idDialog) :
 	m_controls(1, CCtrlBase::cmp)
 {
 	m_hInst = hInst;
 	m_idDialog = idDialog;
-	m_hwndParent = hwndParent;
+	m_hwndParent = NULL;
 	m_hwnd = NULL;
 	m_first = NULL;
 	m_isModal = false;
@@ -1943,8 +1943,8 @@ void CDbLink::SaveText(TCHAR *value)
 /////////////////////////////////////////////////////////////////////////////////////////
 // Base protocol dialog
 
-CProtoIntDlgBase::CProtoIntDlgBase(PROTO_INTERFACE *proto, int idDialog, HWND parent, bool show_label) :
-	CDlgBase(::ProtoGetInstance(proto->m_szModuleName), idDialog, parent),
+CProtoIntDlgBase::CProtoIntDlgBase(PROTO_INTERFACE *proto, int idDialog, bool show_label) :
+	CDlgBase(::ProtoGetInstance(proto->m_szModuleName), idDialog),
 	m_proto_interface(proto),
 	m_show_label(show_label),
 	m_hwndStatus(NULL)
-- 
cgit v1.2.3