added missing refresh when changing focus in wxListCtrl, added test for it in the...

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 439e8987d2d69914bf8af779c938b59ef3336b2e..cea2e0b054f5b7f61b700be7385e6f62b0e019d6 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -28,9 +28,8 @@
     #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"
@@ -70,6 +69,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;
@@ -148,15 +156,20 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     }
 
     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 +179,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,8 +211,7 @@ 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);
@@ -225,8 +238,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 +337,4 @@ void wxSpinCtrl::SetRange(int min, int max)
     m_btn->SetRange(min, max);
 }
 
+#endif // !wxPort-with-native-spinctrl