fixed serious bug in wxFont::operator== (ignored weight)

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 5e03cbdc18233d250b4d75459618e59fb4761dfc..12beb715c7cef6efa5baee002ee936232d8fa46d 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -615,7 +615,12 @@ bool wxLocale::Init(const wxChar *szName,
   if ( m_strShort.IsEmpty() ) {
     // FIXME I don't know how these 2 letter abbreviations are formed,
     //       this wild guess is surely wrong
   if ( m_strShort.IsEmpty() ) {
     // FIXME I don't know how these 2 letter abbreviations are formed,
     //       this wild guess is surely wrong

-    m_strShort = tolower(szLocale[0]) + tolower(szLocale[1]);
+    if ( szLocale[0] )
+    {
+        m_strShort += (wxChar)wxTolower(szLocale[0]);
+        if ( szLocale[1] )
+            m_strShort += (wxChar)wxTolower(szLocale[1]);
+    }

   }
 
   // save the old locale to be able to restore it later
   }
 
   // save the old locale to be able to restore it later