X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a33ac8fb0f5e43c89bd698618d554c6f7b8b452..2d1715aa46b210e69ddf2dd1cd1c7d2f23c4298a:/src/msw/dialog.cpp

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 9563732e25..20b10cd112 100644
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -47,18 +47,6 @@
     #include <commdlg.h>
 #endif
 
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// default dialog pos and size
-
-#define wxDIALOG_DEFAULT_X 300
-#define wxDIALOG_DEFAULT_Y 300
-
-#define wxDIALOG_DEFAULT_WIDTH 500
-#define wxDIALOG_DEFAULT_HEIGHT 500
-
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
@@ -173,8 +161,6 @@ void wxDialog::Init()
     m_isShown = FALSE;
     m_modalData = NULL;
     m_endModalCalled = FALSE;
-    
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 }
 
 bool wxDialog::Create(wxWindow *parent,
@@ -185,8 +171,6 @@ bool wxDialog::Create(wxWindow *parent,
                       long style,
                       const wxString& name)
 {
-    Init();
-
     SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
 
     // save focus before doing anything which can potentially change it
@@ -197,9 +181,12 @@ bool wxDialog::Create(wxWindow *parent,
 
     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));
 
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+
     return TRUE;
 }