SF patch #938489

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

diff --git a/include/wx/app.h b/include/wx/app.h
index ccc781568e35f504548bb9f2a43f7f33e2136d3e..20439c1e52ec6a26d246d44dfe0a9fc603ea636e 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -121,7 +121,12 @@ public:
     // 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; }
+    virtual bool OnExceptionInMainLoop() {
+        throw;
+#ifdef __DMC__
+        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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 5138801aa3bf6ef0044fdb2b3efeb07f106bffc6..fe707c22199ce0a93e6f677e5070fdd23aba09ee 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -524,6 +524,8 @@ typedef struct {
 
   WINCOMMCTRLAPI BOOL WINAPI _TrackMouseEvent(LPTRACKMOUSEEVENT lpEventTrack);
 
+  #define CCM_SETUNICODEFORMAT 8197
+  
 #endif
 
 // This didn't appear in mingw until 2.95.2