MinGW compilation fixes.

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

diff --git a/configure b/configure
index 48b370c4e95d0713d077ff0a5464ed0e9014fb3d..0541017e345082c969ea99b4cf180ec25305f18c 100755 (executable)
--- a/configure
+++ b/configure
@@ -19371,7 +19371,7 @@ echo "${ECHO_T}$wx_cv_w32api_win32_ie" >&6
         CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400"
     fi
 
         CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400"
     fi
 

-            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
+            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"

 
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"
 
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"


@@ -19379,7 +19379,7 @@ echo "${ECHO_T}$wx_cv_w32api_win32_ie" >&6
 
     case "${host}" in
         *-*-cygwin* )
 
     case "${host}" in
         *-*-cygwin* )

-                        LIBS="$LIBS -lkernel32 -luser32 -lcomdlg32"
+                        LIBS="$LIBS -lkernel32 -luser32"

             TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
     esac
 
             TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
     esac
 

diff --git a/configure.in b/configure.in
index 1f615fe1b4bcf9953487647154b3df9832084bf6..76b1a6ee3a9311823399a2d8c65d45402162e545 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2102,7 +2102,7 @@ if test "$USE_WIN32" = 1 ; then
 
     dnl --- FIXME: This is still a somewhat random list of libs,
     dnl ---        some of them should probably be included conditionally.
 
     dnl --- FIXME: This is still a somewhat random list of libs,
     dnl ---        some of them should probably be included conditionally.

-    LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
+    LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"

 
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"
 
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"


@@ -2111,7 +2111,7 @@ if test "$USE_WIN32" = 1 ; then
     case "${host}" in
         *-*-cygwin* )
             dnl Cygwin doesn't include these by default
     case "${host}" in
         *-*-cygwin* )
             dnl Cygwin doesn't include these by default

-            LIBS="$LIBS -lkernel32 -luser32 -lcomdlg32"
+            LIBS="$LIBS -lkernel32 -luser32"

             TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
     esac
 
             TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
     esac
 

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 5f31c7f6f4b4255876656f42029a5c86993b1348..badd90155da9bbf8797988c8055a04276be683b2 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -24,6 +24,15 @@
 #endif
 #endif
 
 #endif
 #endif
 

+/*
+ * GCC does not have SEH (__try/__catch)
+ */
+
+#if defined(__GNUG__)
+    #undef wxUSE_ON_FATAL_EXCEPTION
+    #define wxUSE_ON_FATAL_EXCEPTION 0
+#endif
+

 /*
  * wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior
  */
 /*
  * wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior
  */

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 598204ad13ea33525326119f92dad8599717819c..6898c219b9292e326d5eedf2841529e215754b7e 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -35,6 +35,8 @@
     #include "wx/list.h"
     #include "wx/log.h"
     #include "wx/msgdlg.h"
     #include "wx/list.h"
     #include "wx/log.h"
     #include "wx/msgdlg.h"

+    #include "wx/bitmap.h"
+    #include "wx/confbase.h"

 #endif
 
 #include "wx/apptrait.h"
 #endif
 
 #include "wx/apptrait.h"

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 6ad79060fc1bbd96b8d80f0d294db452fe2312e7..d53937131a121479d6920f2d841a7e3f60942cb4 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -30,6 +30,7 @@
 
 #include "wx/event.h"
 #include "wx/app.h"
 
 #include "wx/event.h"
 #include "wx/app.h"

+#include "wx/init.h"

 #include "wx/cmdline.h"
 
 #include "wx/msw/private.h"
 #include "wx/cmdline.h"
 
 #include "wx/msw/private.h"

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index 7eb4e7796405dd7d0577bdfd17844db4b16f8d24..99a1bdcd3e8865ce636a921e5c60021ecbe41da6 100644 (file)
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -30,6 +30,7 @@
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"

+#include "wx/utils.h"

 #include "wx/unix/execute.h"
 
 // for waitpid()
 #include "wx/unix/execute.h"
 
 // for waitpid()