fixing notebook icons for panther

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index b32ce87d3de939ae3714000e4cb77705d2e16863..820a7d6bad0f1b85742c3840f73562f765703057 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -22,6 +22,12 @@
     #pragma implementation "intl.h"
 #endif
 
     #pragma implementation "intl.h"
 #endif
 

+#if defined(__BORLAND__) && !defined(__WXDEBUG__)
+    // There's a bug in Borland's compiler that breaks wxLocale with -O2,
+    // so make sure that flag is not used for this file:
+    #pragma option -O1
+#endif
+

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -2238,6 +2244,8 @@ wxFontEncoding wxLocale::GetSystemEncoding()
     {
         return wxFONTENCODING_CP950;
     }
     {
         return wxFONTENCODING_CP950;
     }

+#elif defined(__WXMAC__)
+    return wxMacGetFontEncFromSystemEnc( CFStringGetSystemEncoding() ) ;

 #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
     wxString encname = GetSystemEncodingName();
     if ( !encname.empty() )
 #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
     wxString encname = GetSystemEncodingName();
     if ( !encname.empty() )


@@ -2420,15 +2428,16 @@ const wxChar *wxLocale::GetString(const wxChar *szOrigString,
             if ( szDomain != NULL )
             {
                 wxLogTrace(_T("i18n"),
             if ( szDomain != NULL )
             {
                 wxLogTrace(_T("i18n"),

-                           _T("string '%s'[%ld] not found in domain '%s' for locale '%s'."),
-                           szOrigString, n, szDomain, m_strLocale.c_str());
+                           _T("string '%s'[%lu] not found in domain '%s' for locale '%s'."),
+                           szOrigString, (unsigned long)n,
+                           szDomain, m_strLocale.c_str());

 
             }
             else
             {
                 wxLogTrace(_T("i18n"),
 
             }
             else
             {
                 wxLogTrace(_T("i18n"),

-                           _T("string '%s'[%ld] not found in locale '%s'."),
-                           szOrigString, n, m_strLocale.c_str());
+                           _T("string '%s'[%lu] not found in locale '%s'."),
+                           szOrigString, (unsigned long)n, m_strLocale.c_str());

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