Soem corrections for SetSize changes

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index d5f4085fa6bfeb6fbe01e9bea8e3e7f6bac5a5bc..e68427dbd2b0bd497b3d469e565514281ad0c5d0 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -252,7 +252,7 @@ void wxDialog::SetClientSize(int width, int height)
 {
   HWND hWnd = (HWND) GetHWND();
   RECT rect;
-  GetClientRect(hWnd, &rect);
+  ::GetClientRect(hWnd, &rect);
 
   RECT rect2;
   GetWindowRect(hWnd, &rect2);

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index d98fffe6237eea1ac29ab50f7edc3e7867daabaf..2f9d0dabb7a1ab4d7fffe54eefd8c21a79d64631 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -167,7 +167,7 @@ WXHMENU wxFrame::GetWinMenu() const
 void wxFrame::GetClientSize(int *x, int *y) const
 {
   RECT rect;
-  GetClientRect((HWND) GetHWND(), &rect);
+  ::GetClientRect((HWND) GetHWND(), &rect);
 
   if ( GetStatusBar() )
   {
@@ -191,7 +191,7 @@ void wxFrame::DoSetClientSize(int width, int height)
   HWND hWnd = (HWND) GetHWND();
 
   RECT rect;
-  GetClientRect(hWnd, &rect);
+  ::GetClientRect(hWnd, &rect);
 
   RECT rect2;
   GetWindowRect(hWnd, &rect2);
@@ -657,7 +657,7 @@ bool wxFrame::MSWOnPaint()
       if (the_icon)
       {
         RECT rect;
-        GetClientRect((HWND) GetHWND(), &rect);
+        ::GetClientRect((HWND) GetHWND(), &rect);
         int icon_width = 32;
         int icon_height = 32;
         int icon_x = (int)((rect.right - icon_width)/2);

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 61653c10fe32b846063a8d3659107ca57ee3ca55..1e91b0cbcfdf460fa88d17c377ce2f991c40dc27 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -167,7 +167,7 @@ wxMDIParentFrame::~wxMDIParentFrame(void)
 void wxMDIParentFrame::GetClientSize(int *x, int *y) const
 {
   RECT rect;
-  GetClientRect((HWND) GetHWND(), &rect);
+  ::GetClientRect((HWND) GetHWND(), &rect);
 
   int cwidth = rect.right;
   int cheight = rect.bottom;
@@ -731,7 +731,7 @@ void wxMDIChildFrame::SetClientSize(int width, int height)
   HWND hWnd = (HWND) GetHWND();
 
   RECT rect;
-  GetClientRect(hWnd, &rect);
+  ::GetClientRect(hWnd, &rect);
 
   RECT rect2;
   GetWindowRect(hWnd, &rect2);

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index e737b2328d7f80e8eb4f896dfc806082953d8fb4..273cc8c75904bde2b7d7f86c4d6e0f98a7e7345e 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -670,12 +670,12 @@ void wxWindow::GetClientSize(int *x, int *y) const
 {
     HWND hWnd = (HWND) GetHWND();
     RECT rect;
-    GetClientRect(hWnd, &rect);
+    ::GetClientRect(hWnd, &rect);
     *x = rect.right;
     *y = rect.bottom;
 }
 
-void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     int currentX, currentY;
     GetPosition(&currentX, &currentY);
@@ -706,14 +706,14 @@ void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
         MoveWindow(hWnd, actualX, actualY, actualWidth, actualHeight, (BOOL)TRUE);
 }
 
-void wxWindow::SetClientSize(int width, int height)
+void wxWindow::DoSetClientSize(int width, int height)
 {
     wxWindow *parent = GetParent();
     HWND hWnd = (HWND) GetHWND();
     HWND hParentWnd = (HWND) (HWND) parent->GetHWND();
 
     RECT rect;
-    GetClientRect(hWnd, &rect);
+    ::GetClientRect(hWnd, &rect);
 
     RECT rect2;
     GetWindowRect(hWnd, &rect2);