Added wxPGProperty::Enable() for conveniency. Refactored related code and improved...

[wxWidgets.git] / src / generic / spinctlg.cpp

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index b80e54ddb3f37066b6d756a74753625b04f9a8f1..d3c1cdb4a6d2d82dc25832b54dfc36ca3f266a9d 100644 (file)
--- 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 <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -58,9 +58,9 @@ static const wxCoord MARGIN = 2;
 class wxSpinCtrlTextGeneric : public wxTextCtrl
 {
 public:
-    wxSpinCtrlTextGeneric(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;
 
@@ -93,8 +93,8 @@ public:
     {
         if (m_spin)
         {
-            m_spin->SyncSpinToText();
-            m_spin->DoSendEvent();
+            if ( m_spin->SyncSpinToText() )
+                m_spin->DoSendEvent();
         }
 
         event.Skip();
@@ -186,7 +186,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,7 +197,7 @@ bool wxSpinCtrlGenericBase::Create(wxWindow *parent,
     m_max   = max;
     m_increment = increment;
 
-    m_textCtrl   = new wxSpinCtrlTextGeneric(this, value);
+    m_textCtrl   = new wxSpinCtrlTextGeneric(this, value, style);
     m_spinButton = new wxSpinCtrlButtonGeneric(this, style);
 
     m_spin_value = m_spinButton->GetValue();
@@ -247,8 +248,7 @@ wxSpinCtrlGenericBase::~wxSpinCtrlGenericBase()
         delete text;
     }
 
-    delete m_spinButton;
-    m_spinButton = NULL;
+    wxDELETE(m_spinButton);
 }
 
 // ----------------------------------------------------------------------------
@@ -279,11 +279,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 +317,7 @@ bool wxSpinCtrlGenericBase::Show(bool show)
     return true;
 }
 
-bool wxSpinCtrlGenericBase::Reparent(wxWindow *newParent)
+bool wxSpinCtrlGenericBase::Reparent(wxWindowBase *newParent)
 {
     if ( m_spinButton )
     {
@@ -327,8 +338,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 +347,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 +359,7 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event)
 
     m_spin_value = spin_value;
 
-    if (InRange(value) && DoSetValue(value))
+    if ( DoSetValue(value) )
         DoSendEvent();
 }
 
@@ -366,6 +372,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 +402,9 @@ void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event)
             return;
     }
 
-    if ( m_textCtrl && m_textCtrl->IsModified() )
-        SyncSpinToText();
+    value = AdjustToFitInRange(value);
+
+    SyncSpinToText();
 
     if ( DoSetValue(value) )
         DoSendEvent();
@@ -401,10 +414,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 +426,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 +445,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 +456,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 +487,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 +495,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 +524,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);
 }
@@ -542,6 +567,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);