Attempt at getting mingw32 working again... still doesn't work

I wonder when the last time it did work


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

include/wx/msw/private.h

@@ -54,7 +54,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 // this defines a CASTWNDPROC macro which casts a pointer to the type of a
 // window proc
 // ---------------------------------------------------------------------------
-#ifdef __GNUWIN32__
+#if defined(__GNUWIN32__) && !defined(__MINGW32__)
 #  define CASTWNDPROC (long unsigned)
 #else
 #  ifdef __BORLANDC__

include/wx/msw/treectrl.h

@@ -23,16 +23,6 @@
 #include "wx/event.h"
 #include "wx/textctrl.h"
 
-#ifdef __GNUWIN32__
-#  ifdef GetFirstChild
-#    undef GetFirstChild
-#  endif
-
-#  ifdef GetNextSibling
-#    undef GetNextSibling
-#  endif
-#endif
-
 // the type for "untyped" data
 typedef long wxDataType;
 

include/wx/msw/winundef.h

@@ -117,6 +117,10 @@
 
 #ifdef StartDoc
    #undef StartDoc
+   #ifdef __MINGW32__
+      #define DOCINFOW DOCINFO
+      #define DOCINFOA DOCINFO
+   #endif
    #ifdef _UNICODE
    inline int StartDoc(HDC h, CONST DOCINFOW* info)
    {

src/common/dcbase.cpp

@@ -21,7 +21,8 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
+   #include "wx/window.h"
+   #include "wx/msw/private.h"
 #endif
 
 #include "wx/dc.h"

src/common/log.cpp

@@ -29,6 +29,8 @@
 
 // wxWindows
 #ifndef WX_PRECOMP
+  #include "wx/window.h"
+  #include "wx/msw/private.h"
   #include  <wx/event.h>
   #include  <wx/app.h>
   #include  <wx/string.h>

src/common/resource.cpp

@@ -45,6 +45,7 @@
 #include "wx/checkbox.h"
 #include "wx/settings.h"
 #include "wx/slider.h"
+#include "wx/icon.h"
 #include "wx/statbox.h"
 #include "wx/statbmp.h"
 #if wxUSE_GAUGE

src/makeg95.env

@@ -54,7 +54,7 @@ RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH)
 ########################## Compiler flags #############################
 
 # Miscellaneous compiler options
-OPTIONS= -D__EGCS__ # -D__MINGW32__
+OPTIONS= -D__EGCS__  -DSTRICT # -D__MINGW32__
 
 # Debugging information
 # AIX: comment out.

src/msw/caret.cpp

@@ -30,6 +30,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
+    #include "wx/log.h"
 #endif // WX_PRECOMP
 
 #include "wx/caret.h"

src/msw/clipbrd.cpp

@@ -41,6 +41,7 @@
     #include "wx/frame.h"
     #include "wx/bitmap.h"
     #include "wx/utils.h"
+    #include "wx/intl.h"
 #endif
 
 #if wxUSE_METAFILE

src/msw/cursor.cpp

@@ -27,6 +27,7 @@
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/cursor.h"
+#include "wx/icon.h"
 #endif
 
 #include "wx/msw/private.h"

src/msw/dc.cpp

@@ -28,18 +28,20 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
 #include "wx/frame.h"
+#include "wx/msw/private.h"
+
+#ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/app.h"
     #include "wx/bitmap.h"
     #include "wx/dcmemory.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/dcprint.h"
-#include "wx/msw/private.h"
 
 #include <string.h>
 #include <math.h>

src/msw/dcclient.cpp

@@ -28,11 +28,14 @@
     #pragma hdrstop
 #endif
 
-#include "wx/dcclient.h"
+#include "wx/string.h"
 #include "wx/log.h"
+#include "wx/window.h"
 
 #include "wx/msw/private.h"
 
+#include "wx/dcclient.h"
+
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------

src/msw/dcprint.cpp

@@ -23,11 +23,12 @@
 #ifndef WX_PRECOMP
 #endif
 
-#include "wx/dcprint.h"
+#include "wx/string.h"
 #include "wx/log.h"
-#include "math.h"
+#include "wx/window.h"
-
 #include "wx/msw/private.h"
+#include "wx/dcprint.h"
+#include "math.h"
 
 #if wxUSE_COMMON_DIALOGS
 #include <commdlg.h>

src/msw/dcscreen.cpp

@@ -21,11 +21,13 @@
 #endif
 
 #ifndef WX_PRECOMP
+   #include "wx/string.h"
+   #include "wx/window.h"
+   #include "wx/msw/private.h"
 #endif
 
 #include "wx/dcscreen.h"
 
-#include <windows.h>
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)

src/msw/dialog.cpp

@@ -26,6 +26,8 @@
 #include "wx/frame.h"
 #include "wx/app.h"
 #include "wx/settings.h"
+#include "wx/intl.h"
+#include "wx/log.h"
 #endif
 
 #include "wx/msw/private.h"

src/msw/imaglist.cpp

@@ -26,7 +26,9 @@
 #include <stdio.h>
 #include "wx/setup.h"
 #include "wx/window.h"
-#include "wx/dcclient.h"
+#include "wx/icon.h"
+#include "wx/dc.h"
+#include "wx/string.h"
 #endif
 
 #include "wx/log.h"

src/msw/joystick.cpp

@@ -20,7 +20,9 @@
 #pragma hdrstop
 #endif
 
-#include <windows.h>
+#include "wx/string.h"
+#include "wx/window.h"
+#include "wx/msw/private.h"
 
 #ifndef __GNUWIN32__
 #include <mmsystem.h>

src/msw/listbox.cpp

@@ -20,6 +20,10 @@
     #pragma hdrstop
 #endif
 
+#include <windowsx.h>
+#include "wx/window.h"
+#include "wx/msw/private.h"
+
 #ifndef WX_PRECOMP
 #include "wx/listbox.h"
 #include "wx/settings.h"
@@ -28,10 +32,12 @@
 #include "wx/dc.h"
 #endif
 
-#include "wx/msw/private.h"
+#include "wx/dynarray.h"
+#include "wx/log.h"
 
-#include <windows.h>
+#if wxUSE_OWNER_DRAWN
-#include <windowsx.h>
+    #include  "wx/ownerdrw.h"
+#endif
 
 #ifndef __TWIN32__
     #ifdef __GNUWIN32__
@@ -39,12 +45,6 @@
     #endif
 #endif
 
-#if wxUSE_OWNER_DRAWN
-    #include  "wx/ownerdrw.h"
-#endif
-
-#include "wx/dynarray.h"
-#include "wx/log.h"
 
 #if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)

src/msw/mdi.cpp

@@ -37,6 +37,8 @@
     #include "wx/dialog.h"
     #include "wx/statusbr.h"
     #include "wx/settings.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/mdi.h"

src/msw/menu.cpp

@@ -32,6 +32,7 @@
     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/utils.h"
+    #include "wx/intl.h"
 #endif
 
 #if wxUSE_OWNER_DRAWN

src/msw/menuitem.cpp

@@ -29,11 +29,14 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/menu.h"
     #include "wx/font.h"
     #include "wx/bitmap.h"
     #include "wx/settings.h"
     #include "wx/font.h"
+    #include "wx/accel.h"
+    #include "wx/menu.h"
+    #include "wx/string.h"
+    #include "wx/window.h"
 #endif
 
 #include "wx/ownerdrw.h"

src/msw/minifram.cpp

@@ -20,6 +20,9 @@
 #pragma hdrstop
 #endif
 
+#include "wx/window.h"
+#include "wx/msw/private.h"
+
 #ifndef WX_PRECOMP
 #include "wx/setup.h"
 #include "wx/event.h"
@@ -30,7 +33,6 @@
 #if wxUSE_ITSY_BITSY
 
 #include "wx/minifram.h"
-#include "wx/msw/private.h"
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
@@ -86,8 +88,8 @@ wxMiniFrame::~wxMiniFrame(void)
 //
 //////////////////////////////////////////////////////////////////////////
 
-#include <windows.h>
+#include "wx/window.h"
-#include <windowsx.h>
+#include "wx/msw/private.h"
 
 #include <string.h>
 

src/msw/ownerdrw.cpp

@@ -21,6 +21,8 @@
 #endif
 
 #ifndef WX_PRECOMP
+  #include "wx/window.h"
+  #include "wx/msw/private.h"
   #include "wx/font.h"
   #include "wx/bitmap.h"
   #include "wx/dcmemory.h"
@@ -31,7 +33,6 @@
 #include "wx/ownerdrw.h"
 #include "wx/menuitem.h"
 
-#include "wx/msw/private.h"
 
 // ============================================================================
 // implementation of wxOwnerDrawn class

src/msw/printwin.cpp

@@ -31,10 +31,13 @@
 #include "wx/defs.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/window.h"
+    #include "wx/msw/private.h"
     #include "wx/utils.h"
     #include "wx/dc.h"
     #include "wx/app.h"
     #include "wx/msgdlg.h"
+    #include "wx/intl.h"
 #endif
 
 #include "wx/msw/printwin.h"

src/msw/region.cpp

@@ -23,6 +23,7 @@
 #include "wx/msw/region.h"
 #include "wx/gdicmn.h"
 
+#include "wx/window.h"
 #include "wx/msw/private.h"
 
 #if !USE_SHARED_LIBRARY

src/msw/statbmp.cpp

@@ -28,12 +28,15 @@
     #pragma hdrstop
 #endif
 
+#include "wx/window.h"
+#include "wx/msw/private.h"
+
 #ifndef WX_PRECOMP
+    #include "wx/icon.h"
     #include "wx/statbmp.h"
 #endif
 
 #include <stdio.h>
-#include "wx/msw/private.h"
 
 // ---------------------------------------------------------------------------
 // macors

src/msw/statbox.cpp

@@ -20,13 +20,15 @@
 #pragma hdrstop
 #endif
 
+#include "wx/window.h"
+#include "wx/msw/private.h"
+
 #ifndef WX_PRECOMP
-#include "wx/dcclient.h"
 #include "wx/app.h"
+#include "wx/dcclient.h"
 #endif
 
 #include "wx/statbox.h"
-#include "wx/msw/private.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)

src/msw/timer.cpp

@@ -20,6 +20,9 @@
     #pragma hdrstop
 #endif
 
+#include "wx/window.h"
+#include "wx/msw/private.h"
+
 #ifndef WX_PRECOMP
     #include "wx/setup.h"
     #include "wx/list.h"
@@ -31,7 +34,6 @@
 #include "wx/log.h"
 
 #include "wx/timer.h"
-#include "wx/msw/private.h"
 
 #include <time.h>
 #include <sys/types.h>

src/msw/treectrl.cpp

@@ -27,8 +27,19 @@
     #pragma hdrstop
 #endif
 
+#include "wx/window.h"
+#include "wx/msw/private.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/wx.h"
+    #include "wx/settings.h"
+#endif
+
+// Mingw32 is a bit mental even though this is done in winundef
+#ifdef GetFirstChild
+#undef GetFirstChild
+#endif
+#ifdef GetNextSibling
+#undef GetNextSibling
 #endif
 
 #if defined(__WIN95__)
@@ -38,8 +49,6 @@
 #include "wx/imaglist.h"
 #include "wx/msw/treectrl.h"
 
-#include "wx/msw/private.h"
-
 #ifdef __GNUWIN32__
 #include "wx/msw/gnuwin32/extra.h"
 #endif

src/msw/utils.cpp

@@ -645,7 +645,7 @@ char *wxGetUserHome (const wxString& user)
         if ((home = getenv("TMP")) != NULL ||
             (home = getenv("TMPDIR")) != NULL ||
             (home = getenv("TEMP")) != NULL)
-            return *home ? home : "\\";
+            return *home ? home : (char*)"\\";
       }
       if (Stricmp(tmp, WXSTRINGCAST user1) == 0)
         user1 = "";

src/msw/window.cpp

@@ -29,6 +29,9 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include <windows.h>
+    #include "wx/msw/winundef.h"
+    #include "wx/accel.h"
     #include "wx/setup.h"
     #include "wx/menu.h"
     #include "wx/dc.h"
@@ -58,6 +61,8 @@
 #include "wx/menuitem.h"
 #include "wx/log.h"
 
+#include "wx/msw/private.h"
+
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif
@@ -69,7 +74,6 @@
 #include "wx/intl.h"
 #include "wx/log.h"
 
-#include "wx/msw/private.h"
 
 #include "wx/textctrl.h"
 
@@ -94,8 +98,6 @@
     #endif
 #endif
 
-#include "wx/msw/winundef.h"
-
 // ---------------------------------------------------------------------------
 // macros
 // ---------------------------------------------------------------------------