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

Menu label consistency changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-08-11 17:54:59 +00:00
parent afb6a92fee
commit 52af3158e9
39 changed files with 304 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/menu/menu.cpp
View File

@@ -719,7 +719,7 @@ void MyFrame::OnGetLabelMenu(wxCommandEvent& WXUNUSED(event))
wxCHECK_RET( count, _T("no last menu?") );
wxLogMessage(_T("The label of the last menu item is '%s'"),
mbar->GetLabelTop(count - 1).c_str());
mbar->GetMenuLabel(count - 1).c_str());
}
#if wxUSE_TEXTDLG
@@ -734,13 +734,13 @@ void MyFrame::OnSetLabelMenu(wxCommandEvent& WXUNUSED(event))
(
_T("Enter new label: "),
_T("Change last menu text"),
mbar->GetLabelTop(count - 1),
mbar->GetMenuLabel(count - 1),
this
);
if ( !label.empty() )
{
mbar->SetLabelTop(count - 1, label);
mbar->SetMenuLabel(count - 1, label);
}
}
@@ -874,14 +874,14 @@ void MyFrame::OnSetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
(
_T("Enter new label: "),
_T("Change last menu item text"),
item->GetLabel(),
item->GetItemLabel(),
this
);
label.Replace( _T("\\t"), _T("\t") );
if ( !label.empty() )
{
item->SetText(label);
item->SetItemLabel(label);
}
}
}