make sure 10.4 command-key events are routed via the wx-accelerator route as well...

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 21e2d60d974c5daf4bdb19e916a8243469c094ff..796f89efb584df931bf6755adff014c32ea464ef 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>
 // Created:     29.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -46,8 +46,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinDoubleEvent, wxNotifyEvent)
 // constants
 // ----------------------------------------------------------------------------
 
 // 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
 
 
 #define SPINCTRLBUT_MAX 32000 // large to avoid wrap around trouble
 


@@ -58,9 +62,9 @@ static const wxCoord MARGIN = 2;
 class wxSpinCtrlTextGeneric : public wxTextCtrl
 {
 public:
 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)

     {
         m_spin = spin;
 
     {
         m_spin = spin;
 


@@ -77,12 +81,6 @@ public:
         m_spin = NULL;
     }
 
         m_spin = NULL;
     }
 

-    void OnTextEnter(wxCommandEvent& event)
-    {
-        if (m_spin)
-            m_spin->OnTextEnter(event);
-    }
-

     void OnChar( wxKeyEvent &event )
     {
         if (m_spin)
     void OnChar( wxKeyEvent &event )
     {
         if (m_spin)


@@ -92,10 +90,7 @@ public:
     void OnKillFocus(wxFocusEvent& event)
     {
         if (m_spin)
     void OnKillFocus(wxFocusEvent& event)
     {
         if (m_spin)

-        {
-            m_spin->SyncSpinToText();
-            m_spin->DoSendEvent();
-        }
+            m_spin->OnTextLostFocus();

 
         event.Skip();
     }
 
         event.Skip();
     }


@@ -107,8 +102,6 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxSpinCtrlTextGeneric, wxTextCtrl)
 };
 
 BEGIN_EVENT_TABLE(wxSpinCtrlTextGeneric, wxTextCtrl)

-    EVT_TEXT_ENTER(wxID_ANY, wxSpinCtrlTextGeneric::OnTextEnter)
-

     EVT_CHAR(wxSpinCtrlTextGeneric::OnChar)
 
     EVT_KILL_FOCUS(wxSpinCtrlTextGeneric::OnKillFocus)
     EVT_CHAR(wxSpinCtrlTextGeneric::OnChar)
 
     EVT_KILL_FOCUS(wxSpinCtrlTextGeneric::OnKillFocus)


@@ -197,7 +190,7 @@ bool wxSpinCtrlGenericBase::Create(wxWindow *parent,
     m_max   = max;
     m_increment = increment;
 
     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();
     m_spinButton = new wxSpinCtrlButtonGeneric(this, style);
 
     m_spin_value = m_spinButton->GetValue();


@@ -248,8 +241,7 @@ wxSpinCtrlGenericBase::~wxSpinCtrlGenericBase()
         delete text;
     }
 
         delete text;
     }
 

-    delete m_spinButton;
-    m_spinButton = NULL;
+    wxDELETE(m_spinButton);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -271,7 +263,7 @@ void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height)
     // position the subcontrols inside the client area
     wxSize sizeBtn = m_spinButton->GetSize();
 
     // 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);
 }
     m_textCtrl->SetSize(x, y, wText, height);
     m_spinButton->SetSize(x + wText + MARGIN, y, wxDefaultCoord, height);
 }


@@ -280,11 +272,22 @@ void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height)
 // operations forwarded to the subcontrols
 // ----------------------------------------------------------------------------
 
 // operations forwarded to the subcontrols
 // ----------------------------------------------------------------------------
 

+void wxSpinCtrlGenericBase::SetFocus()
+{
+    if ( m_textCtrl )
+        m_textCtrl->SetFocus();
+}
+

 bool wxSpinCtrlGenericBase::Enable(bool enable)
 {
 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;
 
         return false;
 

+    m_isEnabled = enable;
+

     m_spinButton->Enable(enable);
     m_textCtrl->Enable(enable);
 
     m_spinButton->Enable(enable);
     m_textCtrl->Enable(enable);
 


@@ -328,8 +331,7 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event)
 
     // Sync the textctrl since the user expects that the button will modify
     // what they see in the textctrl.
 
     // 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;
 
     int spin_value = event.GetPosition();
     double step = (event.GetEventType() == wxEVT_SCROLL_LINEUP) ? 1 : -1;


@@ -338,13 +340,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);
 
     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;
-
-    // Check for over/underflow wrapping around if necessary
-    if (value < m_min)
-        value = HasFlag(wxSP_WRAP) ? m_max : m_min;
-    if (value > m_max)
-        value = HasFlag(wxSP_WRAP) ? m_min : 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
 
     // Ignore the edges when it wraps since the up/down event may be opposite
     // They are in GTK and Mac


@@ -356,15 +352,14 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event)
 
     m_spin_value = spin_value;
 
 
     m_spin_value = spin_value;
 

-    if (InRange(value) && DoSetValue(value))
+    if ( DoSetValue(value) )

         DoSendEvent();
 }
 
         DoSendEvent();
 }
 

-void wxSpinCtrlGenericBase::OnTextEnter(wxCommandEvent& event)
+void wxSpinCtrlGenericBase::OnTextLostFocus()

 {
     SyncSpinToText();
     DoSendEvent();
 {
     SyncSpinToText();
     DoSendEvent();

-    event.Skip();

 }
 
 void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event)
 }
 
 void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event)


@@ -399,8 +394,9 @@ void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event)
             return;
     }
 
             return;
     }
 

-    if ( m_textCtrl && m_textCtrl->IsModified() )
-        SyncSpinToText();
+    value = AdjustToFitInRange(value);
+
+    SyncSpinToText();

 
     if ( DoSetValue(value) )
         DoSendEvent();
 
     if ( DoSetValue(value) )
         DoSendEvent();


@@ -410,10 +406,10 @@ void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event)
 // Textctrl functions
 // ----------------------------------------------------------------------------
 
 // 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) )
 
     double textValue;
     if ( m_textCtrl->GetValue().ToDouble(&textValue) )


@@ -422,17 +418,17 @@ void wxSpinCtrlGenericBase::SyncSpinToText()
             textValue = m_max;
         else if (textValue < m_min)
             textValue = m_min;
             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);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -441,7 +437,7 @@ void wxSpinCtrlGenericBase::SyncSpinToText()
 
 void wxSpinCtrlGenericBase::SetValue(const wxString& text)
 {
 
 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) )
 
     double val;
     if ( text.ToDouble(&val) && InRange(val) )


@@ -452,12 +448,13 @@ void wxSpinCtrlGenericBase::SetValue(const wxString& text)
     {
         m_textCtrl->SetValue(text);
         m_textCtrl->SetSelection(0, -1);
     {
         m_textCtrl->SetValue(text);
         m_textCtrl->SetSelection(0, -1);

+        m_textCtrl->SetInsertionPointEnd();

     }
 }
 
 bool wxSpinCtrlGenericBase::DoSetValue(double val)
 {
     }
 }
 
 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;
 
     if (!InRange(val))
         return false;


@@ -482,6 +479,7 @@ bool wxSpinCtrlGenericBase::DoSetValue(double val)
         m_value = val;
         str.ToDouble( &m_value );    // wysiwyg for textctrl
         m_textCtrl->SetValue( str );
         m_value = val;
         str.ToDouble( &m_value );    // wysiwyg for textctrl
         m_textCtrl->SetValue( str );

+        m_textCtrl->SetInsertionPointEnd();

         m_textCtrl->DiscardEdits();
         return true;
     }
         m_textCtrl->DiscardEdits();
         return true;
     }


@@ -489,6 +487,16 @@ bool wxSpinCtrlGenericBase::DoSetValue(double val)
     return false;
 }
 
     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;
 void wxSpinCtrlGenericBase::DoSetRange(double min, double max)
 {
     m_min = min;


@@ -508,7 +516,7 @@ void wxSpinCtrlGenericBase::SetSnapToTicks(bool snap_to_ticks)
 
 void wxSpinCtrlGenericBase::SetSelection(long from, long to)
 {
 
 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);
 }
 
     m_textCtrl->SetSelection(from, to);
 }


@@ -519,8 +527,6 @@ void wxSpinCtrlGenericBase::SetSelection(long from, long to)
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxSpinCtrlGenericBase)
-

 void wxSpinCtrl::DoSendEvent()
 {
     wxSpinEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, GetId());
 void wxSpinCtrl::DoSendEvent()
 {
     wxSpinEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, GetId());


@@ -551,6 +557,11 @@ void wxSpinCtrlDouble::SetDigits(unsigned digits)
 {
     wxCHECK_RET( digits <= 20, "too many digits for wxSpinCtrlDouble" );
 
 {
     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);
     m_format.Printf(wxT("%%0.%ulf"), digits);
 
     DoSetValue(m_value);