X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3379ed3789e405f874d9db757d95346f1d378795..d728116a27b358e5b002337d96268fb51be128eb:/src/generic/spinctlg.cpp?ds=sidebyside

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 44d209b5b9..ebe1b3760b 100644
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
-#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || \
+#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || defined(__WXMAC__) || \
     defined(__WXUNIVERSAL__)
 
 #ifndef WX_PRECOMP
@@ -70,6 +70,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,7 +101,7 @@ public:
     {
         m_spin = spin;
 
-        SetWindowStyle(style);
+        SetWindowStyle(style | wxSP_VERTICAL);
     }
 
 protected:
@@ -146,16 +155,32 @@ bool wxSpinCtrl::Create(wxWindow *parent,
         return FALSE;
     }
 
-    SetBackgroundColour(*wxRED);
+    // 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);
-
+#ifdef __WXMAC__
+    wxSize csize = size ;
+    if ( size.y == -1 ) {
+      csize.y = m_text->GetSize().y ;
+    }
+    DoSetSize(pos.x, pos.y, csize.x, csize.y);
+#else
     DoSetSize(pos.x, pos.y, size.x, size.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
     // make IsEnabled() return TRUE
@@ -165,8 +190,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);
+#ifndef __WXMAC__
     m_isShown = TRUE;
-
+#endif
     return TRUE;
 }