From 092162bc12858d6912ea6d5371d271ceebd18c49 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sat, 24 Aug 2013 05:04:11 +0000 Subject: [PATCH] wxDialogBase only has one ctor, so just do initialization in ctor instead of Init() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dialog.h | 5 +---- src/common/dlgcmn.cpp | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/wx/dialog.h b/include/wx/dialog.h index 10a3a0d67d..49454a1ef7 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -67,7 +67,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[]; class WXDLLIMPEXP_CORE wxDialogBase : public wxTopLevelWindow { public: - wxDialogBase() { Init(); } + wxDialogBase(); virtual ~wxDialogBase() { } // define public wxDialog methods to be implemented by the derived classes @@ -241,9 +241,6 @@ protected: static bool sm_layoutAdaptation; private: - // common part of all ctors - void Init(); - // helper of GetParentForModalDialog(): returns the passed in window if it // can be used as our parent or NULL if it can't wxWindow *CheckIfCanBeUsedAsParent(wxWindow *parent) const; diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp index c1cc7eb7b4..df7ecdff59 100644 --- a/src/common/dlgcmn.cpp +++ b/src/common/dlgcmn.cpp @@ -125,7 +125,7 @@ END_EVENT_TABLE() wxDialogLayoutAdapter* wxDialogBase::sm_layoutAdapter = NULL; bool wxDialogBase::sm_layoutAdaptation = false; -void wxDialogBase::Init() +wxDialogBase::wxDialogBase() { m_returnCode = 0; m_affirmativeId = wxID_OK; -- 2.45.2