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

Unicode compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
2000-01-03 02:14:45 +00:00
parent 15b83243e8
commit f5166ed458
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/menu.cpp
View File

@@ -219,7 +219,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
// menu is just a normal string (passed in data parameter) // menu is just a normal string (passed in data parameter)
flags |= MF_STRING; flags |= MF_STRING;
pData = (char*)pItem->GetText().c_str(); pData = (wxChar*)pItem->GetText().c_str();
} }
BOOL ok; BOOL ok;

2
src/msw/menuitem.cpp
View File

@@ -240,7 +240,7 @@ void wxMenuItem::SetText(const wxString& text)
#endif //owner drawn #endif //owner drawn
{ {
flagsOld |= MF_STRING; flagsOld |= MF_STRING;
data = (char*) text.c_str(); data = (wxChar*) text.c_str();
} }
if ( ::ModifyMenu(hMenu, id, if ( ::ModifyMenu(hMenu, id,

4
src/msw/window.cpp
View File

@@ -2164,7 +2164,7 @@ void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win)
if ( oldWin && (oldWin != win) ) if ( oldWin && (oldWin != win) )
{ {
wxString str(win->GetClassInfo()->GetClassName()); 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) else if (!oldWin)
{ {
@@ -2336,7 +2336,7 @@ bool wxWindow::MSWCreate(int id,
HWND hWnd = (HWND) node->GetKeyInteger(); HWND hWnd = (HWND) node->GetKeyInteger();
if (hWnd != (HWND) m_hWnd) 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 #endif