ignore WinCE projects and build directories

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 148dd99b20bb6a51419a4c15367ec692e02854a8..9103305144532e383d7b4b0a804c476b1a56886f 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "spinctlg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -62,7 +58,7 @@ public:
         m_spin = spin;
 
         // remove the default minsize, the spinctrl will have one instead
-        SetSizeHints(wxDefaultSize.x,wxDefaultSize.y);
+        SetSizeHints(wxDefaultCoord,wxDefaultCoord);
     }
 
 protected:
@@ -111,7 +107,7 @@ public:
         SetWindowStyle(style | wxSP_VERTICAL);
 
         // remove the default minsize, the spinctrl will have one instead
-        SetSizeHints(wxDefaultSize.x,wxDefaultSize.y);
+        SetSizeHints(wxDefaultCoord,wxDefaultCoord);
     }
 
 protected:
@@ -157,7 +153,7 @@ void wxSpinCtrl::Init()
 bool wxSpinCtrl::Create(wxWindow *parent,
                         wxWindowID id,
                         const wxString& value,
-                        const wxPoint& WXUNUSED(pos),
+                        const wxPoint& pos,
                         const wxSize& size,
                         long style,
                         int min,
@@ -187,7 +183,8 @@ bool wxSpinCtrl::Create(wxWindow *parent,
 
     m_btn->SetRange(min, max);
     m_btn->SetValue(initial);
-    SetBestSize(size);
+    SetInitialSize(size);
+    Move(pos);
 
     // have to disable this window to avoid interfering it with message
     // processing to the text and the button... but pretend it is enabled to
@@ -234,7 +231,7 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
 
     wxCoord wText = width - sizeBtn.x;
     m_text->SetSize(x, y, wText, height);
-    m_btn->SetSize(x + wText + MARGIN, y, wxDefaultSize.x, height);
+    m_btn->SetSize(x + wText + MARGIN, y, wxDefaultCoord, height);
 }
 
 // ----------------------------------------------------------------------------
@@ -268,6 +265,17 @@ bool wxSpinCtrl::Show(bool show)
     return true;
 }
 
+bool wxSpinCtrl::Reparent(wxWindow *newParent)
+{
+    if ( m_btn )
+    {
+        m_btn->Reparent(newParent);
+        m_text->Reparent(newParent);
+    }
+
+    return true;
+}
+
 // ----------------------------------------------------------------------------
 // value and range access
 // ----------------------------------------------------------------------------