account for parent area origin when creating controls and windows

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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 4d4c0e159f080617c6f68e9e42f3155527f3b4bd..df2d8b11095b5a7d491ca688c8593dfa1922379d 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -106,11 +106,15 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
         style |= WS_VISIBLE;
     }
 
         style |= WS_VISIBLE;
     }
 

+    // choose the position for the control

     int x = pos.x == -1 ? 0 : pos.x,
         y = pos.y == -1 ? 0 : pos.y,
         w = size.x == -1 ? 0 : size.x,
         h = size.y == -1 ? 0 : size.y;
 
     int x = pos.x == -1 ? 0 : pos.x,
         y = pos.y == -1 ? 0 : pos.y,
         w = size.x == -1 ? 0 : size.x,
         h = size.y == -1 ? 0 : size.y;
 

+    // ... and adjust it to account for ap ossible parent frames toolbar
+    AdjustForParentClientOrigin(x, y);
+

     m_hWnd = (WXHWND)::CreateWindowEx
                        (
                         exstyle,            // extended style
     m_hWnd = (WXHWND)::CreateWindowEx
                        (
                         exstyle,            // extended style

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 65006bc51b3e810af1bcf06ae2de389c5baff2d4..610126c65c0c650395cc1705991d79076c940049 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2994,6 +2994,8 @@ bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
         nonDefault = TRUE;
     }
 
         nonDefault = TRUE;
     }
 

+    AdjustForParentClientOrigin(x, y);
+

     return nonDefault;
 }
 
     return nonDefault;
 }