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

added wxConvISO8859_1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-11-06 13:12:42 +00:00
parent 4383c2b97a
commit 1aa3e8d8f6
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/strconv.h
View File

@@ -138,6 +138,7 @@ private:
#define wxConvFile wxConvLocal #define wxConvFile wxConvLocal
WXDLLEXPORT_DATA(extern wxCSConv) wxConvLocal; WXDLLEXPORT_DATA(extern wxCSConv) wxConvLocal;
WXDLLEXPORT_DATA(extern wxCSConv) wxConvISO8859_1;
WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent; WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -173,7 +174,7 @@ public:
const char* cWX2MB(const char *psz) const { return psz; } const char* cWX2MB(const char *psz) const { return psz; }
}; };
WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile, wxConvLocal; WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile, wxConvLocal, wxConvISO8859_1;
WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent; WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
#define wxFNCONV(name) name #define wxFNCONV(name) name

2
src/common/strconv.cpp
View File

@@ -52,6 +52,7 @@
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
WXDLLEXPORT_DATA(wxMBConv) wxConvLibc; WXDLLEXPORT_DATA(wxMBConv) wxConvLibc;
WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL); WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL);
WXDLLEXPORT_DATA(wxCSConv) wxConvISO8859_1(_T("iso-8859-1"));
#else #else
// stand-ins in absence of wchar_t // stand-ins in absence of wchar_t
WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, wxConvFile, wxConvLocal; WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, wxConvFile, wxConvLocal;
@@ -68,6 +69,7 @@ public:
{ {
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
wxConvLocal.Clear(); wxConvLocal.Clear();
wxConvISO8859_1.Clear();
#endif #endif
} }