Applied drag fix to row labels as well

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 9d6ab516e258461b8af7842cafee52d0b54e9071..c0dca645a1f22da70b76ff441f22ae6b51a8d705 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -28,13 +28,15 @@
     #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
 
+#if wxUSE_SPINCTRL
+
 #include "wx/spinbutt.h"
 #include "wx/spinctrl.h"
 
@@ -70,6 +72,15 @@ protected:
         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;
 
@@ -92,15 +103,24 @@ public:
     {
         m_spin = spin;
 
-        SetWindowStyle(style);
+        SetWindowStyle(style | wxSP_VERTICAL);
     }
 
 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:
@@ -114,7 +134,7 @@ BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
-
+    
 // ============================================================================
 // implementation
 // ============================================================================
@@ -140,12 +160,23 @@ bool wxSpinCtrl::Create(wxWindow *parent,
                         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;
     }
 
+    // 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);
@@ -201,12 +232,19 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int 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;
-    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
 }
 
 // ----------------------------------------------------------------------------
@@ -328,4 +366,5 @@ void wxSpinCtrl::SetRange(int min, int max)
     m_btn->SetRange(min, max);
 }
 
+#endif // wxUSE_SPINCTRL
 #endif // !wxPort-with-native-spinctrl