Add code showing stereo support to the OpenGL cube sample.

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index a6b11fece1d7080a80e1ae94fece8b220171568f..3da88c94041d1b829199e35b6653378014ef2d88 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.01.01
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.01.01

-// RCS-ID:      $Id$

 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -64,7 +63,7 @@ class wxSpinCtrlTextGeneric : public wxTextCtrl
 {
 public:
     wxSpinCtrlTextGeneric(wxSpinCtrlGenericBase *spin, const wxString& value, long style=0)
 {
 public:
     wxSpinCtrlTextGeneric(wxSpinCtrlGenericBase *spin, const wxString& value, long style=0)

-        : wxTextCtrl(spin->GetParent(), wxID_ANY, value, wxDefaultPosition, wxDefaultSize,
+        : wxTextCtrl(spin, wxID_ANY, value, wxDefaultPosition, wxDefaultSize,

                      // This is tricky: we want to honour any alignment flags
                      // but not wxALIGN_CENTER_VERTICAL because it's the same
                      // as wxTE_PASSWORD and we definitely don't want to show
                      // This is tricky: we want to honour any alignment flags
                      // but not wxALIGN_CENTER_VERTICAL because it's the same
                      // as wxTE_PASSWORD and we definitely don't want to show


@@ -92,10 +91,8 @@ public:
             event.Skip();
     }
 
             event.Skip();
     }
 

-    void OnTextEnter(wxCommandEvent& event)
+    void OnTextEvent(wxCommandEvent& event)

     {
     {

-        // We need to forward this event to the spin control itself as it's
-        // supposed to generate it if wxTE_PROCESS_ENTER is used with it.

         wxCommandEvent eventCopy(event);
         eventCopy.SetEventObject(m_spin);
         eventCopy.SetId(m_spin->GetId());
         wxCommandEvent eventCopy(event);
         eventCopy.SetEventObject(m_spin);
         eventCopy.SetId(m_spin->GetId());


@@ -118,7 +115,15 @@ private:
 
 BEGIN_EVENT_TABLE(wxSpinCtrlTextGeneric, wxTextCtrl)
     EVT_CHAR(wxSpinCtrlTextGeneric::OnChar)
 
 BEGIN_EVENT_TABLE(wxSpinCtrlTextGeneric, wxTextCtrl)
     EVT_CHAR(wxSpinCtrlTextGeneric::OnChar)

-    EVT_TEXT_ENTER(wxID_ANY, wxSpinCtrlTextGeneric::OnTextEnter)
+
+    // Forward the text events to wxSpinCtrl itself adjusting them slightly in
+    // the process.
+    EVT_TEXT(wxID_ANY, wxSpinCtrlTextGeneric::OnTextEvent)
+
+    // And we need to forward this one too as wxSpinCtrl is supposed to
+    // generate it if wxTE_PROCESS_ENTER is used with it (and if it isn't,
+    // we're never going to get EVT_TEXT_ENTER in the first place).
+    EVT_TEXT_ENTER(wxID_ANY, wxSpinCtrlTextGeneric::OnTextEvent)

 
     EVT_KILL_FOCUS(wxSpinCtrlTextGeneric::OnKillFocus)
 END_EVENT_TABLE()
 
     EVT_KILL_FOCUS(wxSpinCtrlTextGeneric::OnKillFocus)
 END_EVENT_TABLE()


@@ -131,7 +136,7 @@ class wxSpinCtrlButtonGeneric : public wxSpinButton
 {
 public:
     wxSpinCtrlButtonGeneric(wxSpinCtrlGenericBase *spin, int style)
 {
 public:
     wxSpinCtrlButtonGeneric(wxSpinCtrlGenericBase *spin, int style)

-        : wxSpinButton(spin->GetParent(), wxID_ANY, wxDefaultPosition,
+        : wxSpinButton(spin, wxID_ANY, wxDefaultPosition,

                        wxDefaultSize, style | wxSP_VERTICAL)
     {
         m_spin = spin;
                        wxDefaultSize, style | wxSP_VERTICAL)
     {
         m_spin = spin;


@@ -207,6 +212,7 @@ bool wxSpinCtrlGenericBase::Create(wxWindow *parent,
 
     m_textCtrl   = new wxSpinCtrlTextGeneric(this, value, style);
     m_spinButton = new wxSpinCtrlButtonGeneric(this, style);
 
     m_textCtrl   = new wxSpinCtrlTextGeneric(this, value, style);
     m_spinButton = new wxSpinCtrlButtonGeneric(this, style);

+

 #if wxUSE_TOOLTIPS
     m_textCtrl->SetToolTip(GetToolTipText());
     m_spinButton->SetToolTip(GetToolTipText());
 #if wxUSE_TOOLTIPS
     m_textCtrl->SetToolTip(GetToolTipText());
     m_spinButton->SetToolTip(GetToolTipText());


@@ -224,23 +230,13 @@ bool wxSpinCtrlGenericBase::Create(wxWindow *parent,
         if ( DoTextToValue(value, &d) )
         {
             m_value = d;
         if ( DoTextToValue(value, &d) )
         {
             m_value = d;

-            m_textCtrl->SetValue(DoValueToText(m_value));
+            m_textCtrl->ChangeValue(DoValueToText(m_value));

         }
     }
 
     SetInitialSize(size);
     Move(pos);
 
         }
     }
 
     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;
-
-    // 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;
 }
 
     return true;
 }
 


@@ -263,16 +259,40 @@ wxSpinCtrlGenericBase::~wxSpinCtrlGenericBase()
     wxDELETE(m_spinButton);
 }
 
     wxDELETE(m_spinButton);
 }
 

+wxWindowList wxSpinCtrlGenericBase::GetCompositeWindowParts() const
+{
+    wxWindowList parts;
+    parts.push_back(m_textCtrl);
+    parts.push_back(m_spinButton);
+    return parts;
+}
+

 // ----------------------------------------------------------------------------
 // geometry
 // ----------------------------------------------------------------------------
 
 wxSize wxSpinCtrlGenericBase::DoGetBestSize() const
 {
 // ----------------------------------------------------------------------------
 // geometry
 // ----------------------------------------------------------------------------
 
 wxSize wxSpinCtrlGenericBase::DoGetBestSize() const
 {

-    wxSize sizeBtn  = m_spinButton->GetBestSize(),
-           sizeText = m_textCtrl->GetBestSize();
+    return DoGetSizeFromTextSize(m_textCtrl->GetBestSize().x, -1);
+}
+
+wxSize wxSpinCtrlGenericBase::DoGetSizeFromTextSize(int xlen, int ylen) const
+{
+    wxSize sizeBtn  = m_spinButton->GetBestSize();
+    wxSize totalS( m_textCtrl->GetBestSize() );

 
 

-    return wxSize(sizeBtn.x + sizeText.x + MARGIN, sizeText.y);
+    wxSize tsize(xlen + sizeBtn.x + MARGIN, totalS.y);
+#if defined(__WXMSW__)
+    tsize.IncBy(4*totalS.y/10 + 4, 0);
+#elif defined(__WXGTK__)
+    tsize.IncBy(totalS.y + 10, 0);
+#endif // MSW GTK
+
+    // Check if the user requested a non-standard height.
+    if ( ylen > 0 )
+        tsize.IncBy(0, ylen - GetCharHeight());
+
+    return tsize;

 }
 
 void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height)
 }
 
 void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height)


@@ -283,8 +303,8 @@ void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height)
     wxSize sizeBtn = m_spinButton->GetSize();
 
     wxCoord wText = width - sizeBtn.x - MARGIN;
     wxSize sizeBtn = m_spinButton->GetSize();
 
     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(0, 0, wText, height);
+    m_spinButton->SetSize(0 + wText + MARGIN, 0, wxDefaultCoord, height);

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


@@ -301,11 +321,7 @@ void wxSpinCtrlGenericBase::SetFocus()
 
 void wxSpinCtrlGenericBase::DoEnable(bool enable)
 {
 
 void wxSpinCtrlGenericBase::DoEnable(bool enable)
 {

-    // 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 )
-        wxSpinCtrlBase::DoEnable(enable);
+     wxSpinCtrlBase::DoEnable(enable);

 }
 
 #endif // __WXMSW__
 }
 
 #endif // __WXMSW__


@@ -364,6 +380,17 @@ void wxSpinCtrlGenericBase::DoSetToolTip(wxToolTip *tip)
 }
 #endif // wxUSE_TOOLTIPS
 
 }
 #endif // wxUSE_TOOLTIPS
 

+bool wxSpinCtrlGenericBase::SetBackgroundColour(const wxColour& colour)
+{
+    // We need to provide this otherwise the entire composite window
+    // background and therefore the between component spaces
+    // will be changed.
+    if ( m_textCtrl )
+        return m_textCtrl->SetBackgroundColour(colour);
+
+    return true;
+}
+

 // ----------------------------------------------------------------------------
 // Handle sub controls events
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Handle sub controls events
 // ----------------------------------------------------------------------------


@@ -379,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.
 
     // 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;
 
     int spin_value = event.GetPosition();
     double step = (event.GetEventType() == wxEVT_SCROLL_LINEUP) ? 1 : -1;


@@ -400,13 +427,14 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event)
 
     m_spin_value = spin_value;
 
 
     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)
 {
         DoSendEvent();
 }
 
 void wxSpinCtrlGenericBase::OnTextLostFocus(wxFocusEvent& event)
 {

-    SyncSpinToText();
+    SyncSpinToText(SendEvent_Text);

     DoSendEvent();
 
     event.Skip();
     DoSendEvent();
 
     event.Skip();


@@ -446,9 +474,10 @@ void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event)
 
     value = AdjustToFitInRange(value);
 
 
     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();
 }
 
         DoSendEvent();
 }
 


@@ -456,7 +485,7 @@ void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event)
 // Textctrl functions
 // ----------------------------------------------------------------------------
 
 // Textctrl functions
 // ----------------------------------------------------------------------------
 

-bool wxSpinCtrlGenericBase::SyncSpinToText()
+bool wxSpinCtrlGenericBase::SyncSpinToText(SendEvent sendEvent)

 {
     if ( !m_textCtrl || !m_textCtrl->IsModified() )
         return false;
 {
     if ( !m_textCtrl || !m_textCtrl->IsModified() )
         return false;


@@ -478,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
     // 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);

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


@@ -492,23 +521,24 @@ void wxSpinCtrlGenericBase::SetValue(const wxString& text)
     double val;
     if ( DoTextToValue(text, &val) && InRange(val) )
     {
     double val;
     if ( DoTextToValue(text, &val) && InRange(val) )
     {

-        DoSetValue(val);
+        DoSetValue(val, SendEvent_None);

     }
     else // not a number at all or out of range
     {
     }
     else // not a number at all or out of range
     {

-        m_textCtrl->SetValue(text);
-        m_textCtrl->SetSelection(0, -1);
-        m_textCtrl->SetInsertionPointEnd();
+        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") );
 
 {
     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;
     if ( m_snap_to_ticks && (m_increment != 0) )
     {
         double snap_value = val / m_increment;


@@ -528,8 +558,19 @@ bool wxSpinCtrlGenericBase::DoSetValue(double val)
     {
         if ( !DoTextToValue(str, &m_value ) )    // wysiwyg for textctrl
             m_value = val;
     {
         if ( !DoTextToValue(str, &m_value ) )    // wysiwyg for textctrl
             m_value = val;

-        m_textCtrl->SetValue( str );
-        m_textCtrl->SetInsertionPointEnd();
+
+        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;
     }
         m_textCtrl->DiscardEdits();
         return true;
     }


@@ -550,7 +591,11 @@ double wxSpinCtrlGenericBase::AdjustToFitInRange(double value) const
 void wxSpinCtrlGenericBase::DoSetRange(double min, double max)
 {
     m_min = min;
 void wxSpinCtrlGenericBase::DoSetRange(double min, double max)
 {
     m_min = min;

+    if ( m_value < m_min )
+        DoSetValue(m_min, SendEvent_None);

     m_max = max;
     m_max = max;

+    if ( m_value > m_max )
+        DoSetValue(m_max, SendEvent_None);

 }
 
 void wxSpinCtrlGenericBase::DoSetIncrement(double inc)
 }
 
 void wxSpinCtrlGenericBase::DoSetIncrement(double inc)


@@ -561,7 +606,7 @@ void wxSpinCtrlGenericBase::DoSetIncrement(double inc)
 void wxSpinCtrlGenericBase::SetSnapToTicks(bool snap_to_ticks)
 {
     m_snap_to_ticks = snap_to_ticks;
 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)
 }
 
 void wxSpinCtrlGenericBase::SetSelection(long from, long to)


@@ -596,14 +641,14 @@ bool wxSpinCtrl::SetBase(int base)
 
     // ... but DoValueToText() after doing it.
     if ( hasValidVal )
 
     // ... but DoValueToText() after doing it.
     if ( hasValidVal )

-        m_textCtrl->SetValue(DoValueToText(val));
+        m_textCtrl->ChangeValue(DoValueToText(val));

 
     return true;
 }
 
 void wxSpinCtrl::DoSendEvent()
 {
 
     return true;
 }
 
 void wxSpinCtrl::DoSendEvent()
 {

-    wxSpinEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, GetId());
+    wxSpinEvent event( wxEVT_SPINCTRL, GetId());

     event.SetEventObject( this );
     event.SetPosition((int)(m_value + 0.5)); // FIXME should be SetValue
     event.SetString(m_textCtrl->GetValue());
     event.SetEventObject( this );
     event.SetPosition((int)(m_value + 0.5)); // FIXME should be SetValue
     event.SetString(m_textCtrl->GetValue());


@@ -648,7 +693,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlDouble, wxSpinCtrlGenericBase)
 
 void wxSpinCtrlDouble::DoSendEvent()
 {
 
 void wxSpinCtrlDouble::DoSendEvent()
 {

-    wxSpinDoubleEvent event( wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, GetId());
+    wxSpinDoubleEvent event( wxEVT_SPINCTRLDOUBLE, GetId());

     event.SetEventObject( this );
     event.SetValue(m_value);
     event.SetString(m_textCtrl->GetValue());
     event.SetEventObject( this );
     event.SetValue(m_value);
     event.SetString(m_textCtrl->GetValue());


@@ -676,7 +721,7 @@ void wxSpinCtrlDouble::SetDigits(unsigned digits)
 
     m_format.Printf(wxT("%%0.%ulf"), digits);
 
 
     m_format.Printf(wxT("%%0.%ulf"), digits);
 

-    DoSetValue(m_value);
+    DoSetValue(m_value, SendEvent_None);

 }
 
 #endif // wxUSE_SPINBTN
 }
 
 #endif // wxUSE_SPINBTN