X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d45906e0a78871eaedb431a9f1a1097def3790c9..34dceb471562e2bf2cc85c4792cde3faf555af40:/src/generic/spinctlg.cpp

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 9c8aad397b..1136b29f96 100644
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -6,7 +6,7 @@
 // Created:     29.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows license
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -109,18 +109,15 @@ public:
 protected:
     void OnSpinButton(wxSpinEvent& eventSpin)
     {
-#ifdef __WXMAC__
-      m_spin->SetTextValue(eventSpin.GetPosition());
+        m_spin->SetTextValue(eventSpin.GetPosition());
 
-      wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId());
-      event.SetEventObject(m_spin);
-      event.SetInt(eventSpin.GetPosition());
+        wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId());
+        event.SetEventObject(m_spin);
+        event.SetInt(eventSpin.GetPosition());
+
+        m_spin->GetEventHandler()->ProcessEvent(event);
 
-      m_spin->GetEventHandler()->ProcessEvent(event);
-#else
-        m_spin->SetTextValue(eventSpin.GetPosition());
         eventSpin.Skip();
-#endif
     }
 
 private:
@@ -134,7 +131,7 @@ BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
-    
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -190,7 +187,10 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     }
     DoSetSize(pos.x, pos.y, csize.x, csize.y);
 #else
-    DoSetSize(pos.x, pos.y, size.x, size.y);
+    wxSize best = GetBestSize();
+    if ( size.x != -1 ) best.x = size.x;
+    if ( size.y != -1 ) best.y = size.y;
+    DoSetSize(pos.x, pos.y, best.x, best.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
@@ -220,7 +220,7 @@ wxSpinCtrl::~wxSpinCtrl()
 // geometry
 // ----------------------------------------------------------------------------
 
-wxSize wxSpinCtrl::DoGetBestClientSize() const
+wxSize wxSpinCtrl::DoGetBestSize() const
 {
     wxSize sizeBtn = m_btn->GetBestSize(),
            sizeText = m_text->GetBestSize();
@@ -232,18 +232,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
 }
 
@@ -366,5 +363,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