faster portsetting backpatched

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 9b7e921da874a3499ae7fcc6711a71f48e67e467..1ba660b4f31aff63ab3e9710be725701564e0eac 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -93,6 +93,10 @@ wxAppConsole *wxAppConsole::ms_appInstance = NULL;
 
 wxAppInitializerFunction wxAppConsole::ms_appInitFn = NULL;
 
 
 wxAppInitializerFunction wxAppConsole::ms_appInitFn = NULL;
 

+#ifdef __WXMAC__
+bool wxAppConsole::s_macDefaultEncodingIsPC = true ;
+#endif
+

 // ============================================================================
 // wxAppConsole implementation
 // ============================================================================
 // ============================================================================
 // wxAppConsole implementation
 // ============================================================================


@@ -371,10 +375,10 @@ bool wxAppConsole::CheckBuildOptions(const char *optionsSignature,
         wxString prog = wxString::FromAscii(optionsSignature);
         wxString progName = wxString::FromAscii(componentName);
         wxString msg;
         wxString prog = wxString::FromAscii(optionsSignature);
         wxString progName = wxString::FromAscii(componentName);
         wxString msg;

-        
-        msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s, and %s used %s."),
+
+        msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),

                    lib.c_str(), progName.c_str(), prog.c_str());
                    lib.c_str(), progName.c_str(), prog.c_str());

-        
+

         wxLogFatalError(msg);
 
         // normally wxLogFatalError doesn't return
         wxLogFatalError(msg);
 
         // normally wxLogFatalError doesn't return


@@ -392,7 +396,7 @@ void wxAppConsole::OnAssert(const wxChar *file,
                             const wxChar *cond,
                             const wxChar *msg)
 {
                             const wxChar *cond,
                             const wxChar *msg)
 {

-    ShowAssertDialog(file, line, cond, msg, m_traits);
+    ShowAssertDialog(file, line, cond, msg, GetTraits());

 }
 
 #endif // __WXDEBUG__
 }
 
 #endif // __WXDEBUG__


@@ -456,7 +460,7 @@ void wxConsoleAppTraitsBase::RemoveFromPendingDelete(wxObject * WXUNUSED(object)
 {
     // nothing to do
 }
 {
     // nothing to do
 }

-    
+

 #if wxUSE_SOCKETS
 GSocketGUIFunctionsTable* wxConsoleAppTraitsBase::GetSocketGUIFunctionsTable()
 {
 #if wxUSE_SOCKETS
 GSocketGUIFunctionsTable* wxConsoleAppTraitsBase::GetSocketGUIFunctionsTable()
 {


@@ -533,7 +537,7 @@ void wxAssert(int cond,
               const wxChar *szFile,
               int nLine,
               const wxChar *szCond,
               const wxChar *szFile,
               int nLine,
               const wxChar *szCond,

-              const wxChar *szMsg) 
+              const wxChar *szMsg)

 {
     if ( !cond )
         wxOnAssert(szFile, nLine, szCond, szMsg);
 {
     if ( !cond )
         wxOnAssert(szFile, nLine, szCond, szMsg);