cleaned up the waitpid() result processing mess

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 5c02451b72fa5d5b408b959d5271ab693b5a8f4d..cea2e0b054f5b7f61b700be7385e6f62b0e019d6 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -69,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;
@@ -152,10 +161,14 @@ bool wxSpinCtrl::Create(wxWindow *parent,
 
     m_btn->SetRange(min, max);
     m_btn->SetValue(initial);
-
-    DoSetSize(pos.x, pos.y, size.x, size.y);
 #ifdef __WXMAC__
-    DoMoveWindow( pos.x, pos.y, size.x, size.y ) ;
+    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
@@ -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;
 }