Slider Updates

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 5c02451b72fa5d5b408b959d5271ab693b5a8f4d..0da033d7631b3541e77b4b728361cbe2315b0f62 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -28,13 +28,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || defined(__WXMAC__) || \
-    defined(__WXUNIVERSAL__)
+#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || \
+    defined(__WXMAC__) || defined(__WXUNIVERSAL__)

 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
 #endif //WX_PRECOMP
 
 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
 #endif //WX_PRECOMP
 

+#if wxUSE_SPINCTRL
+

 #include "wx/spinbutt.h"
 #include "wx/spinctrl.h"
 
 #include "wx/spinbutt.h"
 #include "wx/spinctrl.h"
 


@@ -70,6 +72,15 @@ protected:
         event.Skip();
     }
 
         event.Skip();
     }
 

+    bool ProcessEvent(wxEvent &event)
+    {
+        // Hand button down events to wxSpinCtrl. Doesn't work.
+        if (event.GetEventType() == wxEVT_LEFT_DOWN && m_spin->ProcessEvent( event ))
+            return TRUE;
+
+        return wxTextCtrl::ProcessEvent( event );
+    }
+

 private:
     wxSpinCtrl *m_spin;
 
 private:
     wxSpinCtrl *m_spin;
 


@@ -92,15 +103,24 @@ public:
     {
         m_spin = spin;
 
     {
         m_spin = spin;
 

-        SetWindowStyle(style);
+        SetWindowStyle(style | wxSP_VERTICAL);

     }
 
 protected:
     }
 
 protected:

-    void OnSpinButton(wxSpinEvent& event)
+    void OnSpinButton(wxSpinEvent& eventSpin)

     {
     {

-        m_spin->SetTextValue(event.GetPosition());
+#ifdef __WXMAC__
+      m_spin->SetTextValue(eventSpin.GetPosition());

 
 

-        event.Skip();
+      wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId());
+      event.SetEventObject(m_spin);
+      event.SetInt(eventSpin.GetPosition());
+
+      m_spin->GetEventHandler()->ProcessEvent(event);
+#else
+        m_spin->SetTextValue(eventSpin.GetPosition());
+        eventSpin.Skip();
+#endif

     }
 
 private:
     }
 
 private:


@@ -114,7 +134,7 @@ BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)

-
+    

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -140,22 +160,40 @@ bool wxSpinCtrl::Create(wxWindow *parent,
                         int initial,
                         const wxString& name)
 {
                         int initial,
                         const wxString& name)
 {

-    if ( !wxControl::Create(parent, id, pos, size, style,
+    if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style,

                             wxDefaultValidator, name) )
     {
         return FALSE;
     }
 
                             wxDefaultValidator, name) )
     {
         return FALSE;
     }
 

+    // the string value overrides the numeric one (for backwards compatibility
+    // reasons and also because it is simpler to satisfy the string value which
+    // comes much sooner in the list of arguments and leave the initial
+    // parameter unspecified)
+    if ( !value.empty() )
+    {
+        long l;
+        if ( value.ToLong(&l) )
+            initial = l;
+    }
+

     SetBackgroundColour(*wxRED);
     m_text = new wxSpinCtrlText(this, value);
     m_btn = new wxSpinCtrlButton(this, style);
 
     m_btn->SetRange(min, max);
     m_btn->SetValue(initial);
     SetBackgroundColour(*wxRED);
     m_text = new wxSpinCtrlText(this, value);
     m_btn = new wxSpinCtrlButton(this, style);
 
     m_btn->SetRange(min, max);
     m_btn->SetValue(initial);

-
-    DoSetSize(pos.x, pos.y, size.x, size.y);

 #ifdef __WXMAC__
 #ifdef __WXMAC__

-    DoMoveWindow( pos.x, pos.y, size.x, size.y ) ;
+    wxSize csize = size ;
+    if ( size.y == -1 ) {
+      csize.y = m_text->GetSize().y ;
+    }
+    DoSetSize(pos.x, pos.y, csize.x, csize.y);
+#else
+    wxSize best = GetBestSize();
+    if ( size.x != -1 ) best.x = size.x;
+    if ( size.y != -1 ) best.y = size.y;
+    DoSetSize(pos.x, pos.y, best.x, best.y);

 #endif
     // have to disable this window to avoid interfering it with message
     // processing to the text and the button... but pretend it is enabled to
 #endif
     // have to disable this window to avoid interfering it with message
     // processing to the text and the button... but pretend it is enabled to


@@ -166,8 +204,9 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     // we don't even need to show this window itself - and not doing it avoids
     // that it overwrites the text control
     wxControl::Show(FALSE);
     // we don't even need to show this window itself - and not doing it avoids
     // that it overwrites the text control
     wxControl::Show(FALSE);

+#ifndef __WXMAC__

     m_isShown = TRUE;
     m_isShown = TRUE;

-
+#endif

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -184,7 +223,7 @@ wxSpinCtrl::~wxSpinCtrl()
 // geometry
 // ----------------------------------------------------------------------------
 
 // geometry
 // ----------------------------------------------------------------------------
 

-wxSize wxSpinCtrl::DoGetBestClientSize() const
+wxSize wxSpinCtrl::DoGetBestSize() const

 {
     wxSize sizeBtn = m_btn->GetBestSize(),
            sizeText = m_text->GetBestSize();
 {
     wxSize sizeBtn = m_btn->GetBestSize(),
            sizeText = m_text->GetBestSize();


@@ -196,12 +235,19 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
 {
     wxControl::DoMoveWindow(x, y, width, height);
 
 {
     wxControl::DoMoveWindow(x, y, width, height);
 

+    wxPoint p = GetParent() ? 
+                GetParent()->GetClientAreaOrigin() : wxPoint(0,0);
+

     // position the subcontrols inside the client area
     wxSize sizeBtn = m_btn->GetSize();
 
     wxCoord wText = width - sizeBtn.x;
     // position the subcontrols inside the client area
     wxSize sizeBtn = m_btn->GetSize();
 
     wxCoord wText = width - sizeBtn.x;

-    m_text->SetSize(x, y, wText, height);
-    m_btn->SetSize(x + wText + MARGIN, y, -1, height);
+    m_text->SetSize(x-p.x, y-p.y, wText, height);
+#ifdef __WXMAC__
+    m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, -1);
+#else
+    m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, height);
+#endif

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


@@ -288,7 +334,7 @@ void wxSpinCtrl::SetTextValue(int val)
     m_text->SetSelection(0, -1);
 
     // and give focus to the control!
     m_text->SetSelection(0, -1);
 
     // and give focus to the control!

-    m_text->SetFocus();
+    // m_text->SetFocus();    Why???? TODO.

 }
 
 void wxSpinCtrl::SetValue(int val)
 }
 
 void wxSpinCtrl::SetValue(int val)


@@ -323,4 +369,5 @@ void wxSpinCtrl::SetRange(int min, int max)
     m_btn->SetRange(min, max);
 }
 
     m_btn->SetRange(min, max);
 }
 

+#endif // wxUSE_SPINCTRL

 #endif // !wxPort-with-native-spinctrl
 #endif // !wxPort-with-native-spinctrl