refactor wxStaticText::Ellipsize so it's a static public utility function; document...

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 68ae29e35821adee26a75bde6657667dfe9d6071..5a741b70ac439b3c2148aafe03a821f4aa963536 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -51,29 +51,18 @@
     #include <typeinfo>
 #endif
 
     #include <typeinfo>
 #endif
 

+#ifndef __WXPALMOS5__

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

+#endif // ! __WXPALMOS5__

 
 #if wxUSE_FONTMAP
     #include "wx/fontmap.h"
 #endif // wxUSE_FONTMAP
 
 
 #if wxUSE_FONTMAP
     #include "wx/fontmap.h"
 #endif // wxUSE_FONTMAP
 

-#if defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
-    // For MacTypes.h for Debugger function
-    #include <CoreFoundation/CFBase.h>
-#endif
-
-#if defined(__WXMAC__)
-    #ifdef __DARWIN__
-        #include  <CoreServices/CoreServices.h>
-    #else
-        #include  "wx/mac/private.h"  // includes mac headers
-    #endif
-#endif // __WXMAC__
-

 #ifdef __WXDEBUG__
     #if wxUSE_STACKWALKER
         #include "wx/stackwalk.h"
 #ifdef __WXDEBUG__
     #if wxUSE_STACKWALKER
         #include "wx/stackwalk.h"


@@ -81,6 +70,8 @@
             #include "wx/msw/debughlp.h"
         #endif
     #endif // wxUSE_STACKWALKER
             #include "wx/msw/debughlp.h"
         #endif
     #endif // wxUSE_STACKWALKER

+
+    #include "wx/recguard.h"

 #endif // __WXDEBUG__
 
 // wxABI_VERSION can be defined when compiling applications but it should be
 #endif // __WXDEBUG__
 
 // wxABI_VERSION can be defined when compiling applications but it should be


@@ -120,6 +111,8 @@ wxAppConsole *wxAppConsoleBase::ms_appInstance = NULL;
 
 wxAppInitializerFunction wxAppConsoleBase::ms_appInitFn = NULL;
 
 
 wxAppInitializerFunction wxAppConsoleBase::ms_appInitFn = NULL;
 

+wxSocketManager *wxAppTraitsBase::ms_manager = NULL;
+

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


@@ -140,7 +133,7 @@ wxAppConsoleBase::wxAppConsoleBase()
     m_traits = NULL;
     m_mainLoop = NULL;
 
     m_traits = NULL;
     m_mainLoop = NULL;
 

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

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


@@ -163,22 +156,18 @@ wxAppConsoleBase::~wxAppConsoleBase()
 // initilization/cleanup
 // ----------------------------------------------------------------------------
 
 // initilization/cleanup
 // ----------------------------------------------------------------------------
 

-bool wxAppConsoleBase::Initialize(int& argcOrig, wxChar **argvOrig)
+bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **argv)

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

-    // remember the command line arguments
-    argc = argcOrig;
-    argv = argvOrig;
-

 #if wxUSE_THREADS
     wxPendingEventsLocker = new wxCriticalSection;
 #endif
 
 #ifndef __WXPALMOS__
 #if wxUSE_THREADS
     wxPendingEventsLocker = new wxCriticalSection;
 #endif
 
 #ifndef __WXPALMOS__

-    if ( m_appName.empty() && argv )
+    if ( m_appName.empty() && argv && argv[0] )

     {
         // the application name is, by default, the name of its executable file
         wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL);
     {
         // the application name is, by default, the name of its executable file
         wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL);


@@ -290,6 +279,13 @@ wxAppTraits *wxAppConsoleBase::GetTraits()
     return m_traits;
 }
 
     return m_traits;
 }
 

+/* static */
+wxAppTraits *wxAppConsoleBase::GetTraitsIfExists()
+{
+    wxAppConsole * const app = GetInstance();
+    return app ? app->GetTraits() : NULL;
+}
+

 // ----------------------------------------------------------------------------
 // event processing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event processing
 // ----------------------------------------------------------------------------


@@ -359,21 +355,21 @@ void wxAppConsoleBase::ProcessPendingEvents()
 
     if (wxPendingEvents)
     {
 
     if (wxPendingEvents)
     {

-        // iterate until the list becomes empty
+        // iterate until the list becomes empty: the handlers remove themselves
+        // from it when they don't have any more pending events

         wxList::compatibility_iterator node = wxPendingEvents->GetFirst();
         while (node)
         {
         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 );
 

+            wxEvtHandler *handler = (wxEvtHandler *)node->GetData();

             handler->ProcessPendingEvents();
 
             wxENTER_CRIT_SECT( *wxPendingEventsLocker );
 
             handler->ProcessPendingEvents();
 
             wxENTER_CRIT_SECT( *wxPendingEventsLocker );
 

+            // restart as the iterators could have been invalidated

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


@@ -645,13 +641,6 @@ void wxConsoleAppTraitsBase::RemoveFromPendingDelete(wxObject * WXUNUSED(object)
     // nothing to do
 }
 
     // nothing to do
 }
 

-#if wxUSE_SOCKETS
-GSocketGUIFunctionsTable* wxConsoleAppTraitsBase::GetSocketGUIFunctionsTable()
-{
-    return NULL;
-}
-#endif
-

 // ----------------------------------------------------------------------------
 // wxAppTraits
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxAppTraits
 // ----------------------------------------------------------------------------


@@ -664,6 +653,35 @@ void wxAppTraitsBase::SetLocale()
 }
 #endif
 
 }
 #endif
 

+#if wxUSE_THREADS
+void wxMutexGuiEnterImpl();
+void wxMutexGuiLeaveImpl();
+
+void wxAppTraitsBase::MutexGuiEnter()
+{
+    wxMutexGuiEnterImpl();
+}
+
+void wxAppTraitsBase::MutexGuiLeave()
+{
+    wxMutexGuiLeaveImpl();
+}
+
+void WXDLLIMPEXP_BASE wxMutexGuiEnter()
+{
+    wxAppTraits * const traits = wxAppConsoleBase::GetTraitsIfExists();
+    if ( traits )
+        traits->MutexGuiEnter();
+}
+
+void WXDLLIMPEXP_BASE wxMutexGuiLeave()
+{
+    wxAppTraits * const traits = wxAppConsoleBase::GetTraitsIfExists();
+    if ( traits )
+        traits->MutexGuiLeave();
+}
+#endif // wxUSE_THREADS
+

 #ifdef __WXDEBUG__
 
 bool wxAppTraitsBase::ShowAssertDialog(const wxString& msgOriginal)
 #ifdef __WXDEBUG__
 
 bool wxAppTraitsBase::ShowAssertDialog(const wxString& msgOriginal)


@@ -808,20 +826,17 @@ static void wxDoOnAssert(const wxString& szFile,
                          const wxString& szMsg = wxEmptyString)
 {
     // FIXME MT-unsafe
                          const wxString& szMsg = wxEmptyString)
 {
     // FIXME MT-unsafe

-    static bool s_bInAssert = false;
+    static int s_bInAssert = 0;

 
 

-    if ( s_bInAssert )
+    wxRecursionGuard guard(s_bInAssert);
+    if ( guard.IsInside() )

     {
     {

-        // He-e-e-e-elp!! we're trapped in endless loop
+        // can't use assert here to avoid infinite loops, so just trap

         wxTrap();
 
         wxTrap();
 

-        s_bInAssert = false;
-

         return;
     }
 
         return;
     }
 

-    s_bInAssert = true;
-

     if ( !wxTheApp )
     {
         // by default, show the assert dialog box -- we can't customize this
     if ( !wxTheApp )
     {
         // by default, show the assert dialog box -- we can't customize this


@@ -835,8 +850,6 @@ static void wxDoOnAssert(const wxString& szFile,
         wxTheApp->OnAssertFailure(szFile.c_str(), nLine, szFunc.c_str(),
                                   szCond.c_str(), szMsg.c_str());
     }
         wxTheApp->OnAssertFailure(szFile.c_str(), nLine, szFunc.c_str(),
                                   szCond.c_str(), szMsg.c_str());
     }

-
-    s_bInAssert = false;

 }
 
 void wxOnAssert(const wxString& szFile,
 }
 
 void wxOnAssert(const wxString& szFile,