minor fixes for mingw32 compilation

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 51d9ca25557301bc37f64e91d84f6938bdae7512..ce6cf7c866160f456903e1f214bdf8648c6a9823 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -16,6 +16,7 @@
 #pragma interface "cmndata.h"
 #endif
 
 #pragma interface "cmndata.h"
 #endif
 

+#include "wx/window.h"

 #include "wx/font.h"
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 #include "wx/font.h"
 #include "wx/colour.h"
 #include "wx/gdicmn.h"

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index ea234b79647280e835ca0fd7d472d4a4c963521a..8d4eee417ec1b7aa443446b995ee6eb6d63539c0 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -56,7 +56,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 // window proc
 // ---------------------------------------------------------------------------
 
 // window proc
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUWIN32__) && !defined(__MINGW32__)
+#if defined(__GNUWIN32__) 

 #  define CASTWNDPROC (long unsigned)
 #else
 #  ifdef __BORLANDC__
 #  define CASTWNDPROC (long unsigned)
 #else
 #  ifdef __BORLANDC__