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

compilation fixes for non unicode mode

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-04-03 01:07:56 +00:00
parent 4e0291da3c
commit 54d02b59ad
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/ffile.h
View File

@@ -67,7 +67,7 @@ public:
// returns true on success // returns true on success
bool Write(const wxString& s, wxMBConv& conv = wxConvLibc) bool Write(const wxString& s, wxMBConv& conv = wxConvLibc)
{ {
wxWX2MBbuf buf = s.mb_str(); wxCharBuffer buf = s.mb_str(conv);
size_t size = strlen(buf); size_t size = strlen(buf);
return Write((const char *) buf, size) == size; return Write((const char *) buf, size) == size;
} }

2
include/wx/string.h
View File

@@ -452,7 +452,7 @@ public:
{ return m_pchData; } { return m_pchData; }
const wxWX2MBbuf mbc_str() const { return mb_str(*wxConvCurrent); } const wxWX2MBbuf mbc_str() const { return mb_str(*wxConvCurrent); }
#else // !mmultibyte #else // !mmultibyte
const wxChar* mb_str() const { return m_pchData; } const wxChar* mb_str(wxMBConv& WXUNUSED(con) = wxConvLibc) const { return m_pchData; }
const wxWX2MBbuf mbc_str() const { return mb_str(); } const wxWX2MBbuf mbc_str() const { return mb_str(); }
#endif // multibyte/!multibyte #endif // multibyte/!multibyte
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T