merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -408,11 +408,11 @@ void MyFrame::OnAppendMenuItem(wxCommandEvent& WXUNUSED(event))
|
||||
void MyFrame::OnAppendSubMenu(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
wxMenuBar *menubar = GetMenuBar();
|
||||
|
||||
|
||||
wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1);
|
||||
|
||||
menu->Append(Menu_Dummy_Last, "Dummy sub menu\tCtrl-F2",
|
||||
CreateDummyMenu(NULL));
|
||||
|
||||
menu->Append(Menu_Dummy_Last, "Dummy sub menu",
|
||||
CreateDummyMenu(NULL), "Dummy sub menu help");
|
||||
}
|
||||
|
||||
void MyFrame::OnDeleteMenuItem(wxCommandEvent& WXUNUSED(event))
|
||||
@@ -498,7 +498,7 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
|
||||
msg << "The item is " << (item->IsEnabled() ? "enabled"
|
||||
: "disabled")
|
||||
<< '\n';
|
||||
|
||||
|
||||
if ( item->IsCheckable() )
|
||||
{
|
||||
msg << "It is checkable and " << (item->IsChecked() ? "" : "un")
|
||||
@@ -575,9 +575,16 @@ void MyFrame::OnRightDown(wxMouseEvent &event )
|
||||
menu.AppendSeparator();
|
||||
menu.Append(Menu_File_Quit, "E&xit");
|
||||
|
||||
//menu.Delete(Menu_Popup_ToBeDeleted);
|
||||
menu.Delete(Menu_Popup_ToBeDeleted);
|
||||
menu.Check(Menu_Popup_ToBeChecked, TRUE);
|
||||
menu.Enable(Menu_Popup_ToBeGreyed, FALSE);
|
||||
|
||||
PopupMenu( &menu, event.GetX(), event.GetY() );
|
||||
|
||||
// test for destroying items in popup menus
|
||||
#if 0
|
||||
menu.Destroy(Menu_Popup_Submenu);
|
||||
|
||||
PopupMenu( &menu, event.GetX(), event.GetY() );
|
||||
#endif // 0
|
||||
}
|
||||
|
Reference in New Issue
Block a user