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

Some more Unicode fixes. What does wxTextStream do with

Browse Source 
a char in Unicode mode?


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-11-03 15:48:13 +00:00
parent c60cc91708
commit fc6f3208b2
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/txtstrm.cpp
View File

@@ -493,12 +493,8 @@ wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
wxTextOutputStream& wxTextOutputStream::operator<<(char c) wxTextOutputStream& wxTextOutputStream::operator<<(char c)
{ {
// these strange manipulations are needed in Unicode mode WriteString( wxString::FromAscii(c) );
char buf[2];
buf[0] = c;
buf[1] = 0;
WriteString( wxString(buf) );
return *this; return *this;
} }

2
src/common/url.cpp
View File

@@ -65,7 +65,7 @@ wxURL::wxURL(const wxString& url)
#if wxUSE_SOCKETS #if wxUSE_SOCKETS
if ( ms_useDefaultProxy && !ms_proxyDefault ) if ( ms_useDefaultProxy && !ms_proxyDefault )
{ {
SetDefaultProxy(getenv("HTTP_PROXY")); SetDefaultProxy( wxGetenv(wxT("HTTP_PROXY")) );
if ( !ms_proxyDefault ) if ( !ms_proxyDefault )
{ {

2
src/common/utilscmn.cpp
View File

@@ -284,7 +284,7 @@ wxString wxNow()
time_t now = time((time_t *) NULL); time_t now = time((time_t *) NULL);
char *date = ctime(&now); char *date = ctime(&now);
date[24] = '\0'; date[24] = '\0';
return wxString(date); return wxString::FromAscii(date);
} }
#if wxUSE_GUI #if wxUSE_GUI