From baf736e1f34666a81706bbef3b0c80ed59869859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 17 Mar 2002 21:44:03 +0000 Subject: [PATCH] compilation fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/intl.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/intl.cpp b/src/common/intl.cpp index a7da0ed972..ad3ce22570 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -443,6 +443,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons #if wxUSE_FONTMAP if ( convertEncoding ) { + wxFontEncoding targetEnc = wxFONTENCODING_SYSTEM; wxFontEncoding enc = wxTheFontMapper->CharsetToEncoding(charset, FALSE); if ( enc == wxFONTENCODING_SYSTEM ) { @@ -450,7 +451,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons } else { - wxFontEncoding targetEnc = wxLocale::GetSystemEncoding(); + targetEnc = wxLocale::GetSystemEncoding(); if (targetEnc == wxFONTENCODING_SYSTEM) { wxFontEncodingArray a = wxEncodingConverter::GetPlatformEquivalents(enc); @@ -479,7 +480,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons } if ( !convertEncoding ) - #else // !wxUSE_FONTMAP + #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP { for (size_t i = 0; i < m_numStrings; i++) { @@ -487,7 +488,6 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons hash[key] = StringAtOfs(m_pTransTable, i); } } - #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP #endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T }