From 54c13c66d2c465ae00fc4e59c29312bb16eccdc4 Mon Sep 17 00:00:00 2001
From: Ove Kaaven <ovek@arcticnet.no>
Date: Fri, 23 Jul 1999 09:53:22 +0000
Subject: [PATCH] Couple more Unicode fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/statline.cpp | 2 +-
 src/msw/stattext.cpp | 6 +++---
 src/msw/utils.cpp    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index d6ad57770d..bbf331ac85 100644
--- a/src/msw/statline.cpp
+++ b/src/msw/statline.cpp
@@ -65,7 +65,7 @@ bool wxStaticLine::Create( wxWindow *parent,
     m_hWnd = (WXHWND)::CreateWindow
                        (
                         _T("STATIC"),
-                        "",
+                        _T(""),
                         WS_VISIBLE | WS_CHILD |
                         SS_GRAYRECT | SS_SUNKEN, // | SS_ETCHEDFRAME,
                         pos.x, pos.y, sizeReal.x, sizeReal.y,
diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 31c7c0141b..084a748c6c 100644
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -102,14 +102,14 @@ wxSize wxStaticText::DoGetBestSize()
         heightTextTotal = 0, heightLine;
 
     wxString curLine;
-    for ( const char *pc = text; ; pc++ ) {
-        if ( *pc == '\n' || *pc == '\0' ) {
+    for ( const wxChar *pc = text; ; pc++ ) {
+        if ( *pc == _T('\n') || *pc == _T('\0') ) {
             GetTextExtent(curLine, &widthLine, &heightLine);
             if ( widthLine > widthTextMax )
                 widthTextMax = widthLine;
             heightTextTotal += heightLine;
 
-            if ( *pc == '\n' ) {
+            if ( *pc == _T('\n') ) {
                curLine.Empty();
             }
             else {
diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 9f4ffbc76c..35c2de8be9 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -156,7 +156,7 @@ bool wxGetUserId(wxChar *buf, int maxSize)
     if ( ::GetUserName(buf, &nSize) == 0 )
     {
         // 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 )
         {
             // not found
-- 
2.45.2