don't call Init() twice when dialog is created in 2 steps

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 2a0631bb54881c77cce7188157aaba0a975b0aa1..7073936cc581311f1234dcc9881693ecb6df0de2 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -35,6 +35,8 @@ public:
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {

+        Init();
+

         long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
         Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
                style | modalStyle, name);
         long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
         Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
                style | modalStyle, name);


@@ -48,7 +50,9 @@ public:
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {

-        Create(parent, id, title, pos, size, style, name);
+        Init();
+
+        (void)Create(parent, id, title, pos, size, style, name);

     }
 
     bool Create(wxWindow *parent, wxWindowID id,
     }
 
     bool Create(wxWindow *parent, wxWindowID id,

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 9563732e25903597116bfb95abb7caa94f4ecd5e..aac65148418a35998f9e67c49efeee91941ca8a6 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -173,8 +173,6 @@ void wxDialog::Init()
     m_isShown = FALSE;
     m_modalData = NULL;
     m_endModalCalled = FALSE;
     m_isShown = FALSE;
     m_modalData = NULL;
     m_endModalCalled = FALSE;

-    
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));

 }
 
 bool wxDialog::Create(wxWindow *parent,
 }
 
 bool wxDialog::Create(wxWindow *parent,


@@ -185,8 +183,6 @@ bool wxDialog::Create(wxWindow *parent,
                       long style,
                       const wxString& name)
 {
                       long style,
                       const wxString& name)
 {

-    Init();
-

     SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
 
     // save focus before doing anything which can potentially change it
     SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
 
     // save focus before doing anything which can potentially change it


@@ -197,9 +193,12 @@ bool wxDialog::Create(wxWindow *parent,
 
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
         return FALSE;
 
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
         return FALSE;

-    if (!m_hasFont)
+
+    if ( !m_hasFont )

         SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
         SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 

+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+

     return TRUE;
 }
 
     return TRUE;
 }