AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a test for deleting a sub-menu to the menu sample.

Browse Source 
Also fix some typos in the help message.

See #12668.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2010-11-10 00:36:50 +00:00
parent 519d7f238c
commit 08e78a5412
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
samples/menu/menu.cpp
View File

@ -98,6 +98,7 @@ protected:
void OnAppendMenuItem(wxCommandEvent& event); void OnAppendMenuItem(wxCommandEvent& event);
void OnAppendSubMenu(wxCommandEvent& event); void OnAppendSubMenu(wxCommandEvent& event);
void OnDeleteMenuItem(wxCommandEvent& event); void OnDeleteMenuItem(wxCommandEvent& event);
void OnDeleteSubMenu(wxCommandEvent& event);
void OnInsertMenuItem(wxCommandEvent& event); void OnInsertMenuItem(wxCommandEvent& event);
void OnCheckMenuItem(wxCommandEvent& event); void OnCheckMenuItem(wxCommandEvent& event);
void OnEnableMenuItem(wxCommandEvent& event); void OnEnableMenuItem(wxCommandEvent& event);
@ -223,6 +224,7 @@ enum
Menu_Menu_AppendSub, Menu_Menu_AppendSub,
Menu_Menu_Insert, Menu_Menu_Insert,
Menu_Menu_Delete, Menu_Menu_Delete,
Menu_Menu_DeleteSub,
Menu_Menu_Enable, Menu_Menu_Enable,
Menu_Menu_Check, Menu_Menu_Check,
Menu_Menu_GetLabel, Menu_Menu_GetLabel,
@ -293,6 +295,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Menu_Menu_AppendSub, MyFrame::OnAppendSubMenu) EVT_MENU(Menu_Menu_AppendSub, MyFrame::OnAppendSubMenu)
EVT_MENU(Menu_Menu_Insert, MyFrame::OnInsertMenuItem) EVT_MENU(Menu_Menu_Insert, MyFrame::OnInsertMenuItem)
EVT_MENU(Menu_Menu_Delete, MyFrame::OnDeleteMenuItem) EVT_MENU(Menu_Menu_Delete, MyFrame::OnDeleteMenuItem)
EVT_MENU(Menu_Menu_DeleteSub, MyFrame::OnDeleteSubMenu)
EVT_MENU(Menu_Menu_Enable, MyFrame::OnEnableMenuItem) EVT_MENU(Menu_Menu_Enable, MyFrame::OnEnableMenuItem)
EVT_MENU(Menu_Menu_Check, MyFrame::OnCheckMenuItem) EVT_MENU(Menu_Menu_Check, MyFrame::OnCheckMenuItem)
EVT_MENU(Menu_Menu_GetLabel, MyFrame::OnGetLabelMenuItem) EVT_MENU(Menu_Menu_GetLabel, MyFrame::OnGetLabelMenuItem)
@ -515,6 +518,8 @@ MyFrame::MyFrame()
wxT("Insert a menu item in head of the last menu")); wxT("Insert a menu item in head of the last menu"));
menuMenu->Append(Menu_Menu_Delete, wxT("&Delete menu item\tAlt-D"), menuMenu->Append(Menu_Menu_Delete, wxT("&Delete menu item\tAlt-D"),
wxT("Delete the last menu item from the last menu")); wxT("Delete the last menu item from the last menu"));
menuMenu->Append(Menu_Menu_DeleteSub, wxT("Delete last &submenu\tAlt-K"),
wxT("Delete the last submenu from the last menu"));
menuMenu->AppendSeparator(); menuMenu->AppendSeparator();
menuMenu->Append(Menu_Menu_Enable, wxT("&Enable menu item\tAlt-E"), menuMenu->Append(Menu_Menu_Enable, wxT("&Enable menu item\tAlt-E"),
wxT("Enable or disable the last menu item"), true); wxT("Enable or disable the last menu item"), true);
@ -575,9 +580,9 @@ MyFrame::MyFrame()
wxLog::DisableTimestamp(); wxLog::DisableTimestamp();
m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_textctrl)); m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_textctrl));
wxLogMessage(wxT("Brief explanations: the commands or the \"Menu\" menu ") wxLogMessage(wxT("Brief explanations: the commands in the \"Menu\" menu ")
wxT("append/insert/delete items to/from the last menu.\n") wxT("append/insert/delete items to/from the last menu.\n")
wxT("The commands from \"Menubar\" menu work with the ") wxT("The commands in the \"Menubar\" menu work with the ")
wxT("menubar itself.\n\n") wxT("menubar itself.\n\n")
wxT("Right click the band below to test popup menus.\n")); wxT("Right click the band below to test popup menus.\n"));
#endif #endif
@ -842,6 +847,24 @@ void MyFrame::OnDeleteMenuItem(wxCommandEvent& WXUNUSED(event))
} }
} }
void MyFrame::OnDeleteSubMenu(wxCommandEvent& WXUNUSED(event))
{
wxMenuBar *menubar = GetMenuBar();
wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 2);
for ( int n = menu->GetMenuItemCount() - 1; n >=0 ; --n )
{
wxMenuItem* item = menu->FindItemByPosition(n);
if (item->IsSubMenu())
{
menu->Destroy(item);
return;
}
}
wxLogWarning(wxT("No submenu to delete!"));
}
void MyFrame::OnInsertMenuItem(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnInsertMenuItem(wxCommandEvent& WXUNUSED(event))
{ {
wxMenuBar *menubar = GetMenuBar(); wxMenuBar *menubar = GetMenuBar();