X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ae2df30524bb07bcca824bd0a842bd54a305ff3..2a31049201e9c1ff9f515eb9d144ae392f4b4e5a:/src/generic/numdlgg.cpp?ds=inline diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp index 6b17ca942a..e0d39f7153 100644 --- a/src/generic/numdlgg.cpp +++ b/src/generic/numdlgg.cpp @@ -18,8 +18,8 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma interface "numdlgg.h" - #pragma implementation "numdlgg.h" + #pragma interface "numdlgg.cpp" + #pragma implementation "numdlgg.cpp" #endif // For compilers that support precompilation, includes "wx.h". @@ -45,37 +45,15 @@ #include "wx/statline.h" #endif +#include "wx/spinctrl.h" + // this is where wxGetNumberFromUser() is declared #include "wx/generic/textdlgg.h" -static void wxSplitMessage2( const wxString &message, wxWindow *parent, wxSizer* sizer ) -{ - wxString line; - for (size_t pos = 0; pos < message.Len(); pos++) - { - if (message[pos] == _T('\n')) - { - if (!line.IsEmpty()) - { - wxStaticText *s1 = new wxStaticText( parent, -1, line ); - sizer->Add( s1 ); - line = _T(""); - } - } - else - { - line += message[pos]; - } - } - - // remaining text behind last '\n' - if (!line.IsEmpty()) - { - wxStaticText *s2 = new wxStaticText( parent, -1, line ); - sizer->Add( s2 ); - } -} - +#if !wxUSE_SPINCTRL + // wxTextCtrl will do instead of wxSpinCtrl if we don't have it + #define wxSpinCtrl wxTextCtrl +#endif // ---------------------------------------------------------------------------- // private classes @@ -98,7 +76,7 @@ public: void OnCancel(wxCommandEvent& event); protected: - wxTextCtrl *m_spinctrl; // TODO replace it with wxSpinCtrl once it's done + wxSpinCtrl *m_spinctrl; long m_value, m_min, m_max; @@ -129,32 +107,31 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent, const wxPoint& pos) : wxDialog(parent, -1, caption, pos, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL) + wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL ) { m_value = value; m_max = max; m_min = min; wxBeginBusyCursor(); - - wxBox *topsizer = new wxBox( wxVERTICAL ); + + wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); // 1) text message - wxBox *textsizer = new wxBox( wxVERTICAL ); - wxSplitMessage2( message, this, textsizer ); - topsizer->Add( textsizer, 0, wxALL, 10 ); + topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 ); // 2) prompt and text ctrl - wxBox *inputsizer = new wxBox( wxHORIZONTAL ); + wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL ); // prompt if any if (!prompt.IsEmpty()) inputsizer->Add( new wxStaticText( this, -1, prompt ), 0, wxCENTER | wxLEFT, 10 ); // spin ctrl wxString valStr; - valStr.Printf(_T("%lu"), m_value); - m_spinctrl = new wxTextCtrl(this, -1, valStr, wxDefaultPosition, wxSize( 140, -1 ) ); + valStr.Printf(wxT("%lu"), m_value); + m_spinctrl = new wxSpinCtrl(this, -1, valStr, wxDefaultPosition, wxSize( 140, -1 ) ); + m_spinctrl->SetRange((int)m_min, (int)m_max); inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 ); - // add both + // add both topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 ); #if wxUSE_STATLINE @@ -162,25 +139,8 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent, topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); #endif - // 4) buttons - wxBox *buttonsizer = new wxBox( wxHORIZONTAL ); - - wxButton *ok = (wxButton *) NULL; -// if (style & wxOK) - { - ok = new wxButton( this, wxID_OK, _("OK") ); - buttonsizer->Add( ok, 0, wxLEFT|wxRIGHT, 10 ); - } - - wxButton *cancel = (wxButton *) NULL; -// if (style & wxCANCEL) - { - cancel = new wxButton( this, wxID_CANCEL, _("Cancel") ); - buttonsizer->Add( cancel, 0, wxLEFT|wxRIGHT, 10 ); - } - - topsizer->Add( buttonsizer, 0, wxCENTRE | wxALL, 10 ); + topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 ); SetSizer( topsizer ); SetAutoLayout( TRUE ); @@ -190,18 +150,22 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent, Centre( wxBOTH ); - if (ok) - ok->SetDefault(); - m_spinctrl->SetFocus(); wxEndBusyCursor(); } -void wxNumberEntryDialog::OnOK(wxCommandEvent& event) +void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { - if ( (wxSscanf(m_spinctrl->GetValue(), _T("%lu"), &m_value) != 1) || - (m_value < m_min) || (m_value > m_max) ) +#if !wxUSE_SPINCTRL + wxString tmp = m_spinctrl->GetValue(); + if ( wxSscanf(tmp, _T("%ld"), &m_value) != 1 ) + m_value = -1; + else +#else + m_value = m_spinctrl->GetValue(); +#endif + if ( m_value < m_min || m_value > m_max ) { // not a number or out of range m_value = -1; @@ -210,7 +174,7 @@ void wxNumberEntryDialog::OnOK(wxCommandEvent& event) EndModal(wxID_OK); } -void wxNumberEntryDialog::OnCancel(wxCommandEvent& event) +void wxNumberEntryDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) { m_value = -1;