X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3379ed3789e405f874d9db757d95346f1d378795..a0125cfc1a698be795b1d906673f5ca70505bffb:/src/generic/spinctlg.cpp?ds=sidebyside diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp index 44d209b5b9..88de174cfd 100644 --- a/src/generic/spinctlg.cpp +++ b/src/generic/spinctlg.cpp @@ -6,7 +6,7 @@ // Created: 29.01.01 // RCS-ID: $Id$ // Copyright: (c) 2001 Vadim Zeitlin -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "spinctlg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,13 +24,17 @@ #pragma hdrstop #endif -#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || \ - defined(__WXUNIVERSAL__) +// There are port-specific versions for MSW, GTK, OS/2 and Mac, so exclude the +// contents of this file in those cases +#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__) || \ + defined(__WXMAC__)) || defined(__WXUNIVERSAL__) #ifndef WX_PRECOMP #include "wx/textctrl.h" #endif //WX_PRECOMP +#if wxUSE_SPINCTRL + #include "wx/spinbutt.h" #include "wx/spinctrl.h" @@ -53,9 +53,12 @@ class wxSpinCtrlText : public wxTextCtrl { public: wxSpinCtrlText(wxSpinCtrl *spin, const wxString& value) - : wxTextCtrl(spin->GetParent(), -1, value) + : wxTextCtrl(spin->GetParent(), wxID_ANY, value) { m_spin = spin; + + // remove the default minsize, the spinctrl will have one instead + SetSizeHints(wxDefaultCoord,wxDefaultCoord); } protected: @@ -70,6 +73,15 @@ protected: event.Skip(); } + bool ProcessEvent(wxEvent &event) + { + // Hand button down events to wxSpinCtrl. Doesn't work. + if (event.GetEventType() == wxEVT_LEFT_DOWN && m_spin->ProcessEvent( event )) + return true; + + return wxTextCtrl::ProcessEvent( event ); + } + private: wxSpinCtrl *m_spin; @@ -77,7 +89,7 @@ private: }; BEGIN_EVENT_TABLE(wxSpinCtrlText, wxTextCtrl) - EVT_TEXT(-1, wxSpinCtrlText::OnTextChange) + EVT_TEXT(wxID_ANY, wxSpinCtrlText::OnTextChange) END_EVENT_TABLE() // ---------------------------------------------------------------------------- @@ -92,15 +104,24 @@ public: { m_spin = spin; - SetWindowStyle(style); + SetWindowStyle(style | wxSP_VERTICAL); + + // remove the default minsize, the spinctrl will have one instead + SetSizeHints(wxDefaultCoord,wxDefaultCoord); } protected: - void OnSpinButton(wxSpinEvent& event) + void OnSpinButton(wxSpinEvent& eventSpin) { - m_spin->SetTextValue(event.GetPosition()); + m_spin->SetTextValue(eventSpin.GetPosition()); - event.Skip(); + wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId()); + event.SetEventObject(m_spin); + event.SetInt(eventSpin.GetPosition()); + + m_spin->GetEventHandler()->ProcessEvent(event); + + eventSpin.Skip(); } private: @@ -110,7 +131,7 @@ private: }; BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton) - EVT_SPIN(-1, wxSpinCtrlButton::OnSpinButton) + EVT_SPIN(wxID_ANY, wxSpinCtrlButton::OnSpinButton) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl) @@ -140,50 +161,60 @@ bool wxSpinCtrl::Create(wxWindow *parent, int initial, const wxString& name) { - if ( !wxControl::Create(parent, id, pos, size, style, + if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, name) ) { - return FALSE; + return false; } - SetBackgroundColour(*wxRED); + // the string value overrides the numeric one (for backwards compatibility + // reasons and also because it is simpler to satisfy the string value which + // comes much sooner in the list of arguments and leave the initial + // parameter unspecified) + if ( !value.empty() ) + { + long l; + if ( value.ToLong(&l) ) + initial = l; + } m_text = new wxSpinCtrlText(this, value); m_btn = new wxSpinCtrlButton(this, style); m_btn->SetRange(min, max); m_btn->SetValue(initial); - - DoSetSize(pos.x, pos.y, size.x, size.y); + SetInitialSize(size); + Move(pos); // have to disable this window to avoid interfering it with message // processing to the text and the button... but pretend it is enabled to - // make IsEnabled() return TRUE - wxControl::Enable(FALSE); // don't use non virtual Disable() here! - m_isEnabled = TRUE; + // make IsEnabled() return true + wxControl::Enable(false); // don't use non virtual Disable() here! + m_isEnabled = true; // we don't even need to show this window itself - and not doing it avoids // that it overwrites the text control - wxControl::Show(FALSE); - m_isShown = TRUE; - - return TRUE; + wxControl::Show(false); + m_isShown = true; + return true; } wxSpinCtrl::~wxSpinCtrl() { - // delete the controls now, don't leave them alive even though they woudl + // delete the controls now, don't leave them alive even though they would // still be eventually deleted by our parent - but it will be too late, the // user code expects them to be gone now delete m_text; + m_text = NULL ; delete m_btn; + m_btn = NULL ; } // ---------------------------------------------------------------------------- // geometry // ---------------------------------------------------------------------------- -wxSize wxSpinCtrl::DoGetBestClientSize() const +wxSize wxSpinCtrl::DoGetBestSize() const { wxSize sizeBtn = m_btn->GetBestSize(), sizeText = m_text->GetBestSize(); @@ -200,7 +231,7 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height) wxCoord wText = width - sizeBtn.x; m_text->SetSize(x, y, wText, height); - m_btn->SetSize(x + wText + MARGIN, y, -1, height); + m_btn->SetSize(x + wText + MARGIN, y, wxDefaultCoord, height); } // ---------------------------------------------------------------------------- @@ -210,18 +241,18 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height) bool wxSpinCtrl::Enable(bool enable) { if ( !wxControl::Enable(enable) ) - return FALSE; + return false; m_btn->Enable(enable); m_text->Enable(enable); - return TRUE; + return true; } bool wxSpinCtrl::Show(bool show) { if ( !wxControl::Show(show) ) - return FALSE; + return false; // under GTK Show() is called the first time before we are fully // constructed @@ -231,7 +262,7 @@ bool wxSpinCtrl::Show(bool show) m_text->Show(show); } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -244,18 +275,18 @@ bool wxSpinCtrl::GetTextValue(int *val) const if ( !m_text->GetValue().ToLong(&l) ) { // not a number at all - return FALSE; + return false; } if ( l < GetMin() || l > GetMax() ) { // out of range - return FALSE; + return false; } *val = l; - return TRUE; + return true; } int wxSpinCtrl::GetValue() const @@ -287,7 +318,7 @@ void wxSpinCtrl::SetTextValue(int val) m_text->SetSelection(0, -1); // and give focus to the control! - m_text->SetFocus(); + // m_text->SetFocus(); Why???? TODO. } void wxSpinCtrl::SetValue(int val) @@ -322,4 +353,12 @@ void wxSpinCtrl::SetRange(int min, int max) m_btn->SetRange(min, max); } +void wxSpinCtrl::SetSelection(long from, long to) +{ + wxCHECK_RET( m_text, _T("invalid call to wxSpinCtrl::SetSelection") ); + + m_text->SetSelection(from, to); +} + +#endif // wxUSE_SPINCTRL #endif // !wxPort-with-native-spinctrl