wxStrdup(NULL) doesn't work

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/toback24.txt b/docs/toback24.txt
index 78cea684569f8f7b577b35b2ade7dabc3b6ba5e8..d7dd6bb1bd796baeea491c397194011d1b2cf460 100644 (file)
--- a/docs/toback24.txt
+++ b/docs/toback24.txt
@@ -133,6 +133,12 @@ http://sf.net/tracker/index.php?func=detail&aid=729758&group_id=9863&atid=309863
 Checking in src/common/intl.cpp;
 /pack/cvsroots/wxwindows/wxWindows/src/common/intl.cpp,v  <--  intl.cpp
 new revision: 1.95; previous revision: 1.94
+done
+Checking in intl.cpp
+/pack/cvsroots/wxwindows/wxWindows/src/common/intl.cpp,v  <--  intl.cpp
+new revision: 1.102; previous revision: 1.101
+done
+
 
 
 15. Fixes for mono bitmaps in wxGTK

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 1fd78f7aca0c3a6876952a91142790943ee463f0..9efed8b554eeeb09065f389104c0f77a7e27d8cf 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -647,7 +647,9 @@ bool wxLocale::Init(const wxChar *szName,
   // TODO: how to find languageId
   // SetLocaleInfo(languageId, SORT_DEFAULT, localeName);
 #else
-  m_pszOldLocale = wxStrdup(wxSetlocale(LC_ALL, szLocale));
+  m_pszOldLocale = wxSetlocale(LC_ALL, szLocale);
+  if ( m_pszOldLocale )
+      m_pszOldLocale = wxStrdup(m_pszOldLocale);
 #endif
 
   if ( m_pszOldLocale == NULL )