X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c7766de900be4f22fde1c27c2398278583cbf43..a2615ebc22a402b1badb46475f94ab6aa3a64018:/samples/menu/menu.cpp

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index b60d0c74c9..bc87eebf62 100644
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -88,13 +88,31 @@ protected:
     void OnGetLabelMenu(wxCommandEvent& event);
     void OnSetLabelMenu(wxCommandEvent& event);
 
-    void OnRightUp(wxMouseEvent& event);
+    void OnTestNormal(wxCommandEvent& event);
+    void OnTestCheck(wxCommandEvent& event);
+    void OnTestRadio(wxCommandEvent& event);
+
+#ifdef __WXMSW__
+    void OnContextMenu(wxContextMenuEvent& event)
+        { ShowContextMenu(ScreenToClient(event.GetPosition())); }
+#else
+    void OnRightUp(wxMouseEvent& event)
+        { ShowContextMenu(event.GetPosition()); }
+#endif
+
+    void OnMenuOpen(wxMenuEvent& event)
+        { LogMenuOpenOrClose(event, _T("opened")); }
+    void OnMenuClose(wxMenuEvent& event)
+        { LogMenuOpenOrClose(event, _T("closed")); }
 
     void OnUpdateCheckMenuItemUI(wxUpdateUIEvent& event);
 
     void OnSize(wxSizeEvent& event);
 
 private:
+    void LogMenuOpenOrClose(const wxMenuEvent& event, const wxChar *what);
+    void ShowContextMenu(const wxPoint& pos);
+
     wxMenu *CreateDummyMenu(wxString *title);
 
     wxMenuItem *GetLastMenuItem() const;
@@ -160,7 +178,13 @@ enum
     Menu_Menu_SetLabel,
     Menu_Menu_GetInfo,
 
-    Menu_Dummy_First = 400,
+    Menu_Test_Normal = 400,
+    Menu_Test_Check,
+    Menu_Test_Radio1,
+    Menu_Test_Radio2,
+    Menu_Test_Radio3,
+
+    Menu_Dummy_First = 500,
     Menu_Dummy_Second,
     Menu_Dummy_Third,
     Menu_Dummy_Fourth,
@@ -204,11 +228,24 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Menu_Menu_SetLabel,  MyFrame::OnSetLabelMenuItem)
     EVT_MENU(Menu_Menu_GetInfo,   MyFrame::OnGetMenuItemInfo)
 
+    EVT_MENU(Menu_Test_Normal,    MyFrame::OnTestNormal)
+    EVT_MENU(Menu_Test_Check,     MyFrame::OnTestCheck)
+    EVT_MENU(Menu_Test_Radio1,    MyFrame::OnTestRadio)
+    EVT_MENU(Menu_Test_Radio2,    MyFrame::OnTestRadio)
+    EVT_MENU(Menu_Test_Radio3,    MyFrame::OnTestRadio)
+
     EVT_MENU_RANGE(Menu_Dummy_First, Menu_Dummy_Last, MyFrame::OnDummy)
 
     EVT_UPDATE_UI(Menu_Menu_Check, MyFrame::OnUpdateCheckMenuItemUI)
 
+#ifdef __WXMSW__
+    EVT_CONTEXT_MENU(MyFrame::OnContextMenu)
+#else
     EVT_RIGHT_UP(MyFrame::OnRightUp)
+#endif
+
+    EVT_MENU_OPEN(MyFrame::OnMenuOpen)
+    EVT_MENU_CLOSE(MyFrame::OnMenuClose)
 
     EVT_SIZE(MyFrame::OnSize)
 END_EVENT_TABLE()
@@ -314,6 +351,15 @@ MyFrame::MyFrame()
     menuMenu->Append(Menu_Menu_GetInfo, "Get menu item in&fo\tAlt-F",
                      "Show the state of the last menu item");
 
+    wxMenu *testMenu = new wxMenu;
+    testMenu->Append(Menu_Test_Normal, "&Normal item");
+    testMenu->AppendSeparator();
+    testMenu->AppendCheckItem(Menu_Test_Check, "&Check item");
+    testMenu->AppendSeparator();
+    testMenu->AppendRadioItem(Menu_Test_Radio1, "Radio item &1");
+    testMenu->AppendRadioItem(Menu_Test_Radio2, "Radio item &2");
+    testMenu->AppendRadioItem(Menu_Test_Radio3, "Radio item &3");
+
     wxMenu *helpMenu = new wxMenu;
     helpMenu->Append(Menu_Help_About, "&About\tF1", "About menu sample");
 
@@ -322,6 +368,7 @@ MyFrame::MyFrame()
     menuBar->Append(fileMenu, "&File");
     menuBar->Append(menubarMenu, "Menu&bar");
     menuBar->Append(menuMenu, "&Menu");
+    menuBar->Append(testMenu, "&Test");
     menuBar->Append(helpMenu, "&Help");
 
     // these items should be initially checked
@@ -703,7 +750,7 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
     }
 }
 
-void MyFrame::OnRightUp(wxMouseEvent &event)
+void MyFrame::ShowContextMenu(const wxPoint& pos)
 {
     wxMenu menu("Test popup");
 
@@ -719,7 +766,7 @@ void MyFrame::OnRightUp(wxMouseEvent &event)
     menu.Check(Menu_Popup_ToBeChecked, TRUE);
     menu.Enable(Menu_Popup_ToBeGreyed, FALSE);
 
-    PopupMenu(&menu, event.GetX(), event.GetY());
+    PopupMenu(&menu, pos.x, pos.y);
 
     // test for destroying items in popup menus
 #if 0 // doesn't work in wxGTK!
@@ -729,6 +776,29 @@ void MyFrame::OnRightUp(wxMouseEvent &event)
 #endif // 0
 }
 
+void MyFrame::OnTestNormal(wxCommandEvent& event)
+{
+    wxLogMessage(_T("Normal item selected"));
+}
+
+void MyFrame::OnTestCheck(wxCommandEvent& event)
+{
+    wxLogMessage(_T("Check item %schecked"),
+                 event.IsChecked() ? _T("") : _T("un"));
+}
+
+void MyFrame::OnTestRadio(wxCommandEvent& event)
+{
+    wxLogMessage(_T("Radio item %d selected"),
+                 event.GetId() - Menu_Test_Radio1 + 1);
+}
+
+void MyFrame::LogMenuOpenOrClose(const wxMenuEvent& event, const wxChar *what)
+{
+    wxLogStatus(this, _T("A %smenu has been %s."),
+                event.IsPopup() ? _T("popup ") : _T(""), what);
+}
+
 void MyFrame::OnSize(wxSizeEvent& event)
 {
     if ( !m_textctrl )