Fixed warnings/errors and changed Thaw

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-10-25 17:51:10 +00:00
parent d9f42a9e5a
commit 0bab774ba3
3 changed files with 16 additions and 11 deletions

View File

@@ -272,8 +272,16 @@ inline static void OutputString(wxOutputStream& stream, const wxString& str,
{
if (str.empty()) return;
#if wxUSE_UNICODE
const wxWX2MBbuf buf(str.mb_str(convFile ? *convFile : wxConvUTF8));
stream.Write((const char*)buf, strlen((const char*)buf));
if (convFile)
{
const wxWX2MBbuf buf(str.mb_str(*convFile));
stream.Write((const char*)buf, strlen((const char*)buf));
}
else
{
const wxWX2MBbuf buf(str.mb_str(wxConvUTF8));
stream.Write((const char*)buf, strlen((const char*)buf));
}
#else
if ( convFile == NULL )
stream.Write(str.mb_str(), str.Len());