don't use implicit wxString->char*/wchar_t* conversion, it will not be available in wxUSE_STL build in the future
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1444,7 +1444,7 @@ extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding)
|
||||
return (long) ret;
|
||||
}
|
||||
|
||||
extern long wxCharsetToCodepage(const wxChar *name)
|
||||
extern long wxCharsetToCodepage(const char *name)
|
||||
{
|
||||
// first get the font encoding for this charset
|
||||
if ( !name )
|
||||
@@ -1463,7 +1463,7 @@ extern long wxCharsetToCodepage(const wxChar *name)
|
||||
#include "wx/msw/registry.h"
|
||||
|
||||
// this should work if Internet Exploiter is installed
|
||||
extern long wxCharsetToCodepage(const wxChar *name)
|
||||
extern long wxCharsetToCodepage(const char *name)
|
||||
{
|
||||
if (!name)
|
||||
return GetACP();
|
||||
|
Reference in New Issue
Block a user