X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cd6a9ad50c00a94e62558a3b55e814028d81100..bf3ed077c1be511252e4f43961ac6ea51c454e90:/src/generic/spinctlg.cpp diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp index 06eeb9354e..dcb3ada436 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 licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -46,21 +46,25 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinDoubleEvent, wxNotifyEvent) // constants // ---------------------------------------------------------------------------- -// the margin between the text control and the spin -static const wxCoord MARGIN = 2; +// The margin between the text control and the spin: the value here is the same +// as the margin between the spin button and its "buddy" text control in wxMSW +// so the generic control looks similarly to the native one there, we might +// need to use different value for the other platforms (and maybe even +// determine it dynamically?). +static const wxCoord MARGIN = 1; #define SPINCTRLBUT_MAX 32000 // large to avoid wrap around trouble // ---------------------------------------------------------------------------- -// wxSpinCtrlText: text control used by spin control +// wxSpinCtrlTextGeneric: text control used by spin control // ---------------------------------------------------------------------------- -class wxSpinCtrlText : public wxTextCtrl +class wxSpinCtrlTextGeneric : public wxTextCtrl { public: - wxSpinCtrlText(wxSpinCtrlGenericBase *spin, const wxString& value) - : wxTextCtrl(spin->GetParent(), wxID_ANY, value, wxDefaultPosition, - wxDefaultSize, wxTE_NOHIDESEL|wxTE_PROCESS_ENTER) + wxSpinCtrlTextGeneric(wxSpinCtrlGenericBase *spin, const wxString& value, long style=0) + : wxTextCtrl(spin->GetParent(), wxID_ANY, value, wxDefaultPosition, wxDefaultSize, + ( style & wxALIGN_MASK ) | wxTE_NOHIDESEL | wxTE_PROCESS_ENTER) { m_spin = spin; @@ -68,7 +72,7 @@ public: SetSizeHints(wxDefaultCoord, wxDefaultCoord); } - virtual ~wxSpinCtrlText() + virtual ~wxSpinCtrlTextGeneric() { // MSW sends extra kill focus event on destroy if (m_spin) @@ -93,8 +97,8 @@ public: { if (m_spin) { - m_spin->SyncSpinToText(); - m_spin->DoSendEvent(); + if ( m_spin->SyncSpinToText() ) + m_spin->DoSendEvent(); } event.Skip(); @@ -106,22 +110,22 @@ private: DECLARE_EVENT_TABLE() }; -BEGIN_EVENT_TABLE(wxSpinCtrlText, wxTextCtrl) - EVT_TEXT_ENTER(wxID_ANY, wxSpinCtrlText::OnTextEnter) +BEGIN_EVENT_TABLE(wxSpinCtrlTextGeneric, wxTextCtrl) + EVT_TEXT_ENTER(wxID_ANY, wxSpinCtrlTextGeneric::OnTextEnter) - EVT_CHAR(wxSpinCtrlText::OnChar) + EVT_CHAR(wxSpinCtrlTextGeneric::OnChar) - EVT_KILL_FOCUS(wxSpinCtrlText::OnKillFocus) + EVT_KILL_FOCUS(wxSpinCtrlTextGeneric::OnKillFocus) END_EVENT_TABLE() // ---------------------------------------------------------------------------- -// wxSpinCtrlButton: spin button used by spin control +// wxSpinCtrlButtonGeneric: spin button used by spin control // ---------------------------------------------------------------------------- -class wxSpinCtrlButton : public wxSpinButton +class wxSpinCtrlButtonGeneric : public wxSpinButton { public: - wxSpinCtrlButton(wxSpinCtrlGenericBase *spin, int style) + wxSpinCtrlButtonGeneric(wxSpinCtrlGenericBase *spin, int style) : wxSpinButton(spin->GetParent(), wxID_ANY, wxDefaultPosition, wxDefaultSize, style | wxSP_VERTICAL) { @@ -145,9 +149,9 @@ private: DECLARE_EVENT_TABLE() }; -BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton) - EVT_SPIN_UP( wxID_ANY, wxSpinCtrlButton::OnSpinButton) - EVT_SPIN_DOWN(wxID_ANY, wxSpinCtrlButton::OnSpinButton) +BEGIN_EVENT_TABLE(wxSpinCtrlButtonGeneric, wxSpinButton) + EVT_SPIN_UP( wxID_ANY, wxSpinCtrlButtonGeneric::OnSpinButton) + EVT_SPIN_DOWN(wxID_ANY, wxSpinCtrlButtonGeneric::OnSpinButton) END_EVENT_TABLE() // ============================================================================ @@ -186,7 +190,8 @@ bool wxSpinCtrlGenericBase::Create(wxWindow *parent, // the text control borders (but we might want to use style border bits to // select the text control style) if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, - wxBORDER_NONE, wxDefaultValidator, name) ) + (style & ~wxBORDER_MASK) | wxBORDER_NONE, + wxDefaultValidator, name) ) { return false; } @@ -196,8 +201,8 @@ bool wxSpinCtrlGenericBase::Create(wxWindow *parent, m_max = max; m_increment = increment; - m_textCtrl = new wxSpinCtrlText(this, value); - m_spinButton = new wxSpinCtrlButton(this, style); + m_textCtrl = new wxSpinCtrlTextGeneric(this, value, style); + m_spinButton = new wxSpinCtrlButtonGeneric(this, style); m_spin_value = m_spinButton->GetValue(); @@ -239,16 +244,15 @@ wxSpinCtrlGenericBase::~wxSpinCtrlGenericBase() if (m_textCtrl) { - // null this since MSW sends KILL_FOCUS on deletion, see ~wxSpinCtrlText - wxDynamicCast(m_textCtrl, wxSpinCtrlText)->m_spin = NULL; + // null this since MSW sends KILL_FOCUS on deletion, see ~wxSpinCtrlTextGeneric + wxDynamicCast(m_textCtrl, wxSpinCtrlTextGeneric)->m_spin = NULL; - wxSpinCtrlText *text = (wxSpinCtrlText*)m_textCtrl; + wxSpinCtrlTextGeneric *text = (wxSpinCtrlTextGeneric*)m_textCtrl; m_textCtrl = NULL; delete text; } - delete m_spinButton; - m_spinButton = NULL; + wxDELETE(m_spinButton); } // ---------------------------------------------------------------------------- @@ -270,7 +274,7 @@ void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height) // position the subcontrols inside the client area wxSize sizeBtn = m_spinButton->GetSize(); - wxCoord wText = width - sizeBtn.x; + wxCoord wText = width - sizeBtn.x - MARGIN; m_textCtrl->SetSize(x, y, wText, height); m_spinButton->SetSize(x + wText + MARGIN, y, wxDefaultCoord, height); } @@ -279,11 +283,22 @@ void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height) // operations forwarded to the subcontrols // ---------------------------------------------------------------------------- +void wxSpinCtrlGenericBase::SetFocus() +{ + if ( m_textCtrl ) + m_textCtrl->SetFocus(); +} + bool wxSpinCtrlGenericBase::Enable(bool enable) { - if ( !wxControl::Enable(enable) ) + // Notice that we never enable this control itself, it must stay disabled + // to avoid interfering with the siblings event handling (see e.g. #12045 + // for the kind of problems which arise otherwise). + if ( enable == m_isEnabled ) return false; + m_isEnabled = enable; + m_spinButton->Enable(enable); m_textCtrl->Enable(enable); @@ -306,7 +321,7 @@ bool wxSpinCtrlGenericBase::Show(bool show) return true; } -bool wxSpinCtrlGenericBase::Reparent(wxWindow *newParent) +bool wxSpinCtrlGenericBase::Reparent(wxWindowBase *newParent) { if ( m_spinButton ) { @@ -327,8 +342,7 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event) // Sync the textctrl since the user expects that the button will modify // what they see in the textctrl. - if ( m_textCtrl && m_textCtrl->IsModified() ) - SyncSpinToText(); + SyncSpinToText(); int spin_value = event.GetPosition(); double step = (event.GetEventType() == wxEVT_SCROLL_LINEUP) ? 1 : -1; @@ -337,11 +351,7 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event) if (((spin_value >= 0) && (m_spin_value >= 0)) || ((spin_value <= 0) && (m_spin_value <= 0))) step *= abs(spin_value - m_spin_value); - double value = m_value + step*m_increment; - - // we can always reach the ends using the spinbutton - if (value < m_min) value = m_min; - if (value > m_max) value = m_max; + double value = AdjustToFitInRange(m_value + step*m_increment); // Ignore the edges when it wraps since the up/down event may be opposite // They are in GTK and Mac @@ -353,7 +363,7 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event) m_spin_value = spin_value; - if (InRange(value) && DoSetValue(value)) + if ( DoSetValue(value) ) DoSendEvent(); } @@ -366,6 +376,12 @@ void wxSpinCtrlGenericBase::OnTextEnter(wxCommandEvent& event) void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event) { + if ( !HasFlag(wxSP_ARROW_KEYS) ) + { + event.Skip(); + return; + } + double value = m_value; switch ( event.GetKeyCode() ) { @@ -390,8 +406,9 @@ void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event) return; } - if ( m_textCtrl && m_textCtrl->IsModified() ) - SyncSpinToText(); + value = AdjustToFitInRange(value); + + SyncSpinToText(); if ( DoSetValue(value) ) DoSendEvent(); @@ -401,10 +418,10 @@ void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event) // Textctrl functions // ---------------------------------------------------------------------------- -void wxSpinCtrlGenericBase::SyncSpinToText() +bool wxSpinCtrlGenericBase::SyncSpinToText() { - if (!m_textCtrl) - return; + if ( !m_textCtrl || !m_textCtrl->IsModified() ) + return false; double textValue; if ( m_textCtrl->GetValue().ToDouble(&textValue) ) @@ -413,17 +430,17 @@ void wxSpinCtrlGenericBase::SyncSpinToText() textValue = m_max; else if (textValue < m_min) textValue = m_min; - - if (m_value != textValue) - { - DoSetValue(textValue); - } } - else + else // text contents is not a valid number at all { - // textctrl is out of sync, discard and reset - DoSetValue(m_value); + // replace its contents with the last valid value + textValue = m_value; } + + // we must always set the value here, even if it's equal to m_value, as + // otherwise we could be left with an out of range value when leaving the + // text control and the current value is already m_max for example + return DoSetValue(textValue); } // ---------------------------------------------------------------------------- @@ -432,7 +449,7 @@ void wxSpinCtrlGenericBase::SyncSpinToText() void wxSpinCtrlGenericBase::SetValue(const wxString& text) { - wxCHECK_RET( m_textCtrl, _T("invalid call to wxSpinCtrl::SetValue") ); + wxCHECK_RET( m_textCtrl, wxT("invalid call to wxSpinCtrl::SetValue") ); double val; if ( text.ToDouble(&val) && InRange(val) ) @@ -443,12 +460,13 @@ void wxSpinCtrlGenericBase::SetValue(const wxString& text) { m_textCtrl->SetValue(text); m_textCtrl->SetSelection(0, -1); + m_textCtrl->SetInsertionPointEnd(); } } bool wxSpinCtrlGenericBase::DoSetValue(double val) { - wxCHECK_MSG( m_textCtrl, false, _T("invalid call to wxSpinCtrl::SetValue") ); + wxCHECK_MSG( m_textCtrl, false, wxT("invalid call to wxSpinCtrl::SetValue") ); if (!InRange(val)) return false; @@ -473,6 +491,7 @@ bool wxSpinCtrlGenericBase::DoSetValue(double val) m_value = val; str.ToDouble( &m_value ); // wysiwyg for textctrl m_textCtrl->SetValue( str ); + m_textCtrl->SetInsertionPointEnd(); m_textCtrl->DiscardEdits(); return true; } @@ -480,6 +499,16 @@ bool wxSpinCtrlGenericBase::DoSetValue(double val) return false; } +double wxSpinCtrlGenericBase::AdjustToFitInRange(double value) const +{ + if (value < m_min) + value = HasFlag(wxSP_WRAP) ? m_max : m_min; + if (value > m_max) + value = HasFlag(wxSP_WRAP) ? m_min : m_max; + + return value; +} + void wxSpinCtrlGenericBase::DoSetRange(double min, double max) { m_min = min; @@ -499,7 +528,7 @@ void wxSpinCtrlGenericBase::SetSnapToTicks(bool snap_to_ticks) void wxSpinCtrlGenericBase::SetSelection(long from, long to) { - wxCHECK_RET( m_textCtrl, _T("invalid call to wxSpinCtrl::SetSelection") ); + wxCHECK_RET( m_textCtrl, wxT("invalid call to wxSpinCtrl::SetSelection") ); m_textCtrl->SetSelection(from, to); } @@ -510,8 +539,6 @@ void wxSpinCtrlGenericBase::SetSelection(long from, long to) // wxSpinCtrl //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxSpinCtrlGenericBase) - void wxSpinCtrl::DoSendEvent() { wxSpinEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, GetId()); @@ -542,6 +569,11 @@ void wxSpinCtrlDouble::SetDigits(unsigned digits) { wxCHECK_RET( digits <= 20, "too many digits for wxSpinCtrlDouble" ); + if ( digits == m_digits ) + return; + + m_digits = digits; + m_format.Printf(wxT("%%0.%ulf"), digits); DoSetValue(m_value);