fixed bugs with setting the client size when the difference between the total and...

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 439e8987d2d69914bf8af779c938b59ef3336b2e..3488d1f07471de39fa2d982add6104f176461345 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -28,14 +28,15 @@
     #pragma hdrstop
 #endif
 
-#if !wxUSE_SPINBTN
-    #error "This file can only be compiled if wxSpinButton is available"
-#endif // !wxUSE_SPINBTN
+#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"
 
@@ -71,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;
 
@@ -93,7 +103,7 @@ public:
     {
         m_spin = spin;
 
-        SetWindowStyle(style);
+        SetWindowStyle(style | wxSP_VERTICAL);
     }
 
 protected:
@@ -147,16 +157,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
@@ -166,8 +192,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;
 }
 
@@ -197,12 +224,15 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
     wxControl::DoMoveWindow(x, y, width, height);
 
     // position the subcontrols inside the client area
-    wxSize sizeBtn = m_btn->GetSize(),
-           sizeText = m_text->GetSize();
+    wxSize sizeBtn = m_btn->GetSize();
 
     wxCoord wText = width - sizeBtn.x;
     m_text->SetSize(x, y, wText, height);
+#ifdef __WXMAC__
+    m_btn->SetSize(x + wText + MARGIN, y, -1, -1);
+#else
     m_btn->SetSize(x + wText + MARGIN, y, -1, height);
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -225,8 +255,13 @@ bool wxSpinCtrl::Show(bool show)
     if ( !wxControl::Show(show) )
         return FALSE;
 
-    m_btn->Show(show);
-    m_text->Show(show);
+    // under GTK Show() is called the first time before we are fully
+    // constructed
+    if ( m_btn )
+    {
+        m_btn->Show(show);
+        m_text->Show(show);
+    }
 
     return TRUE;
 }
@@ -319,3 +354,5 @@ void wxSpinCtrl::SetRange(int min, int max)
     m_btn->SetRange(min, max);
 }
 
+#endif // wxUSE_SPINCTRL
+#endif // !wxPort-with-native-spinctrl