fixing mngw32 (cross)compilation

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index e3db308a0f0b8bb7c01ff1abd5a99a9d506b06a2..3c235e7f3d15d2598cf237e092821f55ecbaa1cd 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -1103,7 +1103,7 @@ bool wxMDIChildFrame::ResetWindowStyle(void *vrect)
         // we want to test whether there is a maximized child, so just set
         // dwThisStyle to 0 if there is no child at all
         DWORD dwThisStyle = pChild
         // we want to test whether there is a maximized child, so just set
         // dwThisStyle to 0 if there is no child at all
         DWORD dwThisStyle = pChild

-            ? ::GetWindowLong(GetWinHwnd(pChild), GWL_STYLE) : NULL;
+            ? ::GetWindowLong(GetWinHwnd(pChild), GWL_STYLE) : 0;

         DWORD dwNewStyle = dwStyle;
         if ( dwThisStyle & WS_MAXIMIZE )
             dwNewStyle &= ~(WS_EX_CLIENTEDGE);
         DWORD dwNewStyle = dwStyle;
         if ( dwThisStyle & WS_MAXIMIZE )
             dwNewStyle &= ~(WS_EX_CLIENTEDGE);

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index 34a60f02bd5c9c18bf9c81f30a5723a676ab5c8b..01f2468803d6f555ba280c76caaebc7ff1b21cbc 100644 (file)
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -22,6 +22,7 @@
 
 #ifndef WX_PRECOMP
   #include  "wx/string.h"
 
 #ifndef WX_PRECOMP
   #include  "wx/string.h"

+  #include  "wx/intl.h"

 #endif //WX_PRECOMP
 
 #include "wx/event.h"
 #endif //WX_PRECOMP
 
 #include "wx/event.h"

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 4ff1428eaab1585e885da39493d2b7d41b46f961..b40d7da5b2c7b6eb2a1325552c3735a3238ea392 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -46,6 +46,7 @@
     #include "wx/listbox.h"
     #include "wx/button.h"
     #include "wx/msgdlg.h"
     #include "wx/listbox.h"
     #include "wx/button.h"
     #include "wx/msgdlg.h"

+    #include "wx/settings.h"

 
     #include <stdio.h>
 #endif
 
     #include <stdio.h>
 #endif