X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ee9b7b53e02ae9bb2ef336d618cc59e35181568..4f31d61012bfa8371e268e42857f2d47f77c0af6:/samples/menu/menu.cpp?ds=inline

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index e32fe70121..5d1c12e335 100644
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -39,7 +39,25 @@
     #error "menu sample requires wxUSE_MENUS=1"
 #endif // wxUSE_MENUS
 
+// not all ports have support for EVT_CONTEXT_MENU yet, don't define
+// USE_CONTEXT_MENU for those which don't
+#if defined(__WXMOTIF__) || defined(__WXPM__) || defined(__WXX11__) || defined(__WXMGL__)
+    #define USE_CONTEXT_MENU 0
+#else
+    #define USE_CONTEXT_MENU 1
+#endif
+
+// this sample is usefull when new port is developed
+// and usually new port has majority of flags turned off
+#if wxUSE_LOG && wxUSE_TEXTCTRL
+    #define USE_LOG_WINDOW 1
+#else
+    #define USE_LOG_WINDOW 0
+#endif
+
+#if wxUSE_OWNER_DRAWN
 #include "copy.xpm"
+#endif
 
 // ----------------------------------------------------------------------------
 // classes
@@ -64,7 +82,9 @@ public:
 
 protected:
     void OnQuit(wxCommandEvent& event);
+#if USE_LOG_WINDOW
     void OnClearLog(wxCommandEvent& event);
+#endif
 
     void OnAbout(wxCommandEvent& event);
 
@@ -77,9 +97,13 @@ protected:
     void OnCheckMenuItem(wxCommandEvent& event);
     void OnEnableMenuItem(wxCommandEvent& event);
     void OnGetLabelMenuItem(wxCommandEvent& event);
+#if wxUSE_TEXTDLG
     void OnSetLabelMenuItem(wxCommandEvent& event);
+#endif
     void OnGetMenuItemInfo(wxCommandEvent& event);
+#if wxUSE_TEXTDLG
     void OnFindMenuItem(wxCommandEvent& event);
+#endif
 
     void OnAppendMenu(wxCommandEvent& event);
     void OnInsertMenu(wxCommandEvent& event);
@@ -88,7 +112,9 @@ protected:
     void OnEnableMenu(wxCommandEvent& event);
     void OnGetLabelMenu(wxCommandEvent& event);
     void OnSetLabelMenu(wxCommandEvent& event);
+#if wxUSE_TEXTDLG
     void OnFindMenu(wxCommandEvent& event);
+#endif
 
     void OnTestNormal(wxCommandEvent& event);
     void OnTestCheck(wxCommandEvent& event);
@@ -98,18 +124,25 @@ protected:
     void OnUpdateSubMenuCheck(wxUpdateUIEvent& event);
     void OnUpdateSubMenuRadio(wxUpdateUIEvent& event);
 
-#if defined( __WXMSW__ ) || defined( __WXMAC__ )
-    void OnContextMenu(wxContextMenuEvent& event)
-        { ShowContextMenu(ScreenToClient(event.GetPosition())); }
+#if USE_CONTEXT_MENU
+    void OnContextMenu(wxContextMenuEvent& event);
 #else
     void OnRightUp(wxMouseEvent& event)
         { ShowContextMenu(event.GetPosition()); }
 #endif
 
     void OnMenuOpen(wxMenuEvent& event)
-        { LogMenuOpenOrClose(event, _T("opened")); event.Skip(); }
+        {
+#if USE_LOG_WINDOW
+            LogMenuOpenOrClose(event, _T("opened")); event.Skip();
+#endif
+        }
     void OnMenuClose(wxMenuEvent& event)
-        { LogMenuOpenOrClose(event, _T("closed")); event.Skip(); }
+        {
+#if USE_LOG_WINDOW
+          LogMenuOpenOrClose(event, _T("closed")); event.Skip();
+#endif
+       }
 
     void OnUpdateCheckMenuItemUI(wxUpdateUIEvent& event);
 
@@ -129,8 +162,10 @@ private:
     // the count of dummy menus already created
     size_t m_countDummy;
 
+#if USE_LOG_WINDOW
     // the control used for logging
     wxTextCtrl *m_textctrl;
+#endif
 
     // the previous log target
     wxLog *m_logOld;
@@ -163,8 +198,10 @@ private:
 
 enum
 {
-    Menu_File_Quit = 100,
+    Menu_File_Quit = wxID_EXIT,
+#if USE_LOG_WINDOW
     Menu_File_ClearLog,
+#endif
 
     Menu_MenuBar_Toggle = 200,
     Menu_MenuBar_Append,
@@ -172,8 +209,10 @@ enum
     Menu_MenuBar_Delete,
     Menu_MenuBar_Enable,
     Menu_MenuBar_GetLabel,
+#if wxUSE_TEXTDLG
     Menu_MenuBar_SetLabel,
     Menu_MenuBar_FindMenu,
+#endif
 
     Menu_Menu_Append = 300,
     Menu_Menu_AppendSub,
@@ -182,9 +221,13 @@ enum
     Menu_Menu_Enable,
     Menu_Menu_Check,
     Menu_Menu_GetLabel,
+#if wxUSE_TEXTDLG
     Menu_Menu_SetLabel,
+#endif
     Menu_Menu_GetInfo,
+#if wxUSE_TEXTDLG
     Menu_Menu_FindItem,
+#endif
 
     Menu_Test_Normal = 400,
     Menu_Test_Check,
@@ -205,7 +248,7 @@ enum
     Menu_Dummy_Fourth,
     Menu_Dummy_Last,
 
-    Menu_Help_About = 1000,
+    Menu_Help_About = wxID_ABOUT,
 
     Menu_Popup_ToBeDeleted = 2000,
     Menu_Popup_ToBeGreyed,
@@ -221,7 +264,9 @@ enum
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Menu_File_Quit,     MyFrame::OnQuit)
+#if USE_LOG_WINDOW
     EVT_MENU(Menu_File_ClearLog, MyFrame::OnClearLog)
+#endif
 
     EVT_MENU(Menu_Help_About, MyFrame::OnAbout)
 
@@ -231,8 +276,10 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Menu_MenuBar_Delete,   MyFrame::OnDeleteMenu)
     EVT_MENU(Menu_MenuBar_Enable,   MyFrame::OnEnableMenu)
     EVT_MENU(Menu_MenuBar_GetLabel, MyFrame::OnGetLabelMenu)
+#if wxUSE_TEXTDLG
     EVT_MENU(Menu_MenuBar_SetLabel, MyFrame::OnSetLabelMenu)
     EVT_MENU(Menu_MenuBar_FindMenu, MyFrame::OnFindMenu)
+#endif
 
     EVT_MENU(Menu_Menu_Append,    MyFrame::OnAppendMenuItem)
     EVT_MENU(Menu_Menu_AppendSub, MyFrame::OnAppendSubMenu)
@@ -241,9 +288,13 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Menu_Menu_Enable,    MyFrame::OnEnableMenuItem)
     EVT_MENU(Menu_Menu_Check,     MyFrame::OnCheckMenuItem)
     EVT_MENU(Menu_Menu_GetLabel,  MyFrame::OnGetLabelMenuItem)
+#if wxUSE_TEXTDLG
     EVT_MENU(Menu_Menu_SetLabel,  MyFrame::OnSetLabelMenuItem)
+#endif
     EVT_MENU(Menu_Menu_GetInfo,   MyFrame::OnGetMenuItemInfo)
+#if wxUSE_TEXTDLG
     EVT_MENU(Menu_Menu_FindItem,  MyFrame::OnFindMenuItem)
+#endif
 
     EVT_MENU(Menu_Test_Normal,    MyFrame::OnTestNormal)
     EVT_MENU(Menu_Test_Check,     MyFrame::OnTestCheck)
@@ -261,7 +312,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
     EVT_UPDATE_UI(Menu_Menu_Check, MyFrame::OnUpdateCheckMenuItemUI)
 
-#if defined( __WXMSW__ ) || defined( __WXMAC__ )
+#if USE_CONTEXT_MENU
     EVT_CONTEXT_MENU(MyFrame::OnContextMenu)
 #else
     EVT_RIGHT_UP(MyFrame::OnRightUp)
@@ -274,7 +325,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler)
-    EVT_MENU(-1, MyEvtHandler::OnMenuEvent)
+    EVT_MENU(wxID_ANY, MyEvtHandler::OnMenuEvent)
 END_EVENT_TABLE()
 
 // ============================================================================
@@ -297,7 +348,7 @@ bool MyApp::OnInit()
     frame->Show(true);
 
 #if wxUSE_STATUSBAR
-    frame->SetStatusText(_T("Welcome to wxWindows menu sample"));
+    frame->SetStatusText(_T("Welcome to wxWidgets menu sample"));
 #endif // wxUSE_STATUSBAR
 
     SetTopWindow(frame);
@@ -311,10 +362,11 @@ bool MyApp::OnInit()
 
 // Define my frame constructor
 MyFrame::MyFrame()
-       : wxFrame((wxFrame *)NULL, -1, _T("wxWindows menu sample"),
-                 wxDefaultPosition, wxSize(400, 250))
+       : wxFrame((wxFrame *)NULL, wxID_ANY, _T("wxWidgets menu sample"))
 {
+#if USE_LOG_WINDOW
     m_textctrl = NULL;
+#endif
     m_menu = NULL;
     m_countDummy = 0;
     m_logOld = NULL;
@@ -326,11 +378,15 @@ MyFrame::MyFrame()
     // create the menubar
     wxMenu *fileMenu = new wxMenu;
 
+#if USE_LOG_WINDOW
     wxMenuItem *item = new wxMenuItem(fileMenu, Menu_File_ClearLog,
                                       _T("Clear &log\tCtrl-L"));
+#if wxUSE_OWNER_DRAWN
     item->SetBitmap(copy_xpm);
+#endif
     fileMenu->Append(item);
     fileMenu->AppendSeparator();
+#endif
     fileMenu->Append(Menu_File_Quit, _T("E&xit\tAlt-X"), _T("Quit menu sample"));
 
     wxMenu *menubarMenu = new wxMenu;
@@ -348,18 +404,20 @@ MyFrame::MyFrame()
     menubarMenu->AppendSeparator();
     menubarMenu->Append(Menu_MenuBar_GetLabel, _T("&Get menu label\tCtrl-G"),
                         _T("Get the label of the last menu"));
+#if wxUSE_TEXTDLG
     menubarMenu->Append(Menu_MenuBar_SetLabel, _T("&Set menu label\tCtrl-S"),
                         _T("Change the label of the last menu"));
     menubarMenu->AppendSeparator();
     menubarMenu->Append(Menu_MenuBar_FindMenu, _T("&Find menu from label\tCtrl-F"),
                         _T("Find a menu by searching for its label"));
+#endif
 
     wxMenu* subMenu = new wxMenu;
     subMenu->Append(Menu_SubMenu_Normal, _T("&Normal submenu item"), _T("Disabled submenu item"));
     subMenu->AppendCheckItem(Menu_SubMenu_Check, _T("&Unchecked submenu item"), _T("Unchecked submenu item"));
-    subMenu->AppendRadioItem(Menu_SubMenu_Radio1, _T("&Radio item 1"), _T("Radio item"));
-    subMenu->AppendRadioItem(Menu_SubMenu_Radio2, _T("&Radio item 2"), _T("Radio item"));
-    subMenu->AppendRadioItem(Menu_SubMenu_Radio3, _T("&Radio item 3"), _T("Radio item"));
+    subMenu->AppendRadioItem(Menu_SubMenu_Radio1, _T("Radio item &1"), _T("Radio item"));
+    subMenu->AppendRadioItem(Menu_SubMenu_Radio2, _T("Radio item &2"), _T("Radio item"));
+    subMenu->AppendRadioItem(Menu_SubMenu_Radio3, _T("Radio item &3"), _T("Radio item"));
 
     menubarMenu->Append(Menu_SubMenu, _T("Submenu"), subMenu);
 
@@ -380,9 +438,15 @@ MyFrame::MyFrame()
     menuMenu->AppendSeparator();
     menuMenu->Append(Menu_Menu_GetInfo, _T("Get menu item in&fo\tAlt-F"),
                      _T("Show the state of the last menu item"));
+#if wxUSE_TEXTDLG
+    menuMenu->Append(Menu_Menu_SetLabel, _T("Set menu item label\tAlt-L"),
+                     _T("Set the label of a menu item"));
+#endif
+#if wxUSE_TEXTDLG
     menuMenu->AppendSeparator();
     menuMenu->Append(Menu_Menu_FindItem, _T("Find menu item from label"),
                      _T("Find a menu item by searching for its label"));
+#endif
 
     wxMenu *testMenu = new wxMenu;
     testMenu->Append(Menu_Test_Normal, _T("&Normal item"));
@@ -416,8 +480,9 @@ MyFrame::MyFrame()
     // intercept all menu events and log them in this custom event handler
     PushEventHandler(new MyEvtHandler(this));
 
+#if USE_LOG_WINDOW
     // create the log text window
-    m_textctrl = new wxTextCtrl(this, -1, _T(""),
+    m_textctrl = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE);
     m_textctrl->SetEditable(false);
@@ -430,6 +495,7 @@ MyFrame::MyFrame()
                  _T("The commands from \"Menubar\" menu work with the ")
                  _T("menubar itself.\n\n")
                  _T("Right click the band below to test popup menus.\n"));
+#endif
 }
 
 MyFrame::~MyFrame()
@@ -439,8 +505,10 @@ MyFrame::~MyFrame()
     // delete the event handler installed in ctor
     PopEventHandler(true);
 
+#if USE_LOG_WINDOW
     // restore old logger
     delete wxLog::SetActiveTarget(m_logOld);
+#endif
 }
 
 wxMenu *MyFrame::CreateDummyMenu(wxString *title)
@@ -448,7 +516,7 @@ wxMenu *MyFrame::CreateDummyMenu(wxString *title)
     wxMenu *menu = new wxMenu;
     menu->Append(Menu_Dummy_First, _T("&First item\tCtrl-F1"));
     menu->AppendSeparator();
-    menu->Append(Menu_Dummy_Second, _T("&Second item\tCtrl-F2"), _T(""), true);
+    menu->AppendCheckItem(Menu_Dummy_Second, _T("&Second item\tCtrl-F2"));
 
     if ( title )
     {
@@ -479,11 +547,13 @@ wxMenuItem *MyFrame::GetLastMenuItem() const
 void MyFrame::LogMenuEvent(const wxCommandEvent& event)
 {
     int id = event.GetId();
-    if ( !GetMenuBar()->FindItem(id) )
-        return;
 
     wxString msg = wxString::Format(_T("Menu command %d"), id);
-    if ( GetMenuBar()->FindItem(id)->IsCheckable() )
+
+    // catch all checkable menubar items and also the check item from the popup
+    // menu
+    wxMenuItem *item = GetMenuBar()->FindItem(id);
+    if ( (item && item->IsCheckable()) || id == Menu_Popup_ToBeChecked )
     {
         msg += wxString::Format(_T(" (the item is currently %schecked)"),
                                 event.IsChecked() ? _T("") : _T("not "));
@@ -501,15 +571,17 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
     Close(true);
 }
 
+#if USE_LOG_WINDOW
 void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
 {
     m_textctrl->Clear();
 }
+#endif
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    (void)wxMessageBox(_T("wxWindows menu sample\n© 1999-2001 Vadim Zeitlin"),
-                       _T("About wxWindows menu sample"),
+    (void)wxMessageBox(_T("wxWidgets menu sample\n(c) 1999-2001 Vadim Zeitlin"),
+                       _T("About wxWidgets menu sample"),
                        wxICON_INFORMATION);
 }
 
@@ -578,6 +650,7 @@ void MyFrame::OnGetLabelMenu(wxCommandEvent& WXUNUSED(event))
                  mbar->GetLabelTop(count - 1).c_str());
 }
 
+#if wxUSE_TEXTDLG
 void MyFrame::OnSetLabelMenu(wxCommandEvent& WXUNUSED(event))
 {
     wxMenuBar *mbar = GetMenuBar();
@@ -610,7 +683,7 @@ void MyFrame::OnFindMenu(wxCommandEvent& WXUNUSED(event))
                      (
                         _T("Enter label to search for: "),
                         _T("Find menu"),
-                        _T(""),
+                        wxEmptyString,
                         this
                      );
 
@@ -628,6 +701,7 @@ void MyFrame::OnFindMenu(wxCommandEvent& WXUNUSED(event))
         }
     }
 }
+#endif
 
 void MyFrame::OnDummy(wxCommandEvent& event)
 {
@@ -677,7 +751,7 @@ void MyFrame::OnInsertMenuItem(wxCommandEvent& WXUNUSED(event))
 
     menu->Insert(0, wxMenuItem::New(menu, Menu_Dummy_Fourth,
                                     _T("Fourth dummy item\tCtrl-F4")));
-    menu->Insert(1, wxMenuItem::New(menu, wxID_SEPARATOR, _T("")));
+    menu->Insert(1, wxMenuItem::New(menu, wxID_SEPARATOR));
 }
 
 void MyFrame::OnEnableMenuItem(wxCommandEvent& WXUNUSED(event))
@@ -717,6 +791,7 @@ void MyFrame::OnGetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
     }
 }
 
+#if wxUSE_TEXTDLG
 void MyFrame::OnSetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
 {
     wxMenuItem *item = GetLastMenuItem();
@@ -730,6 +805,7 @@ void MyFrame::OnSetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
                             item->GetLabel(),
                             this
                          );
+        label.Replace( _T("\\t"), _T("\t") );
 
         if ( !label.empty() )
         {
@@ -737,6 +813,7 @@ void MyFrame::OnSetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
         }
     }
 }
+#endif
 
 void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
 {
@@ -813,6 +890,7 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
     }
 }
 
+#if wxUSE_TEXTDLG
 void MyFrame::OnFindMenuItem(wxCommandEvent& WXUNUSED(event))
 {
     wxMenuBar *mbar = GetMenuBar();
@@ -824,7 +902,7 @@ void MyFrame::OnFindMenuItem(wxCommandEvent& WXUNUSED(event))
                      (
                         _T("Enter label to search for: "),
                         _T("Find menu item"),
-                        _T(""),
+                        wxEmptyString,
                         this
                      );
 
@@ -832,7 +910,7 @@ void MyFrame::OnFindMenuItem(wxCommandEvent& WXUNUSED(event))
     {
         size_t menuindex;
         int index = wxNOT_FOUND;
-        
+
         for (menuindex = 0; (menuindex < count) && (index == wxNOT_FOUND); ++menuindex)
         {
             index = mbar->FindMenuItem(mbar->GetMenu(menuindex)->GetTitle(), label);
@@ -848,6 +926,7 @@ void MyFrame::OnFindMenuItem(wxCommandEvent& WXUNUSED(event))
         }
     }
 }
+#endif
 
 void MyFrame::ShowContextMenu(const wxPoint& pos)
 {
@@ -856,7 +935,7 @@ void MyFrame::ShowContextMenu(const wxPoint& pos)
     menu.Append(Menu_Help_About, _T("&About"));
     menu.Append(Menu_Popup_Submenu, _T("&Submenu"), CreateDummyMenu(NULL));
     menu.Append(Menu_Popup_ToBeDeleted, _T("To be &deleted"));
-    menu.Append(Menu_Popup_ToBeChecked, _T("To be &checked"), _T(""), true);
+    menu.AppendCheckItem(Menu_Popup_ToBeChecked, _T("To be &checked"));
     menu.Append(Menu_Popup_ToBeGreyed, _T("To be &greyed"),
                 _T("This menu item should be initially greyed out"));
     menu.AppendSeparator();
@@ -893,6 +972,7 @@ void MyFrame::OnTestRadio(wxCommandEvent& event)
                  event.GetId() - Menu_Test_Radio1 + 1);
 }
 
+#if USE_LOG_WINDOW
 void MyFrame::LogMenuOpenOrClose(const wxMenuEvent& event, const wxChar *what)
 {
     wxString msg;
@@ -901,9 +981,10 @@ void MyFrame::LogMenuOpenOrClose(const wxMenuEvent& event, const wxChar *what)
         << _T("menu has been ")
         << what
         << _T(".");
-           
+
     wxLogStatus(this, msg.c_str());
 }
+#endif
 
 void MyFrame::OnUpdateSubMenuNormal(wxUpdateUIEvent& event)
 {
@@ -925,14 +1006,32 @@ void MyFrame::OnUpdateSubMenuRadio(wxUpdateUIEvent& event)
         event.Check(false);
 }
 
+#if USE_CONTEXT_MENU
+void MyFrame::OnContextMenu(wxContextMenuEvent& event)
+{
+    wxPoint point = event.GetPosition();
+    // If from keyboard
+    if (point.x == -1 && point.y == -1) {
+        wxSize size = GetSize();
+        point.x = size.x / 2;
+        point.y = size.y / 2;
+    } else {
+        point = ScreenToClient(point);
+    }
+    ShowContextMenu(point);
+}
+#endif
+
 void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
 {
+#if USE_LOG_WINDOW
     if ( !m_textctrl )
         return;
 
     // leave a band below for popup menu testing
     wxSize size = GetClientSize();
     m_textctrl->SetSize(0, 0, size.x, (3*size.y)/4);
+#endif
 
     // this is really ugly but we have to do it as we can't just call
     // event.Skip() because wxFrameBase would make the text control fill the