compilation fixes (apparently, gcc <3.4 didn't validate code in templates that were...

[wxWidgets.git] / include / wx / app.h

diff --git a/include/wx/app.h b/include/wx/app.h
index f172a41422c536684bf72a25c586736cf6b3ad3a..a0c4a71fb16606a2079cea9d8248135d60f53fca 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -117,6 +117,17 @@ public:
     virtual void OnFatalException() { }
 
 #if wxUSE_EXCEPTIONS
+    // function called if an uncaught exception is caught inside the main
+    // event loop: it may return true to continue running the event loop or
+    // false to stop it (in the latter case it may rethrow the exception as
+    // well)
+    virtual bool OnExceptionInMainLoop() {
+        throw;
+#if defined(__DMC__) || (defined(_MSC_VER) && _MSC_VER < 1200)
+        return false;
+#endif
+        }
+
     // Called when an unhandled C++ exception occurs inside OnRun(): note that
     // the exception type is lost by now, so if you really want to handle the
     // exception you should override OnRun() and put a try/catch around
@@ -621,20 +632,26 @@ public:
     // we need HINSTANCE declaration to define WinMain()
     #include "wx/msw/wrapwin.h"
 
-    #ifdef SW_SHOWNORMAL
-    #define wxSW_SHOWNORMAL SW_SHOWNORMAL
+    #ifndef SW_SHOWNORMAL
+        #define SW_SHOWNORMAL 1
+    #endif
+
+    // WinMain() is always ANSI, even in Unicode build, under normal Windows
+    // but is always Unicode under CE
+    #ifdef __WXWINCE__
+        typedef wchar_t *wxCmdLineArgType;
     #else
-    #define wxSW_SHOWNORMAL 0
+        typedef char *wxCmdLineArgType;
     #endif
 
     #define IMPLEMENT_WXWIN_MAIN \
         extern int wxEntry(HINSTANCE hInstance,                               \
                            HINSTANCE hPrevInstance = NULL,                    \
-                           char *pCmdLine = NULL,                             \
-                           int nCmdShow = wxSW_SHOWNORMAL);                         \
+                           wxCmdLineArgType pCmdLine = NULL,                  \
+                           int nCmdShow = SW_SHOWNORMAL);                     \
         extern "C" int WINAPI WinMain(HINSTANCE hInstance,                    \
                                       HINSTANCE hPrevInstance,                \
-                                      char *lpCmdLine,                        \
+                                      wxCmdLineArgType lpCmdLine,             \
                                       int nCmdShow)                           \
         {                                                                     \
             return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow);    \