X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/073478b3d0586ffc056578831a6676d2306cff48..9b49405777342458dc1666001865eef7309b6c30:/src/generic/numdlgg.cpp?ds=sidebyside diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp index bea91d2583..98e5c16734 100644 --- a/src/generic/numdlgg.cpp +++ b/src/generic/numdlgg.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: numdlgg.cpp +// Name: src/generic/numdlgg.cpp // Purpose: wxGetNumberFromUser implementation // Author: Vadim Zeitlin // Modified by: // Created: 23.07.99 // RCS-ID: $Id$ // Copyright: (c) Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,11 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma interface "numdlgg.h" - #pragma implementation "numdlgg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -29,6 +24,8 @@ #pragma hdrstop #endif +#if wxUSE_NUMBERDLG + #ifndef WX_PRECOMP #include @@ -45,66 +42,17 @@ #include "wx/statline.h" #endif -// 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 ); - } -} - - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxNumberEntryDialog : public wxDialog -{ -public: - wxNumberEntryDialog(wxWindow *parent, - const wxString& message, - const wxString& prompt, - const wxString& caption, - long value, long min, long max, - const wxPoint& pos); - - long GetValue() const { return m_value; } - - // implementation only - void OnOK(wxCommandEvent& event); - void OnCancel(wxCommandEvent& event); - -protected: - wxTextCtrl *m_spinctrl; // TODO replace it with wxSpinCtrl once it's done +#if wxUSE_SPINCTRL +#include "wx/spinctrl.h" +#endif - long m_value, m_min, m_max; +// this is where wxGetNumberFromUser() is declared +#include "wx/numdlg.h" -private: - DECLARE_EVENT_TABLE() -}; +#if !wxUSE_SPINCTRL + // wxTextCtrl will do instead of wxSpinCtrl if we don't have it + #define wxSpinCtrl wxTextCtrl +#endif // ============================================================================ // implementation @@ -119,6 +67,8 @@ BEGIN_EVENT_TABLE(wxNumberEntryDialog, wxDialog) EVT_BUTTON(wxID_CANCEL, wxNumberEntryDialog::OnCancel) END_EVENT_TABLE() +IMPLEMENT_CLASS(wxNumberEntryDialog, wxDialog) + wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent, const wxString& message, const wxString& prompt, @@ -127,92 +77,82 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent, long min, long max, const wxPoint& pos) - : wxDialog(parent, -1, caption, - pos, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL) + : wxDialog(GetParentForModalDialog(parent), + wxID_ANY, caption, + pos, wxDefaultSize) { m_value = value; m_max = max; m_min = min; wxBeginBusyCursor(); - - wxBox *topsizer = new wxBox( wxVERTICAL ); + wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); +#if wxUSE_STATTEXT // 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 ); +#endif // 2) prompt and text ctrl - wxBox *inputsizer = new wxBox( wxHORIZONTAL ); + wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL ); + +#if wxUSE_STATTEXT // prompt if any - if (!prompt.IsEmpty()) - inputsizer->Add( new wxStaticText( this, -1, prompt ), 0, wxCENTER | wxLEFT, 10 ); + if (!prompt.empty()) + inputsizer->Add( new wxStaticText( this, wxID_ANY, prompt ), 0, wxCENTER | wxLEFT, 10 ); +#endif + // spin ctrl wxString valStr; - valStr.Printf(_T("%lu"), m_value); - m_spinctrl = new wxTextCtrl(this, -1, valStr, wxDefaultPosition, wxSize( 140, -1 ) ); + valStr.Printf(wxT("%ld"), m_value); + m_spinctrl = new wxSpinCtrl(this, wxID_ANY, valStr, wxDefaultPosition, wxSize( 140, wxDefaultCoord ), wxSP_ARROW_KEYS, (int)m_min, (int)m_max, (int)m_value); inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 ); - // add both - topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 ); - -#if wxUSE_STATLINE - // 3) static line - topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); -#endif + // add both + topsizer->Add( inputsizer, 0, wxEXPAND | wxLEFT|wxRIGHT, 5 ); - - // 4) buttons - wxBox *buttonsizer = new wxBox( wxHORIZONTAL ); - - wxButton *ok = (wxButton *) NULL; -// if (style & wxOK) + // 3) buttons if any + wxSizer *buttonSizer = CreateSeparatedButtonSizer(wxOK | wxCANCEL); + if ( buttonSizer ) { - ok = new wxButton( this, wxID_OK, _("OK") ); - buttonsizer->Add( ok, 0, wxLEFT|wxRIGHT, 10 ); + topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder()); } - 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 ); + SetSizer( topsizer ); + SetAutoLayout( true ); topsizer->SetSizeHints( this ); topsizer->Fit( this ); - SetSizer( topsizer ); - SetAutoLayout( TRUE ); Centre( wxBOTH ); - if (ok) - ok->SetDefault(); - + m_spinctrl->SetSelection(-1, -1); 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 ) + EndModal(wxID_CANCEL); + 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; + EndModal(wxID_CANCEL); } EndModal(wxID_OK); } -void wxNumberEntryDialog::OnCancel(wxCommandEvent& event) +void wxNumberEntryDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) { - m_value = -1; - EndModal(wxID_CANCEL); } @@ -233,7 +173,10 @@ long wxGetNumberFromUser(const wxString& msg, { wxNumberEntryDialog dialog(parent, msg, prompt, title, value, min, max, pos); - (void)dialog.ShowModal(); + if (dialog.ShowModal() == wxID_OK) + return dialog.GetValue(); - return dialog.GetValue(); + return -1; } + +#endif // wxUSE_NUMBERDLG