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

wxBase compilation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-12-10 23:24:53 +00:00
parent af7e29cc47
commit dc7c324430
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/strconv.cpp
View File

@@ -409,9 +409,11 @@ WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL);
#if defined(__WIN32__) && !defined(__WXMICROWIN__) #if defined(__WIN32__) && !defined(__WXMICROWIN__)
#if wxUSE_GUI
// VZ: the new version of wxCharsetToCodepage() is more politically correct // VZ: the new version of wxCharsetToCodepage() is more politically correct
// and should work on other Windows versions as well but the old version is // and should work on other Windows versions as well but the old version is
// still needed for !wxUSE_FONTMAP case // still needed for !wxUSE_FONTMAP || !wxUSE_GUI case
extern long wxEncodingToCodepage(wxFontEncoding encoding) extern long wxEncodingToCodepage(wxFontEncoding encoding)
{ {
@@ -434,7 +436,7 @@ extern long wxEncodingToCodepage(wxFontEncoding encoding)
return csetInfo.ciACP; return csetInfo.ciACP;
} }
#if wxUSE_FONTMAP && wxUSE_GUI #if wxUSE_FONTMAP
extern long wxCharsetToCodepage(const wxChar *name) extern long wxCharsetToCodepage(const wxChar *name)
{ {
@@ -450,7 +452,12 @@ extern long wxCharsetToCodepage(const wxChar *name)
return wxEncodingToCodepage(enc); return wxEncodingToCodepage(enc);
} }
#else // old wxCharsetToCodepage() by OK #endif // wxUSE_FONTMAP
#endif // wxUSE_GUI
// include old wxCharsetToCodepage() by OK if needed
#if !wxUSE_GUI || !wxUSE_FONTMAP
#include "wx/msw/registry.h" #include "wx/msw/registry.h"
@@ -486,7 +493,7 @@ extern long wxCharsetToCodepage(const wxChar *name)
return CP; return CP;
} }
#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP #endif // !wxUSE_GUI || !wxUSE_FONTMAP
#endif // Win32 #endif // Win32