merged MapBitmap() from 2.2 branch

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 44d209b5b99c0652fb66845c25798dbc2ef039bb..5c02451b72fa5d5b408b959d5271ab693b5a8f4d 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


@@ -147,7 +147,6 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     }
 
     SetBackgroundColour(*wxRED);
     }
 
     SetBackgroundColour(*wxRED);

-

     m_text = new wxSpinCtrlText(this, value);
     m_btn = new wxSpinCtrlButton(this, style);
 
     m_text = new wxSpinCtrlText(this, value);
     m_btn = new wxSpinCtrlButton(this, style);
 


@@ -155,7 +154,9 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     m_btn->SetValue(initial);
 
     DoSetSize(pos.x, pos.y, size.x, size.y);
     m_btn->SetValue(initial);
 
     DoSetSize(pos.x, pos.y, size.x, size.y);

-
+#ifdef __WXMAC__
+    DoMoveWindow( 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