Compile fix

[wxWidgets.git] / src / common / appbase.cpp

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 993d4a8d5397e4d178e6f0d6bbe56eae40079d42..339fe276c4e5df373e25c1ac2cf50985c58bb67c 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/appbase.cpp
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/appbase.cpp

-// Purpose:     implements wxAppConsole class
+// Purpose:     implements wxAppConsoleBase class

 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.06.2003 (extracted from common/appcmn.cpp)
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.06.2003 (extracted from common/appcmn.cpp)


@@ -45,6 +45,11 @@
 #include "wx/ptr_scpd.h"
 #include "wx/tokenzr.h"
 
 #include "wx/ptr_scpd.h"
 #include "wx/tokenzr.h"
 

+#if wxUSE_EXCEPTIONS && wxUSE_STL
+    #include <exception>
+    #include <typeinfo>
+#endif
+

 #if !defined(__WXMSW__) || defined(__WXMICROWIN__)
   #include  <signal.h>      // for SIGTRAP used by wxTrap()
 #endif  //Win/Unix
 #if !defined(__WXMSW__) || defined(__WXMICROWIN__)
   #include  <signal.h>      // for SIGTRAP used by wxTrap()
 #endif  //Win/Unix


@@ -110,9 +115,9 @@
 // global vars
 // ----------------------------------------------------------------------------
 
 // global vars
 // ----------------------------------------------------------------------------
 

-wxAppConsole *wxAppConsole::ms_appInstance = NULL;
+wxAppConsole *wxAppConsoleBase::ms_appInstance = NULL;

 
 

-wxAppInitializerFunction wxAppConsole::ms_appInitFn = NULL;
+wxAppInitializerFunction wxAppConsoleBase::ms_appInitFn = NULL;

 
 // ----------------------------------------------------------------------------
 // wxEventLoopPtr
 
 // ----------------------------------------------------------------------------
 // wxEventLoopPtr


@@ -122,19 +127,19 @@ wxAppInitializerFunction wxAppConsole::ms_appInitFn = NULL;
 wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopBase)
 
 // ============================================================================
 wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopBase)
 
 // ============================================================================

-// wxAppConsole implementation
+// wxAppConsoleBase implementation

 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ctor/dtor
 // ----------------------------------------------------------------------------
 
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ctor/dtor
 // ----------------------------------------------------------------------------
 

-wxAppConsole::wxAppConsole()
+wxAppConsoleBase::wxAppConsoleBase()

 {
     m_traits = NULL;
     m_mainLoop = NULL;
 
 {
     m_traits = NULL;
     m_mainLoop = NULL;
 

-    ms_appInstance = this;
+    ms_appInstance = wx_static_cast(wxAppConsole *, this);

 
 #ifdef __WXDEBUG__
     SetTraceMasks();
 
 #ifdef __WXDEBUG__
     SetTraceMasks();


@@ -148,7 +153,7 @@ wxAppConsole::wxAppConsole()
 #endif
 }
 
 #endif
 }
 

-wxAppConsole::~wxAppConsole()
+wxAppConsoleBase::~wxAppConsoleBase()

 {
     delete m_traits;
 }
 {
     delete m_traits;
 }


@@ -157,7 +162,7 @@ wxAppConsole::~wxAppConsole()
 // initilization/cleanup
 // ----------------------------------------------------------------------------
 
 // initilization/cleanup
 // ----------------------------------------------------------------------------
 

-bool wxAppConsole::Initialize(int& argcOrig, wxChar **argvOrig)
+bool wxAppConsoleBase::Initialize(int& argcOrig, wxChar **argvOrig)

 {
 #if wxUSE_INTL
     GetTraits()->SetLocale();
 {
 #if wxUSE_INTL
     GetTraits()->SetLocale();


@@ -182,12 +187,12 @@ bool wxAppConsole::Initialize(int& argcOrig, wxChar **argvOrig)
     return true;
 }
 
     return true;
 }
 

-wxEventLoopBase *wxAppConsole::CreateMainLoop()
+wxEventLoopBase *wxAppConsoleBase::CreateMainLoop()

 {
     return GetTraits()->CreateEventLoop();
 }
 
 {
     return GetTraits()->CreateEventLoop();
 }
 

-void wxAppConsole::CleanUp()
+void wxAppConsoleBase::CleanUp()

 {
     if ( m_mainLoop )
     {
 {
     if ( m_mainLoop )
     {


@@ -208,7 +213,7 @@ void wxAppConsole::CleanUp()
 // OnXXX() callbacks
 // ----------------------------------------------------------------------------
 
 // OnXXX() callbacks
 // ----------------------------------------------------------------------------
 

-bool wxAppConsole::OnInit()
+bool wxAppConsoleBase::OnInit()

 {
 #if wxUSE_CMDLINE_PARSER
     wxCmdLineParser parser(argc, argv);
 {
 #if wxUSE_CMDLINE_PARSER
     wxCmdLineParser parser(argc, argv);


@@ -238,12 +243,12 @@ bool wxAppConsole::OnInit()
     return true;
 }
 
     return true;
 }
 

-int wxAppConsole::OnRun()
+int wxAppConsoleBase::OnRun()

 {
     return MainLoop();
 }
 
 {
     return MainLoop();
 }
 

-int wxAppConsole::OnExit()
+int wxAppConsoleBase::OnExit()

 {
 #if wxUSE_CONFIG
     // delete the config object if any (don't use Get() here, but Set()
 {
 #if wxUSE_CONFIG
     // delete the config object if any (don't use Get() here, but Set()


@@ -254,7 +259,7 @@ int wxAppConsole::OnExit()
     return 0;
 }
 
     return 0;
 }
 

-void wxAppConsole::Exit()
+void wxAppConsoleBase::Exit()

 {
     if (m_mainLoop != NULL)
         ExitMainLoop();
 {
     if (m_mainLoop != NULL)
         ExitMainLoop();


@@ -266,12 +271,12 @@ void wxAppConsole::Exit()
 // traits stuff
 // ----------------------------------------------------------------------------
 
 // traits stuff
 // ----------------------------------------------------------------------------
 

-wxAppTraits *wxAppConsole::CreateTraits()
+wxAppTraits *wxAppConsoleBase::CreateTraits()

 {
     return new wxConsoleAppTraits;
 }
 
 {
     return new wxConsoleAppTraits;
 }
 

-wxAppTraits *wxAppConsole::GetTraits()
+wxAppTraits *wxAppConsoleBase::GetTraits()

 {
     // FIXME-MT: protect this with a CS?
     if ( !m_traits )
 {
     // FIXME-MT: protect this with a CS?
     if ( !m_traits )


@@ -288,14 +293,14 @@ wxAppTraits *wxAppConsole::GetTraits()
 // event processing
 // ----------------------------------------------------------------------------
 
 // event processing
 // ----------------------------------------------------------------------------
 

-int wxAppConsole::MainLoop()
+int wxAppConsoleBase::MainLoop()

 {
     wxEventLoopBaseTiedPtr mainLoop(&m_mainLoop, CreateMainLoop());
 
     return m_mainLoop ? m_mainLoop->Run() : -1;
 }
 
 {
     wxEventLoopBaseTiedPtr mainLoop(&m_mainLoop, CreateMainLoop());
 
     return m_mainLoop ? m_mainLoop->Run() : -1;
 }
 

-void wxAppConsole::ExitMainLoop()
+void wxAppConsoleBase::ExitMainLoop()

 {
     // we should exit from the main event loop, not just any currently active
     // (e.g. modal dialog) event loop
 {
     // we should exit from the main event loop, not just any currently active
     // (e.g. modal dialog) event loop


@@ -305,7 +310,7 @@ void wxAppConsole::ExitMainLoop()
     }
 }
 
     }
 }
 

-bool wxAppConsole::Pending()
+bool wxAppConsoleBase::Pending()

 {
     // use the currently active message loop here, not m_mainLoop, because if
     // we're showing a modal dialog (with its own event loop) currently the
 {
     // use the currently active message loop here, not m_mainLoop, because if
     // we're showing a modal dialog (with its own event loop) currently the


@@ -315,7 +320,7 @@ bool wxAppConsole::Pending()
     return loop && loop->Pending();
 }
 
     return loop && loop->Pending();
 }
 

-bool wxAppConsole::Dispatch()
+bool wxAppConsoleBase::Dispatch()

 {
     // see comment in Pending()
     wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
 {
     // see comment in Pending()
     wxEventLoopBase * const loop = wxEventLoopBase::GetActive();


@@ -323,60 +328,65 @@ bool wxAppConsole::Dispatch()
     return loop && loop->Dispatch();
 }
 
     return loop && loop->Dispatch();
 }
 

-bool wxAppConsole::HasPendingEvents() const
+bool wxAppConsoleBase::HasPendingEvents() const

 {
 {

-    // ensure that we're the only thread to modify the pending events list

     wxENTER_CRIT_SECT( *wxPendingEventsLocker );
 
     wxENTER_CRIT_SECT( *wxPendingEventsLocker );
 

-    if ( !wxPendingEvents )
-    {
-        wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
-        return false;
-    }
+    bool has = wxPendingEvents && !wxPendingEvents->IsEmpty();
+

     wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
     wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );

-    return true;
+
+    return has;

 }
 
 }
 

-void wxAppConsole::ProcessPendingEvents()
+/* static */
+bool wxAppConsoleBase::IsMainLoopRunning()
+{
+    const wxAppConsole * const app = GetInstance();
+
+    return app && app->m_mainLoop != NULL;
+}
+
+void wxAppConsoleBase::ProcessPendingEvents()

 {
 #if wxUSE_THREADS
     if ( !wxPendingEventsLocker )
         return;
 #endif
 
 {
 #if wxUSE_THREADS
     if ( !wxPendingEventsLocker )
         return;
 #endif
 

-    if ( !HasPendingEvents() )
-        return;
-

     wxENTER_CRIT_SECT( *wxPendingEventsLocker );
 
     wxENTER_CRIT_SECT( *wxPendingEventsLocker );
 

-    // iterate until the list becomes empty
-    wxList::compatibility_iterator node = wxPendingEvents->GetFirst();
-    while (node)
+    if (wxPendingEvents)

     {
     {

-        wxEvtHandler *handler = (wxEvtHandler *)node->GetData();
-        wxPendingEvents->Erase(node);
+        // iterate until the list becomes empty
+        wxList::compatibility_iterator node = wxPendingEvents->GetFirst();
+        while (node)
+        {
+            wxEvtHandler *handler = (wxEvtHandler *)node->GetData();
+            wxPendingEvents->Erase(node);

 
 

-        // In ProcessPendingEvents(), new handlers might be add
-        // and we can safely leave the critical section here.
-        wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+            // In ProcessPendingEvents(), new handlers might be add
+            // and we can safely leave the critical section here.
+            wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );

 
 

-        handler->ProcessPendingEvents();
+            handler->ProcessPendingEvents();

 
 

-        wxENTER_CRIT_SECT( *wxPendingEventsLocker );
+            wxENTER_CRIT_SECT( *wxPendingEventsLocker );

 
 

-        node = wxPendingEvents->GetFirst();
+            node = wxPendingEvents->GetFirst();
+        }

     }
 
     wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
 }
 
     }
 
     wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
 }
 

-void wxAppConsole::WakeUpIdle()
+void wxAppConsoleBase::WakeUpIdle()

 {
     if ( m_mainLoop )
         m_mainLoop->WakeUp();
 }
 
 {
     if ( m_mainLoop )
         m_mainLoop->WakeUp();
 }
 

-bool wxAppConsole::ProcessIdle()
+bool wxAppConsoleBase::ProcessIdle()

 {
     wxIdleEvent event;
 
 {
     wxIdleEvent event;
 


@@ -385,7 +395,7 @@ bool wxAppConsole::ProcessIdle()
     return event.MoreRequested();
 }
 
     return event.MoreRequested();
 }
 

-int wxAppConsole::FilterEvent(wxEvent& WXUNUSED(event))
+int wxAppConsoleBase::FilterEvent(wxEvent& WXUNUSED(event))

 {
     // process the events normally by default
     return -1;
 {
     // process the events normally by default
     return -1;


@@ -398,21 +408,47 @@ int wxAppConsole::FilterEvent(wxEvent& WXUNUSED(event))
 #if wxUSE_EXCEPTIONS
 
 void
 #if wxUSE_EXCEPTIONS
 
 void

-wxAppConsole::HandleEvent(wxEvtHandler *handler,
-                          wxEventFunction func,
-                          wxEvent& event) const
+wxAppConsoleBase::HandleEvent(wxEvtHandler *handler,
+                              wxEventFunction func,
+                              wxEvent& event) const

 {
     // by default, simply call the handler
     (handler->*func)(event);
 }
 
 {
     // by default, simply call the handler
     (handler->*func)(event);
 }
 

+void wxAppConsoleBase::OnUnhandledException()
+{
+#ifdef __WXDEBUG__
+    // we're called from an exception handler so we can re-throw the exception
+    // to recover its type
+    wxString what;
+    try
+    {
+        throw;
+    }
+#if wxUSE_STL
+    catch ( std::exception& e )
+    {
+        what.Printf("std::exception of type \"%s\", what() = \"%s\"",
+                    typeid(e).name(), e.what());
+    }
+#endif // wxUSE_STL
+    catch ( ... )
+    {
+        what = "unknown exception";
+    }
+
+    wxMessageOutputBest().Printf(
+        "*** Caught unhandled %s; terminating\n", what
+    );
+#endif // __WXDEBUG__
+}
+

 // ----------------------------------------------------------------------------
 // exceptions support
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // exceptions support
 // ----------------------------------------------------------------------------
 

-#if wxUSE_EXCEPTIONS
-
-bool wxAppConsole::OnExceptionInMainLoop()
+bool wxAppConsoleBase::OnExceptionInMainLoop()

 {
     throw;
 
 {
     throw;
 


@@ -422,9 +458,6 @@ bool wxAppConsole::OnExceptionInMainLoop()
 #endif
 }
 
 #endif
 }
 

-#endif // wxUSE_EXCEPTIONS
-
-

 #endif // wxUSE_EXCEPTIONS
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_EXCEPTIONS
 
 // ----------------------------------------------------------------------------


@@ -435,7 +468,7 @@ bool wxAppConsole::OnExceptionInMainLoop()
 
 #define OPTION_VERBOSE _T("verbose")
 
 
 #define OPTION_VERBOSE _T("verbose")
 

-void wxAppConsole::OnInitCmdLine(wxCmdLineParser& parser)
+void wxAppConsoleBase::OnInitCmdLine(wxCmdLineParser& parser)

 {
     // the standard command line options
     static const wxCmdLineEntryDesc cmdLineDesc[] =
 {
     // the standard command line options
     static const wxCmdLineEntryDesc cmdLineDesc[] =


@@ -474,7 +507,7 @@ void wxAppConsole::OnInitCmdLine(wxCmdLineParser& parser)
     parser.SetDesc(cmdLineDesc);
 }
 
     parser.SetDesc(cmdLineDesc);
 }
 

-bool wxAppConsole::OnCmdLineParsed(wxCmdLineParser& parser)
+bool wxAppConsoleBase::OnCmdLineParsed(wxCmdLineParser& parser)

 {
 #if wxUSE_LOG
     if ( parser.Found(OPTION_VERBOSE) )
 {
 #if wxUSE_LOG
     if ( parser.Found(OPTION_VERBOSE) )


@@ -488,14 +521,14 @@ bool wxAppConsole::OnCmdLineParsed(wxCmdLineParser& parser)
     return true;
 }
 
     return true;
 }
 

-bool wxAppConsole::OnCmdLineHelp(wxCmdLineParser& parser)
+bool wxAppConsoleBase::OnCmdLineHelp(wxCmdLineParser& parser)

 {
     parser.Usage();
 
     return false;
 }
 
 {
     parser.Usage();
 
     return false;
 }
 

-bool wxAppConsole::OnCmdLineError(wxCmdLineParser& parser)
+bool wxAppConsoleBase::OnCmdLineError(wxCmdLineParser& parser)

 {
     parser.Usage();
 
 {
     parser.Usage();
 


@@ -509,8 +542,8 @@ bool wxAppConsole::OnCmdLineError(wxCmdLineParser& parser)
 // ----------------------------------------------------------------------------
 
 /* static */
 // ----------------------------------------------------------------------------
 
 /* static */

-bool wxAppConsole::CheckBuildOptions(const char *optionsSignature,
-                                     const char *componentName)
+bool wxAppConsoleBase::CheckBuildOptions(const char *optionsSignature,
+                                         const char *componentName)

 {
 #if 0 // can't use wxLogTrace, not up and running yet
     printf("checking build options object '%s' (ptr %p) in '%s'\n",
 {
 #if 0 // can't use wxLogTrace, not up and running yet
     printf("checking build options object '%s' (ptr %p) in '%s'\n",


@@ -539,19 +572,19 @@ bool wxAppConsole::CheckBuildOptions(const char *optionsSignature,
 
 #ifdef __WXDEBUG__
 
 
 #ifdef __WXDEBUG__
 

-void wxAppConsole::OnAssertFailure(const wxChar *file,
-                                   int line,
-                                   const wxChar *func,
-                                   const wxChar *cond,
-                                   const wxChar *msg)
+void wxAppConsoleBase::OnAssertFailure(const wxChar *file,
+                                       int line,
+                                       const wxChar *func,
+                                       const wxChar *cond,
+                                       const wxChar *msg)

 {
     ShowAssertDialog(file, line, func, cond, msg, GetTraits());
 }
 
 {
     ShowAssertDialog(file, line, func, cond, msg, GetTraits());
 }
 

-void wxAppConsole::OnAssert(const wxChar *file,
-                            int line,
-                            const wxChar *cond,
-                            const wxChar *msg)
+void wxAppConsoleBase::OnAssert(const wxChar *file,
+                                int line,
+                                const wxChar *cond,
+                                const wxChar *msg)

 {
     OnAssertFailure(file, line, NULL, cond, msg);
 }
 {
     OnAssertFailure(file, line, NULL, cond, msg);
 }


@@ -632,7 +665,7 @@ GSocketGUIFunctionsTable* wxConsoleAppTraitsBase::GetSocketGUIFunctionsTable()
 #if wxUSE_INTL
 void wxAppTraitsBase::SetLocale()
 {
 #if wxUSE_INTL
 void wxAppTraitsBase::SetLocale()
 {

-    setlocale(LC_ALL, "");
+    wxSetlocale(LC_ALL, "");

     wxUpdateLocaleIsUtf8();
 }
 #endif
     wxUpdateLocaleIsUtf8();
 }
 #endif


@@ -923,7 +956,7 @@ bool DoShowAssertDialog(const wxString& msg)
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 

-    switch ( ::MessageBox(NULL, msgDlg, _T("wxWidgets Debug Alert"),
+    switch ( ::MessageBox(NULL, msgDlg.wx_str(), _T("wxWidgets Debug Alert"),

                           MB_YESNOCANCEL | MB_ICONSTOP ) )
     {
         case IDYES:
                           MB_YESNOCANCEL | MB_ICONSTOP ) )
     {
         case IDYES:


@@ -991,7 +1024,7 @@ void ShowAssertDialog(const wxString& szFile,
 
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
         msg << wxT("\r\n");
 
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
         msg << wxT("\r\n");

-        OutputDebugString(msg );
+        OutputDebugString(msg.wx_str());

 #else
         // send to stderr
         wxFprintf(stderr, wxT("%s\n"), msg.c_str());
 #else
         // send to stderr
         wxFprintf(stderr, wxT("%s\n"), msg.c_str());