remove duplicate wxTaskBarIconAreaBase::DoPopupMenu, extracting the one-line differen...

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index e61703c9c0724057e74c3184ee75fa2e90a28d8f..53e36b28921ef0668d545717beacee81114e88ed 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -72,10 +72,6 @@
 #include "wx/hashset.h"
 #include "wx/filesys.h"
 
 #include "wx/hashset.h"
 #include "wx/filesys.h"
 

-#if defined(__WXMAC__)
-    #include "wx/mac/private.h"  // includes mac headers
-#endif
-

 #if defined(__DARWIN__)
     #include "wx/mac/corefoundation/cfref.h"
     #include <CoreFoundation/CFLocale.h>
 #if defined(__DARWIN__)
     #include "wx/mac/corefoundation/cfref.h"
     #include <CoreFoundation/CFLocale.h>


@@ -240,7 +236,7 @@ wxPluralFormsScanner::wxPluralFormsScanner(const char* s) : m_s(s)
 bool wxPluralFormsScanner::nextToken()
 {
     wxPluralFormsToken::Type type = wxPluralFormsToken::T_ERROR;
 bool wxPluralFormsScanner::nextToken()
 {
     wxPluralFormsToken::Type type = wxPluralFormsToken::T_ERROR;

-    while (isspace(*m_s))
+    while (isspace((unsigned char) *m_s))

     {
         ++m_s;
     }
     {
         ++m_s;
     }


@@ -248,20 +244,20 @@ bool wxPluralFormsScanner::nextToken()
     {
         type = wxPluralFormsToken::T_EOF;
     }
     {
         type = wxPluralFormsToken::T_EOF;
     }

-    else if (isdigit(*m_s))
+    else if (isdigit((unsigned char) *m_s))

     {
         wxPluralFormsToken::Number number = *m_s++ - '0';
     {
         wxPluralFormsToken::Number number = *m_s++ - '0';

-        while (isdigit(*m_s))
+        while (isdigit((unsigned char) *m_s))

         {
             number = number * 10 + (*m_s++ - '0');
         }
         m_token.setNumber(number);
         type = wxPluralFormsToken::T_NUMBER;
     }
         {
             number = number * 10 + (*m_s++ - '0');
         }
         m_token.setNumber(number);
         type = wxPluralFormsToken::T_NUMBER;
     }

-    else if (isalpha(*m_s))
+    else if (isalpha((unsigned char) *m_s))

     {
         const char* begin = m_s++;
     {
         const char* begin = m_s++;

-        while (isalnum(*m_s))
+        while (isalnum((unsigned char) *m_s))

         {
             ++m_s;
         }
         {
             ++m_s;
         }


@@ -2237,7 +2233,7 @@ wxFontEncoding wxLocale::GetSystemEncoding()
         return wxFONTENCODING_CP950;
     }
 #elif defined(__WXMAC__)
         return wxFONTENCODING_CP950;
     }
 #elif defined(__WXMAC__)

-    TextEncoding encoding = 0 ;
+    CFStringEncoding encoding = 0 ;

     encoding = CFStringGetSystemEncoding() ;
     return wxMacGetFontEncFromSystemEnc( encoding ) ;
 #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
     encoding = CFStringGetSystemEncoding() ;
     return wxMacGetFontEncFromSystemEnc( encoding ) ;
 #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP


@@ -2677,23 +2673,24 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
 
     wxCFRef<CFLocaleRef> userLocaleRef(userLocaleRefRaw);
 
 
     wxCFRef<CFLocaleRef> userLocaleRef(userLocaleRefRaw);
 

-    CFTypeRef cfstr;
+    CFStringRef cfstr = 0;

     switch ( index )
     {
         case wxLOCALE_THOUSANDS_SEP:
     switch ( index )
     {
         case wxLOCALE_THOUSANDS_SEP:

-            cfstr = CFLocaleGetValue(userLocaleRef, kCFLocaleGroupingSeparator);
+            cfstr = (CFStringRef) CFLocaleGetValue(userLocaleRef, kCFLocaleGroupingSeparator);

             break;
 
         case wxLOCALE_DECIMAL_POINT:
             break;
 
         case wxLOCALE_DECIMAL_POINT:

-            cfstr = CFLocaleGetValue(userLocaleRef, kCFLocaleDecimalSeparator);
+            cfstr = (CFStringRef) CFLocaleGetValue(userLocaleRef, kCFLocaleDecimalSeparator);

             break;
 
         default:
             wxFAIL_MSG( "Unknown locale info" );
             break;
 
         default:
             wxFAIL_MSG( "Unknown locale info" );

+            cfstr = CFSTR("");
+            break;

     }
 
     }
 

-    wxCFStringRef
-        str(CFStringCreateCopy(NULL, static_cast<CFStringRef>(cfstr)));
+    wxCFStringRef str(wxCFRetain(cfstr));

     return str.AsString();
 }
 
     return str.AsString();
 }