diff --git a/docs/toback24.txt b/docs/toback24.txt index 78cea68456..d7dd6bb1bd 100644 --- 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 1fd78f7aca..9efed8b554 100644 --- 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 )