X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce7fe42e848cc0c9058dae906c3a7bded50681e6..0cae0a4e1830b34fcc69cc9fa1d04b528c2a1fb4:/src/generic/spinctlg.cpp diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp index 2301503682..3da88c9404 100644 --- a/src/generic/spinctlg.cpp +++ b/src/generic/spinctlg.cpp @@ -4,7 +4,6 @@ // Author: Vadim Zeitlin // Modified by: // Created: 29.01.01 -// RCS-ID: $Id$ // Copyright: (c) 2001 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -231,7 +230,7 @@ bool wxSpinCtrlGenericBase::Create(wxWindow *parent, if ( DoTextToValue(value, &d) ) { m_value = d; - m_textCtrl->SetValue(DoValueToText(m_value)); + m_textCtrl->ChangeValue(DoValueToText(m_value)); } } @@ -284,7 +283,7 @@ wxSize wxSpinCtrlGenericBase::DoGetSizeFromTextSize(int xlen, int ylen) const wxSize tsize(xlen + sizeBtn.x + MARGIN, totalS.y); #if defined(__WXMSW__) - tsize.IncBy(0.4 * totalS.y + 4, 0); + tsize.IncBy(4*totalS.y/10 + 4, 0); #elif defined(__WXGTK__) tsize.IncBy(totalS.y + 10, 0); #endif // MSW GTK @@ -407,7 +406,7 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event) // Sync the textctrl since the user expects that the button will modify // what they see in the textctrl. - SyncSpinToText(); + SyncSpinToText(SendEvent_None); int spin_value = event.GetPosition(); double step = (event.GetEventType() == wxEVT_SCROLL_LINEUP) ? 1 : -1; @@ -428,13 +427,14 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event) m_spin_value = spin_value; - if ( DoSetValue(value) ) + // Notify about the change in wxTextCtrl too. + if ( DoSetValue(value, SendEvent_Text) ) DoSendEvent(); } void wxSpinCtrlGenericBase::OnTextLostFocus(wxFocusEvent& event) { - SyncSpinToText(); + SyncSpinToText(SendEvent_Text); DoSendEvent(); event.Skip(); @@ -474,9 +474,10 @@ void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event) value = AdjustToFitInRange(value); - SyncSpinToText(); + SyncSpinToText(SendEvent_None); - if ( DoSetValue(value) ) + // No need to send event, it was already generated by wxTextCtrl itself. + if ( DoSetValue(value, SendEvent_None) ) DoSendEvent(); } @@ -484,7 +485,7 @@ void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event) // Textctrl functions // ---------------------------------------------------------------------------- -bool wxSpinCtrlGenericBase::SyncSpinToText() +bool wxSpinCtrlGenericBase::SyncSpinToText(SendEvent sendEvent) { if ( !m_textCtrl || !m_textCtrl->IsModified() ) return false; @@ -506,7 +507,7 @@ bool wxSpinCtrlGenericBase::SyncSpinToText() // 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); + return DoSetValue(textValue, sendEvent); } // ---------------------------------------------------------------------------- @@ -520,22 +521,24 @@ void wxSpinCtrlGenericBase::SetValue(const wxString& text) double val; if ( DoTextToValue(text, &val) && InRange(val) ) { - DoSetValue(val); + DoSetValue(val, SendEvent_None); } else // not a number at all or out of range { - m_textCtrl->SetValue(text); + m_textCtrl->ChangeValue(text); m_textCtrl->SelectAll(); } } -bool wxSpinCtrlGenericBase::DoSetValue(double val) +bool wxSpinCtrlGenericBase::DoSetValue(double val, SendEvent sendEvent) { wxCHECK_MSG( m_textCtrl, false, wxT("invalid call to wxSpinCtrl::SetValue") ); - if (!InRange(val)) - return false; - + if ( val < m_min ) + val = m_min; + if ( val > m_max ) + val = m_max; + if ( m_snap_to_ticks && (m_increment != 0) ) { double snap_value = val / m_increment; @@ -555,7 +558,18 @@ bool wxSpinCtrlGenericBase::DoSetValue(double val) { if ( !DoTextToValue(str, &m_value ) ) // wysiwyg for textctrl m_value = val; - m_textCtrl->SetValue( str ); + + switch ( sendEvent ) + { + case SendEvent_None: + m_textCtrl->ChangeValue(str); + break; + + case SendEvent_Text: + m_textCtrl->SetValue(str); + break; + } + m_textCtrl->SelectAll(); m_textCtrl->DiscardEdits(); return true; @@ -577,7 +591,11 @@ double wxSpinCtrlGenericBase::AdjustToFitInRange(double value) const void wxSpinCtrlGenericBase::DoSetRange(double min, double max) { m_min = min; + if ( m_value < m_min ) + DoSetValue(m_min, SendEvent_None); m_max = max; + if ( m_value > m_max ) + DoSetValue(m_max, SendEvent_None); } void wxSpinCtrlGenericBase::DoSetIncrement(double inc) @@ -588,7 +606,7 @@ void wxSpinCtrlGenericBase::DoSetIncrement(double inc) void wxSpinCtrlGenericBase::SetSnapToTicks(bool snap_to_ticks) { m_snap_to_ticks = snap_to_ticks; - DoSetValue(m_value); + DoSetValue(m_value, SendEvent_None); } void wxSpinCtrlGenericBase::SetSelection(long from, long to) @@ -623,7 +641,7 @@ bool wxSpinCtrl::SetBase(int base) // ... but DoValueToText() after doing it. if ( hasValidVal ) - m_textCtrl->SetValue(DoValueToText(val)); + m_textCtrl->ChangeValue(DoValueToText(val)); return true; } @@ -703,7 +721,7 @@ void wxSpinCtrlDouble::SetDigits(unsigned digits) m_format.Printf(wxT("%%0.%ulf"), digits); - DoSetValue(m_value); + DoSetValue(m_value, SendEvent_None); } #endif // wxUSE_SPINBTN