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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 10a3a0d67d2c07348b9c6395afdf006ebc733c28..49454a1ef746fb424cc85778b42e43debf0fe222 100644 (file)
--- 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:
 class WXDLLIMPEXP_CORE wxDialogBase : public wxTopLevelWindow
 {
 public:

-    wxDialogBase() { Init(); }
+    wxDialogBase();

     virtual ~wxDialogBase() { }
 
     // define public wxDialog methods to be implemented by the derived classes
     virtual ~wxDialogBase() { }
 
     // define public wxDialog methods to be implemented by the derived classes


@@ -241,9 +241,6 @@ protected:
     static bool                         sm_layoutAdaptation;
 
 private:
     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;
     // 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 c1cc7eb7b4060c173f39bfae147288b522fff4f7..df7ecdff5981065b0610b6409f76dc6b82541ed8 100644 (file)
--- 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;
 
 wxDialogLayoutAdapter* wxDialogBase::sm_layoutAdapter = NULL;
 bool wxDialogBase::sm_layoutAdaptation = false;
 

-void wxDialogBase::Init()
+wxDialogBase::wxDialogBase()

 {
     m_returnCode = 0;
     m_affirmativeId = wxID_OK;
 {
     m_returnCode = 0;
     m_affirmativeId = wxID_OK;