Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix SF bug 1640955

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2007-01-23 09:25:53 +00:00
parent 065761f297
commit b2fde0cfed
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/intl.cpp
View File

@@ -18,12 +18,6 @@
// headers // headers
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if defined(__BORLANDC__) && !defined(__WXDEBUG__)
// There's a bug in Borland's compiler that breaks wxLocale with -O2,
// so make sure that flag is not used for this file:
#pragma option -O1
#endif
#ifdef __EMX__ #ifdef __EMX__
// The following define is needed by Innotek's libc to // The following define is needed by Innotek's libc to
// make the definition of struct localeconv available. // make the definition of struct localeconv available.
@@ -2505,7 +2499,9 @@ const wxLanguageInfo *wxLocale::GetLanguageInfo(int lang)
{ {
if ( ms_languagesDB->Item(i).Language == lang ) if ( ms_languagesDB->Item(i).Language == lang )
{ {
return &ms_languagesDB->Item(i); // We need to create a temporary here in order to make this work with BCC in final build mode
wxLanguageInfo *ptr = &ms_languagesDB->Item(i);
return ptr;
} }
} }