Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-02-05 20:51:33 +00:00
parent 4b97309acc
commit 00233716e4
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/msw/dialog.h
View File

@@ -35,6 +35,8 @@ public:
long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr) const wxString& name = wxDialogNameStr)
{ {
Init();
long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ; long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
style | modalStyle, name); style | modalStyle, name);
@@ -48,7 +50,9 @@ public:
long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr) 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,

9
src/msw/dialog.cpp
View File

@@ -173,8 +173,6 @@ void wxDialog::Init()
m_isShown = FALSE; m_isShown = FALSE;
m_modalData = NULL; m_modalData = NULL;
m_endModalCalled = FALSE; 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, long style,
const wxString& name) const wxString& name)
{ {
Init();
SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG); SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
// save focus before doing anything which can potentially change it // 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) ) if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
return FALSE; 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;
} }