Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index f61ac2c516e385a9fb25111dbdb980cc7c2bdae3..b8c1f48b40af26e9f1a27154b42c491fad174a7b 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -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;
@@ -232,15 +232,18 @@ 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_text->SetSize(x-p.x, y-p.y, wText, height);
 #ifdef __WXMAC__
-    m_btn->SetSize(x + wText + MARGIN, y, -1, -1);
+    m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, -1);
 #else
-    m_btn->SetSize(x + wText + MARGIN, y, -1, height);
+    m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, height);
 #endif
 }