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

Unicode compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-02-03 23:54:37 +00:00
parent 20ae6f8d09
commit 97ddad38c5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/src/xrc/xml.cpp
View File

@@ -469,7 +469,7 @@ static int UnknownEncodingHnd(void * WXUNUSED(encodingHandlerData),
// We must build conversion table for expat. The easiest way to do so // We must build conversion table for expat. The easiest way to do so
// is to let wxCSConv convert as string containing all characters to // is to let wxCSConv convert as string containing all characters to
// wide character representation: // wide character representation:
wxCSConv conv(name); wxCSConv conv(wxString(name, wxConvLibc));
char mbBuf[255]; char mbBuf[255];
wchar_t wcBuf[255]; wchar_t wcBuf[255];
size_t i; size_t i;
@@ -559,7 +559,7 @@ inline static void OutputString(wxOutputStream& stream, const wxString& str,
{ {
if (str.IsEmpty()) return; if (str.IsEmpty()) return;
#if wxUSE_UNICODE #if wxUSE_UNICODE
const wxW2MBbuf *buf = str.mb_str(convFile ? *convFile : wxConvUTF8); const wxWX2MBbuf buf(str.mb_str(convFile ? *convFile : wxConvUTF8));
stream.Write((const char*)buf, strlen((const char*)buf)); stream.Write((const char*)buf, strlen((const char*)buf));
#else #else
if ( convFile == NULL ) if ( convFile == NULL )

4
src/xrc/xml.cpp
View File

@@ -469,7 +469,7 @@ static int UnknownEncodingHnd(void * WXUNUSED(encodingHandlerData),
// We must build conversion table for expat. The easiest way to do so // We must build conversion table for expat. The easiest way to do so
// is to let wxCSConv convert as string containing all characters to // is to let wxCSConv convert as string containing all characters to
// wide character representation: // wide character representation:
wxCSConv conv(name); wxCSConv conv(wxString(name, wxConvLibc));
char mbBuf[255]; char mbBuf[255];
wchar_t wcBuf[255]; wchar_t wcBuf[255];
size_t i; size_t i;
@@ -559,7 +559,7 @@ inline static void OutputString(wxOutputStream& stream, const wxString& str,
{ {
if (str.IsEmpty()) return; if (str.IsEmpty()) return;
#if wxUSE_UNICODE #if wxUSE_UNICODE
const wxW2MBbuf *buf = str.mb_str(convFile ? *convFile : wxConvUTF8); const wxWX2MBbuf buf(str.mb_str(convFile ? *convFile : wxConvUTF8));
stream.Write((const char*)buf, strlen((const char*)buf)); stream.Write((const char*)buf, strlen((const char*)buf));
#else #else
if ( convFile == NULL ) if ( convFile == NULL )