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

fixed MSVC's problems...

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-03-19 00:04:02 +00:00
parent a884bee57a
commit 821d0fef39
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/intl.cpp
View File

@@ -420,7 +420,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons
if ( !!charset ) if ( !!charset )
csConv = new wxCSConv(charset); csConv = new wxCSConv(charset);
wxMBConv& inputConv = csConv ? *csConv : *wxConvCurrent; wxMBConv& inputConv = csConv ? *((wxMBConv*)csConv) : *wxConvCurrent;
for (size_t i = 0; i < m_numStrings; i++) for (size_t i = 0; i < m_numStrings; i++)
{ {
@@ -539,8 +539,8 @@ bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName,
file.FillHash(m_messages, bConvertEncoding); file.FillHash(m_messages, bConvertEncoding);
return TRUE; return TRUE;
} }
else
return FALSE; return FALSE;
} }
const wxChar *wxMsgCatalog::GetString(const wxChar *sz) const const wxChar *wxMsgCatalog::GetString(const wxChar *sz) const