applied the workaround for XUnionRectWithRegion() returning ampty result if the rect...

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 0da033d7631b3541e77b4b728361cbe2315b0f62..eb52e041a22763019f76c8390cb88ee60dc00fd8 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -109,7 +109,7 @@ public:
 protected:
     void OnSpinButton(wxSpinEvent& eventSpin)
     {
-#ifdef __WXMAC__
+#if defined(__WXMAC__) || defined(__WXMOTIF__)
       m_spin->SetTextValue(eventSpin.GetPosition());
 
       wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId());
@@ -134,7 +134,7 @@ BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
-    
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -235,18 +235,15 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
 {
     wxControl::DoMoveWindow(x, y, width, height);
 
-    wxPoint p = GetParent() ? 
-                GetParent()->GetClientAreaOrigin() : wxPoint(0,0);
-
     // position the subcontrols inside the client area
     wxSize sizeBtn = m_btn->GetSize();
 
     wxCoord wText = width - sizeBtn.x;
-    m_text->SetSize(x-p.x, y-p.y, wText, height);
+    m_text->SetSize(x, y, wText, height);
 #ifdef __WXMAC__
-    m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, -1);
+    m_btn->SetSize(x + wText + MARGIN, y, -1, -1);
 #else
-    m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, height);
+    m_btn->SetSize(x + wText + MARGIN, y, -1, height);
 #endif
 }
 
@@ -369,5 +366,12 @@ void wxSpinCtrl::SetRange(int min, int max)
     m_btn->SetRange(min, max);
 }
 
+void wxSpinCtrl::SetSelection(long from, long to)
+{
+    wxCHECK_RET( m_text, _T("invalid call to wxSpinCtrl::SetSelection") );
+
+    m_text->SetSelection(from, to);
+}
+
 #endif // wxUSE_SPINCTRL
 #endif // !wxPort-with-native-spinctrl