Docview mended (grrr) and OGL studio partially working under wxGTK

[wxWidgets.git] / src / msw / app.cpp

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 073c53e737b98191be72649bad7120cab74421b4..8010fbf6dcbfac2799c8ab9e87e0be13fa7b6a37 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -155,6 +155,14 @@ HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
 
 LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
 
+// FIXME wxUSE_ON_FATAL_EXCEPTION is only supported for VC++ now because it
+//       needs compiler support for Win32 SEH. Others (especially Borland)
+//       probably have it too, but I'm not sure about how it works
+#ifndef __VISUALC__
+    #undef wxUSE_ON_FATAL_EXCEPTION
+    #define wxUSE_ON_FATAL_EXCEPTION 0
+#endif // VC++
+
 #if wxUSE_ON_FATAL_EXCEPTION
     static bool gs_handleExceptions = FALSE;
 #endif
@@ -266,7 +274,7 @@ bool wxApp::Initialize()
 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.
     // PLEASE DO NOT ALTER THIS.
-#if defined(__VISUALC__) && !defined(WXMAKINGDLL)
+#if defined(__VISUALC__) && defined(__WIN16__) && !defined(WXMAKINGDLL)
     extern char wxDummyChar;
     if (wxDummyChar) wxDummyChar++;
 #endif
@@ -659,10 +667,6 @@ int wxEntry(WXHINSTANCE hInstance,
 
     // take everything into a try-except block to be able to call
     // OnFatalException() if necessary
-
-    // FIXME other compilers must support Win32 SEH (structured exception
-    //       handling) too, just find the appropriate keyword in their docs!
-    //       Please note that it's _not_ the same as C++ exceptions!
 #if wxUSE_ON_FATAL_EXCEPTION
     __try {
 #endif