Need to use the same instance handles

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

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 1012498409fffba56ba0d74dab2ddf838d3c8f00..1909600fa739eaeef56c7a2b9e66c849de3abf3c 100644 (file)
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -41,6 +41,11 @@
 
 #include "wx/msw/private.h"
 
+// For MB_TASKMODAL
+#ifdef __WXWINCE__
+#include "wx/msw/wince/missing.h"
+#endif
+
 #if wxUSE_THREADS
     #include "wx/thread.h"
 
@@ -227,8 +232,8 @@ bool wxEventLoopImpl::SendIdleMessage()
 wxEventLoopImpl::wxCatchAllResponse wxEventLoopImpl::OnCatchAll()
 {
     switch (::MessageBox(NULL, 
-            _T("An unhandled exception occurred. 'Abort' will terminate the program,\r\n"
-            "'Retry' will close the current dialog, 'Ignore' will try to continue."), 
+            _T("An unhandled exception occurred. 'Abort' will terminate the program,\r\n\
+'Retry' will close the current dialog, 'Ignore' will try to continue."),
             _T("Unhandled exception"), 
             MB_ABORTRETRYIGNORE|MB_ICONERROR|MB_TASKMODAL))
     {
@@ -276,7 +281,7 @@ int wxEventLoop::Run()
     // wxModalEventLoop depends on this (so we can't just use ON_BLOCK_EXIT or
     // something similar here)
 #if wxUSE_EXCEPTIONS
-    bool retryAfterException;
+    bool retryAfterException = false;
     do {
         retryAfterException=false;
 #endif
@@ -327,7 +332,8 @@ int wxEventLoop::Run()
                     // there is none yet. OTOH, wxCATCH_ALL isn't
                     // expanded unless wxUSE_EXCEPTIONS, so its
                     // safe to use throw here.
-                    throw;  
+                    throw;
+                default:
                     break;
     }
         )