X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/000eea7a2ef45e4053b66bdcc8fd57bfb2e907de..e215c9959cfae9db319cbca376553301dfa17cf1:/src/common/appbase.cpp

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index e7eec2c75e..5a741b70ac 100644
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -51,29 +51,18 @@
     #include <typeinfo>
 #endif
 
+#ifndef __WXPALMOS5__
 #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 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"
@@ -122,6 +111,8 @@ wxAppConsole *wxAppConsoleBase::ms_appInstance = NULL;
 
 wxAppInitializerFunction wxAppConsoleBase::ms_appInitFn = NULL;
 
+wxSocketManager *wxAppTraitsBase::ms_manager = NULL;
+
 // ----------------------------------------------------------------------------
 // wxEventLoopPtr
 // ----------------------------------------------------------------------------
@@ -142,7 +133,7 @@ wxAppConsoleBase::wxAppConsoleBase()
     m_traits = NULL;
     m_mainLoop = NULL;
 
-    ms_appInstance = wx_static_cast(wxAppConsole *, this);
+    ms_appInstance = static_cast<wxAppConsole *>(this);
 
 #ifdef __WXDEBUG__
     SetTraceMasks();
@@ -165,22 +156,18 @@ wxAppConsoleBase::~wxAppConsoleBase()
 // 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
 
-    // remember the command line arguments
-    argc = argcOrig;
-    argv = argvOrig;
-
 #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);
@@ -292,6 +279,13 @@ wxAppTraits *wxAppConsoleBase::GetTraits()
     return m_traits;
 }
 
+/* static */
+wxAppTraits *wxAppConsoleBase::GetTraitsIfExists()
+{
+    wxAppConsole * const app = GetInstance();
+    return app ? app->GetTraits() : NULL;
+}
+
 // ----------------------------------------------------------------------------
 // event processing
 // ----------------------------------------------------------------------------
@@ -675,12 +669,16 @@ void wxAppTraitsBase::MutexGuiLeave()
 
 void WXDLLIMPEXP_BASE wxMutexGuiEnter()
 {
-    wxAppConsoleBase::GetInstance()->GetTraits()->MutexGuiEnter();
+    wxAppTraits * const traits = wxAppConsoleBase::GetTraitsIfExists();
+    if ( traits )
+        traits->MutexGuiEnter();
 }
 
 void WXDLLIMPEXP_BASE wxMutexGuiLeave()
 {
-    wxAppConsoleBase::GetInstance()->GetTraits()->MutexGuiLeave();
+    wxAppTraits * const traits = wxAppConsoleBase::GetTraitsIfExists();
+    if ( traits )
+        traits->MutexGuiLeave();
 }
 #endif // wxUSE_THREADS