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

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index e960fad8806bb6d9b8c92f55d929bd34cafe858a..2171b17c59c555eb33eac7351b27fbfc3870fcc6 100644 (file)
--- a/include/wx/msw/private.h
+++ b/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__

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index 429aa6983ea5fdcb38bf9fac618b309b88cd6250..97baa3f6a4d77d8013a79b5e3b4b06f8395cc90e 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/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;
 

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index c8a389bc899dd71dac588489357c564d3a8f0842..3d657f4c21f063befc26cada049bce2a2f2eea54 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/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)
    {
@@ -159,11 +163,11 @@
 
 // GetNextSibling
 #ifdef GetNextSibling
-    #undef GetNextSibling
-    inline HWND GetNextSibling(HWND h)
-    {
-      return GetWindow(h, GW_HWNDNEXT);
-    }
+   #undef GetNextSibling
+   inline HWND GetNextSibling(HWND h)
+   {
+     return GetWindow(h, GW_HWNDNEXT);
+   }
 #endif
 
 // GetWindowProc

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 3ad130904a4b1633091f0da6955d786e49d8040f..114771cbb9ccfe6bcd29f2242d38e6d32512df07 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/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"

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 0c752c72a409fc3d0d29067416bcce2d77c5f85f..7c350059690140ad58939e296c8b8933b9fd0d62 100644 (file)
--- a/src/common/log.cpp
+++ b/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>

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index 8c9d706d436163c0dca0c6269ec4ad4401115a7b..56b976b194a902949700dfe5661edc702aa1fc53 100644 (file)
--- a/src/common/resource.cpp
+++ b/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

diff --git a/src/makeg95.env b/src/makeg95.env
index 67df3d0a74e09681e265a1d32e52bfde8ef7e092..8af9e3640887252a30fee10193b09eecf49276a4 100644 (file)
--- a/src/makeg95.env
+++ b/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.

diff --git a/src/msw/caret.cpp b/src/msw/caret.cpp
index 9d72d6bae02276c622bb0e1e98caf6062327408e..08bc7e5389bf713e2676f383cd21ef430d82656d 100644 (file)
--- a/src/msw/caret.cpp
+++ b/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"

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 9220ab567fd6a95016612eb067f908e55c7cc49c..36aa9b6b05627c1210071d73c7acbfb7fc1d8601 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index fdbcc955b8b57c29cab9bdeb07fb830b7d65799e..8886f56b8c50e56ee021f1348a0d0680ef82c5b3 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/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"

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index ad8039c3263af9f2e82b86b714142ea8eddcb545..52726e5100b230074b2d6c9f26772c9e521a788f 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -28,18 +28,20 @@
     #pragma hdrstop
 #endif
 
+#include "wx/frame.h"
+#include "wx/msw/private.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/frame.h"
     #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>

diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index 81dac38ce83201f5afc1bd8feaf399bc9a4c55a1..763e70bb579677cd1737db2a7564bda1efbe3dda 100644 (file)
--- a/src/msw/dcclient.cpp
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 95fe393b286191d592ae3785e9cb4dc85d681d5c..55eac864f758522f44d86ac500c7061122ed3eba 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/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>

diff --git a/src/msw/dcscreen.cpp b/src/msw/dcscreen.cpp
index 7960fbd3e81185ab9a1b32e51ed00eb8830d8604..64c6908cfd47dccc1987b05bd96b3327b8451bf4 100644 (file)
--- a/src/msw/dcscreen.cpp
+++ b/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)

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index d1979b9a4e3639b27b3df6a6ffd326176ba6df9b..e73db1485fa9200bec02b40ef162b3f90019bd22 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/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"

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index 494ff86607889b13b28c7ea6af6f6adb89298957..a4e2fe629dfde1418c5a09bd3061bad5f5f9ffb4 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/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"

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index 5fa69fd9ce29eaffb3dbaa56ae3887c9d56fba0e..407e7041308cef05985064547c04764f62a13735 100644 (file)
--- a/src/msw/joystick.cpp
+++ b/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>

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 994f8e8f9b500998d6ebc359349b6796a29d8f05..b7cf16551aaee3ed605dc6733ebf6170a8dd728b 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -20,18 +20,24 @@
     #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"
-    #include "wx/brush.h"
-    #include "wx/font.h"
-    #include "wx/dc.h"
+#include "wx/listbox.h"
+#include "wx/settings.h"
+#include "wx/brush.h"
+#include "wx/font.h"
+#include "wx/dc.h"
 #endif
 
-#include "wx/msw/private.h"
+#include "wx/dynarray.h"
+#include "wx/log.h"
 
-#include <windows.h>
-#include <windowsx.h>
+#if wxUSE_OWNER_DRAWN
+    #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)

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 950de37d67984e033b426826f6664bf8c065fdb3..86667218174574f55614b12e17ceeb950dede7b8 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/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"

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 58a835eacda9b944471ee8a21317547b4db00de3..3fbfd1f1ca858a8fce3bce00c8098fdc5d44c7bb 100644 (file)
--- a/src/msw/menu.cpp
+++ b/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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index e039ec75d029adf299333bec5870cb8646d77894..70f41fc246d595614d4f0842ac30db068e8e9858 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/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"

diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp
index 282ae2bbdd2fd0a6c94b36de6b641d7eb3c38ec7..83f8fa9558e8a5ccc41a5f481f0f5089d0cefa8d 100644 (file)
--- a/src/msw/minifram.cpp
+++ b/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 <windowsx.h>
+#include "wx/window.h"
+#include "wx/msw/private.h"
 
 #include <string.h>
 

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 15dcd0d3f172fc9054b489004a0216794018ca8f..be1ce8d47efeb67664b7a38f20c57a45f2166524 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/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

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 758d8c74f0afe2166ad97e1313e2eb94d862f7da..d09ddc2dd985103ef5f07b58385de4ce5c915091 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/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"

diff --git a/src/msw/region.cpp b/src/msw/region.cpp
index 128a6eb3b128d59cb7f7ce8b6113701401d156f3..718ad9de5693ecd213f01214d6cd629fe24befad 100644 (file)
--- a/src/msw/region.cpp
+++ b/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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 7c5c1397d601d27a3582279b023a8ec684863385..8e693a39e991339cd57711794dcf5b69ba4707c6 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index a82450f6b3c0b857b9c50c4d2a6927c70fda68f9..15d87f01bc740a0b132768292c266b9732efc227 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/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)

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 0842be5308747d6f3f0cd0100a8d32fdeaf8b733..334fe2c99b488463d58e1308d64c1d00e3b6098f 100644 (file)
--- a/src/msw/timer.cpp
+++ b/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>

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 07ff06e610949d6cf23614697a10400d59dd0f1b..e61d985c06e977ca6ce0c83c8adceb4dbd7b5d48 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 697de7232a1197abbf3f91949781baf5b0065ecb..52a8f79891d1ae004e3db8d1f99d54cc94fa1000 100644 (file)
--- a/src/msw/utils.cpp
+++ b/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 = "";

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 422921686a52e35b29fe1b1a8a334a929c959669..75fc25d84dd397609db14a12f9f50392ffb83945 100644 (file)
--- a/src/msw/window.cpp
+++ b/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
 // ---------------------------------------------------------------------------