diff --git a/include/wx/generic/numdlgg.h b/include/wx/generic/numdlgg.h index ac45ce915c..c98609e243 100644 --- a/include/wx/generic/numdlgg.h +++ b/include/wx/generic/numdlgg.h @@ -30,12 +30,27 @@ class WXDLLIMPEXP_CORE wxNumberEntryDialog : public wxDialog { public: + wxNumberEntryDialog() + { + m_value = m_min = m_max = 0; + } + wxNumberEntryDialog(wxWindow *parent, const wxString& message, const wxString& prompt, const wxString& caption, long value, long min, long max, - const wxPoint& pos = wxDefaultPosition); + const wxPoint& pos = wxDefaultPosition) + { + Create(parent, message, prompt, caption, value, min, max, pos); + } + + bool Create(wxWindow *parent, + const wxString& message, + const wxString& prompt, + const wxString& caption, + long value, long min, long max, + const wxPoint& pos = wxDefaultPosition); long GetValue() const { return m_value; } diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp index 8b742e7edd..6e0c74fc0e 100644 --- a/src/generic/numdlgg.cpp +++ b/src/generic/numdlgg.cpp @@ -68,7 +68,7 @@ END_EVENT_TABLE() IMPLEMENT_CLASS(wxNumberEntryDialog, wxDialog) -wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent, +bool wxNumberEntryDialog::Create(wxWindow *parent, const wxString& message, const wxString& prompt, const wxString& caption, @@ -76,10 +76,14 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent, long min, long max, const wxPoint& pos) - : wxDialog(GetParentForModalDialog(parent, 0), - wxID_ANY, caption, - pos, wxDefaultSize) { + if ( !wxDialog::Create(GetParentForModalDialog(parent, 0), + wxID_ANY, caption, + pos, wxDefaultSize) ) + { + return false; + } + m_value = value; m_max = max; m_min = min; @@ -128,6 +132,8 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent, m_spinctrl->SetFocus(); wxEndBusyCursor(); + + return true; } void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event))