Unicode compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index e2bb43b5f80ac3783c699b4c6c7dbe5380db481d..0894f1f6cf9db8670b6118520dc034de1934d1de 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -219,7 +219,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
         // menu is just a normal string (passed in data parameter)
         flags |= MF_STRING;
 
-        pData = (char*)pItem->GetText().c_str();
+        pData = (wxChar*)pItem->GetText().c_str();
     }
 
     BOOL ok;

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index f9e310d9a9994cc8a42def673c56bf4420b16ca1..9b6dbe9b52d18e3d126a1a222d0dc3488229728e 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -240,7 +240,7 @@ void wxMenuItem::SetText(const wxString& text)
 #endif  //owner drawn
         {
             flagsOld |= MF_STRING;
-            data = (char*) text.c_str();
+            data = (wxChar*) text.c_str();
         }
 
         if ( ::ModifyMenu(hMenu, id,

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index e8b06acbe9d65246c909d65a75dab41e87c9d61c..b3c922955f735940bf50b93f73c9ef3bd9c17f5c 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2164,7 +2164,7 @@ void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win)
     if ( oldWin && (oldWin != win) )
     {
         wxString str(win->GetClassInfo()->GetClassName());
-        wxLogError("Bug! Found existing HWND %X for new window of class %s", (int) hWnd, (const char*) str);
+        wxLogError(wxT("Bug! Found existing HWND %X for new window of class %s"), (int) hWnd, (const wxChar*) str);
     }
     else if (!oldWin)
     {
@@ -2336,7 +2336,7 @@ bool wxWindow::MSWCreate(int id,
         HWND hWnd = (HWND) node->GetKeyInteger();
         if (hWnd != (HWND) m_hWnd)
         {
-            wxLogError("A second HWND association is being added for the same window!");
+            wxLogError(wxT("A second HWND association is being added for the same window!"));
         }
     }
 #endif