From 1f3943e0276719ed5fc94bb93765df69f91ba10c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 22 Apr 2001 11:53:11 +0000 Subject: [PATCH] fixing mngw32 (cross)compilation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/mdi.cpp | 2 +- src/msw/regconf.cpp | 1 + src/msw/window.cpp | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index e3db308a0f..3c235e7f3d 100644 --- 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 - ? ::GetWindowLong(GetWinHwnd(pChild), GWL_STYLE) : NULL; + ? ::GetWindowLong(GetWinHwnd(pChild), GWL_STYLE) : 0; DWORD dwNewStyle = dwStyle; if ( dwThisStyle & WS_MAXIMIZE ) dwNewStyle &= ~(WS_EX_CLIENTEDGE); diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp index 34a60f02bd..01f2468803 100644 --- a/src/msw/regconf.cpp +++ b/src/msw/regconf.cpp @@ -22,6 +22,7 @@ #ifndef WX_PRECOMP #include "wx/string.h" + #include "wx/intl.h" #endif //WX_PRECOMP #include "wx/event.h" diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 4ff1428eaa..b40d7da5b2 100644 --- 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/settings.h" #include #endif -- 2.45.2