X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..032e024c1c6ab6a20226604baab9d00558620e72:/src/generic/numdlgg.cpp diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp index 9fa5693a4d..16a056b257 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,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "numdlgg.cpp" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -46,47 +42,18 @@ #include "wx/statline.h" #endif -#if !defined(__WIN16__) && wxUSE_SPINCTRL +#if wxUSE_SPINCTRL #include "wx/spinctrl.h" #endif // this is where wxGetNumberFromUser() is declared -#include "wx/textdlg.h" +#include "wx/numdlg.h" #if !wxUSE_SPINCTRL // wxTextCtrl will do instead of wxSpinCtrl if we don't have it #define wxSpinCtrl wxTextCtrl #endif -// ---------------------------------------------------------------------------- -// 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: - wxSpinCtrl *m_spinctrl; - - long m_value, m_min, m_max; - -private: - DECLARE_EVENT_TABLE() -}; - // ============================================================================ // implementation // ============================================================================ @@ -100,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, @@ -108,9 +77,9 @@ 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; @@ -119,42 +88,44 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent, wxBeginBusyCursor(); wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - +#if wxUSE_STATTEXT // 1) text message topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 ); +#endif // 2) prompt and text ctrl 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(wxT("%lu"), m_value); - m_spinctrl = new wxSpinCtrl(this, -1, valStr, wxDefaultPosition, wxSize( 140, -1 ) ); -#if !defined(__WIN16__) && wxUSE_SPINCTRL - m_spinctrl->SetRange((int)m_min, (int)m_max); -#endif + 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 ); + topsizer->Add( inputsizer, 0, wxEXPAND | wxLEFT|wxRIGHT, 5 ); -#if wxUSE_STATLINE - // 3) static line - topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); -#endif - - // 4) buttons - topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 ); + // 3) buttons if any + wxSizer *buttonSizer = CreateSeparatedButtonSizer(wxOK | wxCANCEL); + if ( buttonSizer ) + { + topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder()); + } SetSizer( topsizer ); - SetAutoLayout( TRUE ); + SetAutoLayout( true ); topsizer->SetSizeHints( this ); topsizer->Fit( this ); Centre( wxBOTH ); + m_spinctrl->SetSelection(-1, -1); m_spinctrl->SetFocus(); wxEndBusyCursor(); @@ -164,8 +135,8 @@ void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { #if !wxUSE_SPINCTRL wxString tmp = m_spinctrl->GetValue(); - if ( wxSscanf(tmp, _T("%ld"), &m_value) != 1 ) - m_value = -1; + if ( wxSscanf(tmp, wxT("%ld"), &m_value) != 1 ) + EndModal(wxID_CANCEL); else #else m_value = m_spinctrl->GetValue(); @@ -174,6 +145,7 @@ void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { // not a number or out of range m_value = -1; + EndModal(wxID_CANCEL); } EndModal(wxID_OK); @@ -181,8 +153,6 @@ void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event)) void wxNumberEntryDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) { - m_value = -1; - EndModal(wxID_CANCEL); } @@ -203,9 +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