X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d0000b5b5d644521d2333ed0d59fd3c84ddbad5..74f6bbf951eecb584076f84eb15ca31030abd675:/src/generic/spinctlg.cpp

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index ff767d2848..f5019af63a 100644
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -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
 }