Fixed overlapping buttons in wizard on MacOS X

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index f61ac2c516e385a9fb25111dbdb980cc7c2bdae3..eb52e041a22763019f76c8390cb88ee60dc00fd8 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -28,8 +28,8 @@
     #pragma hdrstop
 #endif
 
-#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || defined(__WXMAC__) || \
-    defined(__WXUNIVERSAL__)
+#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || \
+    defined(__WXMAC__) || defined(__WXUNIVERSAL__)
 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
@@ -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());
@@ -118,8 +118,8 @@ protected:
 
       m_spin->GetEventHandler()->ProcessEvent(event);
 #else
-        m_spin->SetTextValue(event.GetPosition());
-        event.Skip();
+        m_spin->SetTextValue(eventSpin.GetPosition());
+        eventSpin.Skip();
 #endif
     }
 
@@ -160,7 +160,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
                         int initial,
                         const wxString& name)
 {
-    if ( !wxControl::Create(parent, id, pos, size, style,
+    if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style,
                             wxDefaultValidator, name) )
     {
         return FALSE;
@@ -190,7 +190,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 +223,7 @@ wxSpinCtrl::~wxSpinCtrl()
 // geometry
 // ----------------------------------------------------------------------------
 
-wxSize wxSpinCtrl::DoGetBestClientSize() const
+wxSize wxSpinCtrl::DoGetBestSize() const
 {
     wxSize sizeBtn = m_btn->GetBestSize(),
            sizeText = m_text->GetBestSize();
@@ -328,7 +331,7 @@ void wxSpinCtrl::SetTextValue(int val)
     m_text->SetSelection(0, -1);
 
     // and give focus to the control!
-    m_text->SetFocus();
+    // m_text->SetFocus();    Why???? TODO.
 }
 
 void wxSpinCtrl::SetValue(int val)
@@ -363,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