X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a5bcc4db0851bf8cd3063917511b0b17c7f9679..43a6124f651fe08a8f8a9529e5d495017ebd62b7:/src/msw/app.cpp

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 6143dbb852..f0d2197704 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -76,6 +76,11 @@
 
 #include "wx/msw/wrapcctl.h"
 
+// For MB_TASKMODAL
+#ifdef __WXWINCE__
+#include "wx/msw/wince/missing.h"
+#endif
+
 #if (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \
     !defined(__CYGWIN__) && !defined(__DIGITALMARS__) && !defined(__WXWINCE__) && \
     (!defined(_MSC_VER) || (_MSC_VER > 1100))
@@ -94,8 +99,13 @@ extern void wxSetKeyboardHook(bool doIt);
 
 // NB: all "NoRedraw" classes must have the same names as the "normal" classes
 //     with NR suffix - wxWindow::MSWCreate() supposes this
+#ifdef __WXWINCE__
+      wxChar *wxCanvasClassName;
+      wxChar *wxCanvasClassNameNR;
+#else
 const wxChar *wxCanvasClassName        = wxT("wxWindowClass");
 const wxChar *wxCanvasClassNameNR      = wxT("wxWindowClassNR");
+#endif
 const wxChar *wxMDIFrameClassName      = wxT("wxMDIFrameClass");
 const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR");
 const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass");
@@ -249,6 +259,20 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     // ensure that base cleanup is done if we return too early
     wxCallBaseCleanup callBaseCleanup(this);
 
+#ifdef __WXWINCE__
+    wxString tmp = GetAppName();
+    tmp += wxT("ClassName");
+    wxCanvasClassName = wxStrdup( tmp.c_str() );
+    tmp += wxT("NR");
+    wxCanvasClassNameNR = wxStrdup( tmp.c_str() );
+    HWND hWnd = FindWindow( wxCanvasClassNameNR, NULL );
+    if (hWnd)
+    {
+        SetForegroundWindow( (HWND)(((DWORD)hWnd)|0x01) );
+        return false;
+    }
+#endif
+
     // the first thing to do is to check if we're trying to run an Unicode
     // program under Win9x w/o MSLU emulation layer - if so, abort right now
     // as it has no chance to work
@@ -262,11 +286,11 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         (
          NULL,
          _T("This program uses Unicode and requires Windows NT/2000/XP/CE.\nProgram aborted."),
-         _T("wxWindows Fatal Error"),
+         _T("wxWidgets Fatal Error"),
          MB_ICONERROR | MB_OK
         );
 
-        return FALSE;
+        return false;
     }
 #endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
 
@@ -298,20 +322,19 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     RegisterWindowClasses();
 
-#if defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     // Create the brush for disabling bitmap buttons
-
     LOGBRUSH lb;
     lb.lbStyle = BS_PATTERN;
     lb.lbColor = 0;
     lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") );
     if ( lb.lbHatch )
     {
-        wxDisableButtonBrush = ::CreateBrushIndirect( & lb );
+        wxDisableButtonBrush = ::CreateBrushIndirect( &lb );
         ::DeleteObject( (HGDIOBJ)lb.lbHatch );
     }
-    //else: wxWindows resources are probably not linked in
-#endif
+    //else: wxWidgets resources are probably not linked in
+#endif // !__WXMICROWIN__ && !__WXWINCE__
 
 #if wxUSE_PENWINDOWS
     wxRegisterPenWin();
@@ -320,7 +343,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100);
 
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
-    wxSetKeyboardHook(TRUE);
+    wxSetKeyboardHook(true);
 #endif
 
     callBaseCleanup.Dismiss();
@@ -407,7 +430,7 @@ bool wxApp::RegisterWindowClasses()
         wxLogLastError(wxT("RegisterClass(no redraw MDI child)"));
     }
 
-    return TRUE;
+    return true;
 }
 
 // ---------------------------------------------------------------------------
@@ -416,7 +439,7 @@ bool wxApp::RegisterWindowClasses()
 
 bool wxApp::UnregisterWindowClasses()
 {
-    bool retval = TRUE;
+    bool retval = true;
 
 #ifndef __WXMICROWIN__
     // MDI frame window class.
@@ -424,7 +447,7 @@ bool wxApp::UnregisterWindowClasses()
     {
         wxLogLastError(wxT("UnregisterClass(MDI parent)"));
 
-        retval = FALSE;
+        retval = false;
     }
 
     // "no redraw" MDI frame
@@ -432,7 +455,7 @@ bool wxApp::UnregisterWindowClasses()
     {
         wxLogLastError(wxT("UnregisterClass(no redraw MDI parent frame)"));
 
-        retval = FALSE;
+        retval = false;
     }
 
     // MDI child frame window class.
@@ -440,7 +463,7 @@ bool wxApp::UnregisterWindowClasses()
     {
         wxLogLastError(wxT("UnregisterClass(MDI child)"));
 
-        retval = FALSE;
+        retval = false;
     }
 
     // "no redraw" MDI child frame
@@ -448,7 +471,7 @@ bool wxApp::UnregisterWindowClasses()
     {
         wxLogLastError(wxT("UnregisterClass(no redraw MDI child)"));
 
-        retval = FALSE;
+        retval = false;
     }
 
     // canvas class name
@@ -456,14 +479,14 @@ bool wxApp::UnregisterWindowClasses()
     {
         wxLogLastError(wxT("UnregisterClass(canvas)"));
 
-        retval = FALSE;
+        retval = false;
     }
 
     if ( !::UnregisterClass(wxCanvasClassNameNR, wxhInstance) )
     {
         wxLogLastError(wxT("UnregisterClass(no redraw canvas)"));
 
-        retval = FALSE;
+        retval = false;
     }
 #endif // __WXMICROWIN__
 
@@ -479,7 +502,7 @@ void wxApp::CleanUp()
     wxAppBase::CleanUp();
 
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
-    wxSetKeyboardHook(FALSE);
+    wxSetKeyboardHook(false);
 #endif
 
 #if wxUSE_PENWINDOWS
@@ -509,6 +532,11 @@ void wxApp::CleanUp()
 
     delete wxWinHandleHash;
     wxWinHandleHash = NULL;
+    
+#ifdef __WXWINCE__
+    free( wxCanvasClassName );
+    free( wxCanvasClassNameNR );
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -535,6 +563,10 @@ wxApp::~wxApp()
     delete [] argv;
 }
 
+// ----------------------------------------------------------------------------
+// wxApp idle handling
+// ----------------------------------------------------------------------------
+
 void wxApp::OnIdle(wxIdleEvent& event)
 {
     wxAppBase::OnIdle(event);
@@ -565,10 +597,14 @@ void wxApp::WakeUpIdle()
     }
 }
 
+// ----------------------------------------------------------------------------
+// other wxApp event hanlders
+// ----------------------------------------------------------------------------
+
 void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
 {
     if (GetTopWindow())
-        GetTopWindow()->Close(TRUE);
+        GetTopWindow()->Close(true);
 }
 
 // Default behaviour: close the application with prompts. The
@@ -578,15 +614,18 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
     if (GetTopWindow())
     {
         if (!GetTopWindow()->Close(!event.CanVeto()))
-            event.Veto(TRUE);
+            event.Veto(true);
     }
 }
 
+// ----------------------------------------------------------------------------
+// miscellaneous
+// ----------------------------------------------------------------------------
+
 /* static */
 int wxApp::GetComCtl32Version()
 {
-//FIX ME FOR DIGITALMARS!!
-#if defined(__WXMICROWIN__) || defined(__WXWINCE__) || defined(__DIGITALMARS__)
+#if defined(__WXMICROWIN__) || defined(__WXWINCE__)
     return 0;
 #else
     // cache the result
@@ -673,7 +712,7 @@ int wxApp::GetComCtl32Version()
 bool wxApp::Yield(bool onlyIfNeeded)
 {
     // MT-FIXME
-    static bool s_inYield = FALSE;
+    static bool s_inYield = false;
 
 #if wxUSE_LOG
     // disable log flushing from here because a call to wxYield() shouldn't
@@ -688,10 +727,10 @@ bool wxApp::Yield(bool onlyIfNeeded)
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 
-        return FALSE;
+        return false;
     }
 
-    s_inYield = TRUE;
+    s_inYield = true;
 
     // we don't want to process WM_QUIT from here - it should be processed in
     // the main event loop in order to stop it
@@ -715,8 +754,48 @@ bool wxApp::Yield(bool onlyIfNeeded)
     wxLog::Resume();
 #endif // wxUSE_LOG
 
-    s_inYield = FALSE;
+    s_inYield = false;
+
+    return true;
+}
 
-    return TRUE;
+#if wxUSE_EXCEPTIONS
+
+// ----------------------------------------------------------------------------
+// exception handling
+// ----------------------------------------------------------------------------
+
+bool wxApp::OnExceptionInMainLoop()
+{
+    // ask the user about what to do: use the Win32 API function here as it
+    // could be dangerous to use any wxWidgets code in this state
+    switch (
+            ::MessageBox
+              (
+                NULL,
+                _T("An unhandled exception occurred. Press \"Abort\" to \
+terminate the program,\r\n\
+\"Retry\" to exit the program normally and \"Ignore\" to try to continue."),
+                _T("Unhandled exception"),
+                MB_ABORTRETRYIGNORE |
+                MB_ICONERROR| 
+                MB_TASKMODAL
+              )
+           )
+    {
+        case IDABORT:
+            throw;
+
+        default:
+            wxFAIL_MSG( _T("unexpected MessageBox() return code") );
+            // fall through
+
+        case IDRETRY:
+            return false;
+
+        case IDIGNORE:
+            return true;
+    }
 }
 
+#endif // wxUSE_EXCEPTIONS