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

Sending wxChar* outputs pointer instead of text under Borland.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-04-13 17:53:28 +00:00
parent 15cdc34149
commit ad5bb7d6a6
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/string.cpp
View File

@@ -131,8 +131,12 @@ wxSTD istream& operator>>(wxSTD istream& is, wxString& WXUNUSED(str))
wxSTD ostream& operator<<(wxSTD ostream& os, const wxString& str) wxSTD ostream& operator<<(wxSTD ostream& os, const wxString& str)
{ {
os << str.c_str(); #ifdef __BORLANDC__
return os; os << str.mb_str();
#else
os << str.c_str();
#endif
return os;
} }
#endif // wxUSE_STD_IOSTREAM #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 // in which case we need to break out
if ( (len >= 0 && len <= size) if ( (len >= 0 && len <= size)
// No EOVERFLOW on Windows nor Palm 6.0 nor OpenVMS nor MacOS (not X) // 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__)) #if !defined(__WXMSW__) && !defined(__WXPALMOS__) && !defined( __VMS ) && !(defined(__WXMAC__) && !defined(__WXMAC_OSX__)) && !(defined(__EMX__) && !defined(__INNOTEK_LIBC__))
|| errno != EOVERFLOW || errno != EOVERFLOW
#endif #endif