Updates for Y positioning

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index ff767d2848d3b917de3543e5b700420eb24390f1..f5019af63a48bc8fb23184e0c837dfca4774f031 100644 (file)
--- 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);
 
 {
     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;
     // 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__
 #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
 #else

-    m_btn->SetSize(x + wText + MARGIN, y, -1, height);
+    m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, height);

 #endif
 }
 
 #endif
 }