compilation warning fix

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 9d6ab516e258461b8af7842cafee52d0b54e9071..ebe1b3760b3add1470dd7608536930541fd44586 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -70,6 +70,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,7 +101,7 @@ public:
     {
         m_spin = spin;
 
     {
         m_spin = spin;
 

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

     }
 
 protected:
     }
 
 protected:


@@ -146,6 +155,17 @@ bool wxSpinCtrl::Create(wxWindow *parent,
         return FALSE;
     }
 
         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);
     SetBackgroundColour(*wxRED);
     m_text = new wxSpinCtrlText(this, value);
     m_btn = new wxSpinCtrlButton(this, style);