X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23d416bfc42eb1d30f6104b658fdd2dbccda8c52..050c9e3c90c58b05d5b3f7384d1556ca9669f13e:/src/generic/spinctlg.cpp

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index cea2e0b054..ebe1b3760b 100644
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -69,13 +69,13 @@ 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 );
     }
 
@@ -101,7 +101,7 @@ public:
     {
         m_spin = spin;
 
-        SetWindowStyle(style);
+        SetWindowStyle(style | wxSP_VERTICAL);
     }
 
 protected:
@@ -155,6 +155,17 @@ bool wxSpinCtrl::Create(wxWindow *parent,
         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);