Sending wxChar* outputs pointer instead of text under Borland.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -131,8 +131,12 @@ wxSTD istream& operator>>(wxSTD istream& is, wxString& WXUNUSED(str))
|
||||
|
||||
wxSTD ostream& operator<<(wxSTD ostream& os, const wxString& str)
|
||||
{
|
||||
os << str.c_str();
|
||||
return os;
|
||||
#ifdef __BORLANDC__
|
||||
os << str.mb_str();
|
||||
#else
|
||||
os << str.c_str();
|
||||
#endif
|
||||
return os;
|
||||
}
|
||||
|
||||
#endif // wxUSE_STD_IOSTREAM
|
||||
@@ -1839,7 +1843,7 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
|
||||
// in which case we need to break out
|
||||
if ( (len >= 0 && len <= size)
|
||||
// No EOVERFLOW on Windows nor Palm 6.0 nor OpenVMS nor MacOS (not X)
|
||||
// not OS/2 (not Innotek libc).
|
||||
// not OS/2 (not Innotek libc).
|
||||
#if !defined(__WXMSW__) && !defined(__WXPALMOS__) && !defined( __VMS ) && !(defined(__WXMAC__) && !defined(__WXMAC_OSX__)) && !(defined(__EMX__) && !defined(__INNOTEK_LIBC__))
|
||||
|| errno != EOVERFLOW
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user