no more SetAppName/SetVendor in the config classes

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 46a21f8bad48e63ea49d235a452b429a6aaec685..8954ce3384d15b203e40b4bd077025a9e7728902 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -30,6 +30,7 @@
 
 // standard headers
 #include  <locale.h>
+#include  <ctype.h>
 
 // wxWindows
 #include "wx/defs.h"
@@ -435,7 +436,7 @@ bool wxLocale::Init(const char *szName,
   if ( m_strShort.IsEmpty() ) {
     // FIXME I don't know how these 2 letter abbreviations are formed,
     //       this wild guess is surely wrong
-    m_strShort = wxToLower(szLocale[0]) + wxToLower(szLocale[1]);
+    m_strShort = tolower(szLocale[0]) + tolower(szLocale[1]);
   }
 
   // save the old locale to be able to restore it later
@@ -479,7 +480,8 @@ wxLocale::~wxLocale()
 const char *wxLocale::GetString(const char *szOrigString,
                                 const char *szDomain) const
 {
-  wxASSERT( szOrigString != NULL ); // would be pretty silly
+  if ( IsEmpty(szOrigString) )
+      return szDomain;
 
   const char *pszTrans = NULL;