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

Couple more Unicode fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-07-23 09:53:22 +00:00
parent 48a84964c6
commit 54c13c66d2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/statline.cpp
View File

@@ -65,7 +65,7 @@ bool wxStaticLine::Create( wxWindow *parent,
m_hWnd = (WXHWND)::CreateWindow m_hWnd = (WXHWND)::CreateWindow
( (
_T("STATIC"), _T("STATIC"),
"", _T(""),
WS_VISIBLE | WS_CHILD | WS_VISIBLE | WS_CHILD |
SS_GRAYRECT | SS_SUNKEN, // | SS_ETCHEDFRAME, SS_GRAYRECT | SS_SUNKEN, // | SS_ETCHEDFRAME,
pos.x, pos.y, sizeReal.x, sizeReal.y, pos.x, pos.y, sizeReal.x, sizeReal.y,

6
src/msw/stattext.cpp
View File

@@ -102,14 +102,14 @@ wxSize wxStaticText::DoGetBestSize()
heightTextTotal = 0, heightLine; heightTextTotal = 0, heightLine;
wxString curLine; wxString curLine;
for ( const char *pc = text; ; pc++ ) { for ( const wxChar *pc = text; ; pc++ ) {
if ( *pc == '\n' || *pc == '\0' ) { if ( *pc == _T('\n') || *pc == _T('\0') ) {
GetTextExtent(curLine, &widthLine, &heightLine); GetTextExtent(curLine, &widthLine, &heightLine);
if ( widthLine > widthTextMax ) if ( widthLine > widthTextMax )
widthTextMax = widthLine; widthTextMax = widthLine;
heightTextTotal += heightLine; heightTextTotal += heightLine;
if ( *pc == '\n' ) { if ( *pc == _T('\n') ) {
curLine.Empty(); curLine.Empty();
} }
else { else {

2
src/msw/utils.cpp
View File

@@ -156,7 +156,7 @@ bool wxGetUserId(wxChar *buf, int maxSize)
if ( ::GetUserName(buf, &nSize) == 0 ) if ( ::GetUserName(buf, &nSize) == 0 )
{ {
// actually, it does happen on Win9x if the user didn't log on // actually, it does happen on Win9x if the user didn't log on
DWORD res = ::GetEnvironmentVariable("username", buf, maxSize); DWORD res = ::GetEnvironmentVariable(_T("username"), buf, maxSize);
if ( res == 0 ) if ( res == 0 )
{ {
// not found // not found