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

fix for a warning

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-12 11:11:01 +00:00
parent 471085e408
commit b8c253ec50
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/encconv.cpp
View File

@@ -121,10 +121,8 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
m_Table[out_tbl[i]] = (tchar)(128 + i); m_Table[out_tbl[i]] = (tchar)(128 + i);
m_UnicodeInput = TRUE; m_UnicodeInput = TRUE;
return TRUE;
} }
else // input !Unicode
else
{ {
if ((in_tbl = GetEncTable(input_enc)) == NULL) return FALSE; if ((in_tbl = GetEncTable(input_enc)) == NULL) return FALSE;
if (output_enc != wxFONTENCODING_UNICODE) if (output_enc != wxFONTENCODING_UNICODE)
@@ -142,7 +140,7 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
} }
// FIXME: write a substitute for bsearch // FIXME: write a substitute for bsearch
#ifndef __WXWINCE__ #ifndef __WXWINCE__
else else // output !Unicode
{ {
CharsetItem *rev = BuildReverseTable(out_tbl); CharsetItem *rev = BuildReverseTable(out_tbl);
CharsetItem *item; CharsetItem *item;
@@ -166,11 +164,11 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
} }
delete[] rev; delete[] rev;
return TRUE;
} }
#endif #endif // !__WXWINCE__
return TRUE;
} }
return TRUE;
} }