removed extra wxSTD

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 44d209b5b99c0652fb66845c25798dbc2ef039bb..cea2e0b054f5b7f61b700be7385e6f62b0e019d6 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || \
+#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || defined(__WXMAC__) || \

     defined(__WXUNIVERSAL__)
 
 #ifndef WX_PRECOMP
     defined(__WXUNIVERSAL__)
 
 #ifndef WX_PRECOMP


@@ -69,6 +69,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;


@@ -147,15 +156,20 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     }
 
     SetBackgroundColour(*wxRED);
     }
 
     SetBackgroundColour(*wxRED);

-

     m_text = new wxSpinCtrlText(this, value);
     m_btn = new wxSpinCtrlButton(this, style);
 
     m_btn->SetRange(min, max);
     m_btn->SetValue(initial);
     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);
     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
     // 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


@@ -165,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);
     // 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;
     m_isShown = TRUE;

-
+#endif

     return TRUE;
 }
 
     return TRUE;
 }