X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e256c24fbe8c432b4c122d0fa2b60a59aba94f2..c895624b1353d96d7cf1f1ea9581fe81792499dc:/src/generic/numdlgg.cpp diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp index 21dcd5d23b..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 @@ -38,39 +35,24 @@ #include "wx/stattext.h" #include "wx/textctrl.h" #include "wx/intl.h" + #include "wx/sizer.h" #endif -// this is where wxGetNumberFromUser() is declared -#include "wx/generic/textdlgg.h" - -// ---------------------------------------------------------------------------- -// 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); +#if wxUSE_STATLINE + #include "wx/statline.h" +#endif -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 @@ -85,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, @@ -93,95 +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) { - // init members - // ------------ - m_value = value; m_max = max; m_min = min; - // calculate the sizes - // ------------------- - - wxArrayString lines; - wxSize sizeText = SplitTextMessage(message, &lines); - - wxSize sizeBtn = GetStandardButtonSize(); - - int wPrompt, hPrompt; - GetTextExtent(prompt, &wPrompt, &hPrompt); + wxBeginBusyCursor(); - long wText = wxMax(2*sizeBtn.GetWidth(), - wxMax(wPrompt, sizeText.GetWidth())); - long hText = GetStandardTextHeight(); - - long wDialog = 5*LAYOUT_X_MARGIN + wText + wPrompt; - long hDialog = 2*LAYOUT_Y_MARGIN + - sizeText.GetHeight() * lines.GetCount() + - 2*LAYOUT_Y_MARGIN + - hText + - 2*LAYOUT_Y_MARGIN + - sizeBtn.GetHeight() + - 2*LAYOUT_Y_MARGIN; - - // create the controls - // ------------------- - - // message - long x = 2*LAYOUT_X_MARGIN; - long y = CreateTextMessage(lines, - wxPoint(x, 2*LAYOUT_Y_MARGIN), - sizeText); + wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); +#if wxUSE_STATTEXT + // 1) text message + topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 ); +#endif - y += 2*LAYOUT_X_MARGIN; + // 2) prompt and text ctrl + wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL ); - // prompt - (void)new wxStaticText(this, -1, prompt, - wxPoint(x, y), - wxSize(wPrompt, hPrompt)); +#if wxUSE_STATTEXT + // prompt if any + 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, - wxPoint(x + wPrompt + LAYOUT_X_MARGIN, y), - wxSize(wText, hText)); - y += hText + 2*LAYOUT_X_MARGIN; - - // and buttons - CreateStandardButtons(wDialog, y, sizeBtn.GetWidth(), sizeBtn.GetHeight()); - - // set the dialog size and position - SetClientSize(wDialog, hDialog); - if ( pos == wxDefaultPosition ) + 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, 0, wxEXPAND | wxLEFT|wxRIGHT, 5 ); + + // 3) buttons if any + wxSizer *buttonSizer = CreateSeparatedButtonSizer(wxOK | wxCANCEL); + if ( buttonSizer ) { - // centre the dialog if no explicit position given - Centre(wxBOTH | wxCENTER_FRAME); + topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder()); } + SetSizer( topsizer ); + SetAutoLayout( true ); + + topsizer->SetSizeHints( this ); + topsizer->Fit( this ); + + Centre( wxBOTH ); + + 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); } @@ -202,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