Unicode compilation fixes

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index ebe1b3760b3add1470dd7608536930541fd44586..f5019af63a48bc8fb23184e0c837dfca4774f031 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -35,6 +35,8 @@
     #include "wx/textctrl.h"
 #endif //WX_PRECOMP
 
+#if wxUSE_SPINCTRL
+
 #include "wx/spinbutt.h"
 #include "wx/spinctrl.h"
 
@@ -105,11 +107,20 @@ public:
     }
 
 protected:
-    void OnSpinButton(wxSpinEvent& event)
+    void OnSpinButton(wxSpinEvent& eventSpin)
     {
-        m_spin->SetTextValue(event.GetPosition());
+#ifdef __WXMAC__
+      m_spin->SetTextValue(eventSpin.GetPosition());
 
-        event.Skip();
+      wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId());
+      event.SetEventObject(m_spin);
+      event.SetInt(eventSpin.GetPosition());
+
+      m_spin->GetEventHandler()->ProcessEvent(event);
+#else
+        m_spin->SetTextValue(eventSpin.GetPosition());
+        eventSpin.Skip();
+#endif
     }
 
 private:
@@ -221,12 +232,19 @@ 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, y, wText, height);
-    m_btn->SetSize(x + wText + MARGIN, y, -1, height);
+    m_text->SetSize(x-p.x, y-p.y, wText, height);
+#ifdef __WXMAC__
+    m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, -1);
+#else
+    m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, height);
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -348,4 +366,5 @@ void wxSpinCtrl::SetRange(int min, int max)
     m_btn->SetRange(min, max);
 }
 
+#endif // wxUSE_SPINCTRL
 #endif // !wxPort-with-native-spinctrl