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@11661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2001-09-21 20:21:44 +00:00
parent eb71219dd0
commit 4693b20c75
40 changed files with 428 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
samples/menu/menu.cpp
View File

@@ -368,7 +368,7 @@ wxMenu *MyFrame::CreateDummyMenu(wxString *title)
if ( title )
{
title->Printf("Dummy menu &%d", ++m_countDummy);
title->Printf(wxT("Dummy menu &%d"), ++m_countDummy);
}
return menu;
@@ -382,7 +382,7 @@ wxMenuItem *MyFrame::GetLastMenuItem() const
wxMenuItemList::Node *node = menu->GetMenuItems().GetLast();
if ( !node )
{
wxLogWarning("No last item in the last menu!");
wxLogWarning(wxT("No last item in the last menu!"));
return NULL;
}
@@ -398,10 +398,10 @@ void MyFrame::LogMenuEvent(const wxCommandEvent& event)
if ( !GetMenuBar()->FindItem(id) )
return;
wxString msg = wxString::Format("Menu command %d", id);
wxString msg = wxString::Format(wxT("Menu command %d"), id);
if ( GetMenuBar()->FindItem(id)->IsCheckable() )
{
msg += wxString::Format(" (the item is currently %schecked)",
msg += wxString::Format(wxT(" (the item is currently %schecked)"),
event.IsChecked() ? "" : "not ");
}
@@ -437,7 +437,7 @@ void MyFrame::OnDeleteMenu(wxCommandEvent& WXUNUSED(event))
if ( count == 2 )
{
// don't let delete the first 2 menus
wxLogError("Can't delete any more menus");
wxLogError(wxT("Can't delete any more menus"));
}
else
{
@@ -488,7 +488,7 @@ void MyFrame::OnGetLabelMenu(wxCommandEvent& WXUNUSED(event))
wxMenuBar *mbar = GetMenuBar();
size_t count = mbar->GetMenuCount();
wxLogMessage("The label of the last menu item is '%s'",
wxLogMessage(wxT("The label of the last menu item is '%s'"),
mbar->GetLabelTop(count - 1).c_str());
}
@@ -502,7 +502,7 @@ void MyFrame::OnSetLabelMenu(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnDummy(wxCommandEvent& event)
{
wxLogMessage("Dummy item #%d", event.GetId() - Menu_Dummy_First + 1);
wxLogMessage(wxT("Dummy item #%d"), event.GetId() - Menu_Dummy_First + 1);
}
void MyFrame::OnAppendMenuItem(wxCommandEvent& WXUNUSED(event))
@@ -533,7 +533,7 @@ void MyFrame::OnDeleteMenuItem(wxCommandEvent& WXUNUSED(event))
size_t count = menu->GetMenuItemCount();
if ( !count )
{
wxLogWarning("No items to delete!");
wxLogWarning(wxT("No items to delete!"));
}
else
{
@@ -583,7 +583,7 @@ void MyFrame::OnGetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
if ( item )
{
wxLogMessage("The label of the last menu item is '%s'",
wxLogMessage(wxT("The label of the last menu item is '%s'"),
item->GetLabel().c_str());
}
}