fixes for misplaced radio buttons in wxRadioBox

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index 4d1b1f17f52603455eb2f4933bf68028bd971e70..249fba0b252985e37445d3eed54f367c1842e2bd 100644 (file)
--- a/src/univ/radiobox.cpp
+++ b/src/univ/radiobox.cpp
@@ -389,9 +389,10 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height)
 
     wxSize sizeBtn = GetMaxButtonSize();
     wxPoint ptOrigin = GetBoxAreaOrigin();
 
     wxSize sizeBtn = GetMaxButtonSize();
     wxPoint ptOrigin = GetBoxAreaOrigin();

+    wxPoint clientOrigin = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(0,0);

 
 

-    x0 += ptOrigin.x + BOX_BORDER_X;
-    y0 += ptOrigin.y + BOX_BORDER_Y;
+    x0 += ptOrigin.x + BOX_BORDER_X - clientOrigin.x;
+    y0 += ptOrigin.y + BOX_BORDER_Y - clientOrigin.y;

 
     int x = x0,
         y = y0;
 
     int x = x0,
         y = y0;