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

Add wxNumberEntryDialog default ctor and Create().

Browse Source 
Allow creating wxNumberEntryDialog in 2 steps, as most of the other classes.

Closes #15769.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-12-21 22:26:38 +00:00
parent b0a5f5ac18
commit d75c0a8cc7
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/generic/numdlgg.h
View File

@@ -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; }

14
src/generic/numdlgg.cpp
View File

@@ -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))