wxFileSelector should have file name only, not path, passed to 3rd arg

[wxWidgets.git] / samples / menu / menu.cpp

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index bcbc815d7011f3cd42d6979e5d896171a5bf6628..bb2e4de3b6d16a553bca316258550a483ad2e311 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -26,10 +26,11 @@
 
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
 
 #ifndef WX_PRECOMP
     #include <wx/wx.h>

-

     #include <wx/log.h>
 #endif
 
     #include <wx/log.h>
 #endif
 

+#include "copy.xpm"
+

 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------


@@ -47,7 +48,9 @@ class MyFrame: public wxFrame
 public:
     MyFrame();
 
 public:
     MyFrame();
 

-    virtual ~MyFrame() { delete m_menu; }
+    virtual ~MyFrame();
+
+    void LogMenuEvent(const wxCommandEvent& event);

 
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);


@@ -65,6 +68,7 @@ public:
     void OnGetMenuItemInfo(wxCommandEvent& event);
 
     void OnAppendMenu(wxCommandEvent& event);
     void OnGetMenuItemInfo(wxCommandEvent& event);
 
     void OnAppendMenu(wxCommandEvent& event);

+    void OnInsertMenu(wxCommandEvent& event);

     void OnDeleteMenu(wxCommandEvent& event);
     void OnToggleMenu(wxCommandEvent& event);
     void OnEnableMenu(wxCommandEvent& event);
     void OnDeleteMenu(wxCommandEvent& event);
     void OnToggleMenu(wxCommandEvent& event);
     void OnEnableMenu(wxCommandEvent& event);


@@ -76,12 +80,33 @@ public:
     void OnUpdateCheckMenuItemUI(wxUpdateUIEvent& event);
 
 private:
     void OnUpdateCheckMenuItemUI(wxUpdateUIEvent& event);
 
 private:

-    wxMenu *CreateDummyMenu();
+    wxMenu *CreateDummyMenu(wxString *title);

 
     wxMenuItem *GetLastMenuItem() const;
 
     wxMenu     *m_menu;
 
 
     wxMenuItem *GetLastMenuItem() const;
 
     wxMenu     *m_menu;
 

+    size_t m_countDummy;
+
+    DECLARE_EVENT_TABLE()
+};
+
+// A small helper class which intercepts all menu events and logs them
+class MyEvtHandler : public wxEvtHandler
+{
+public:
+    MyEvtHandler(MyFrame *frame) { m_frame = frame; }
+
+    void OnMenuEvent(wxCommandEvent& event)
+    {
+        m_frame->LogMenuEvent(event);
+
+        event.Skip();
+    }
+
+private:
+    MyFrame *m_frame;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -95,6 +120,7 @@ enum
 
     Menu_MenuBar_Toggle = 200,
     Menu_MenuBar_Append,
 
     Menu_MenuBar_Toggle = 200,
     Menu_MenuBar_Append,

+    Menu_MenuBar_Insert,

     Menu_MenuBar_Delete,
     Menu_MenuBar_Enable,
     Menu_MenuBar_GetLabel,
     Menu_MenuBar_Delete,
     Menu_MenuBar_Enable,
     Menu_MenuBar_GetLabel,


@@ -137,6 +163,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
     EVT_MENU(Menu_MenuBar_Toggle,   MyFrame::OnToggleMenu)
     EVT_MENU(Menu_MenuBar_Append,   MyFrame::OnAppendMenu)
 
     EVT_MENU(Menu_MenuBar_Toggle,   MyFrame::OnToggleMenu)
     EVT_MENU(Menu_MenuBar_Append,   MyFrame::OnAppendMenu)

+    EVT_MENU(Menu_MenuBar_Insert,   MyFrame::OnInsertMenu)

     EVT_MENU(Menu_MenuBar_Delete,   MyFrame::OnDeleteMenu)
     EVT_MENU(Menu_MenuBar_Enable,   MyFrame::OnEnableMenu)
     EVT_MENU(Menu_MenuBar_GetLabel, MyFrame::OnGetLabelMenu)
     EVT_MENU(Menu_MenuBar_Delete,   MyFrame::OnDeleteMenu)
     EVT_MENU(Menu_MenuBar_Enable,   MyFrame::OnEnableMenu)
     EVT_MENU(Menu_MenuBar_GetLabel, MyFrame::OnGetLabelMenu)


@@ -159,6 +186,10 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_RIGHT_DOWN(MyFrame::OnRightDown)
 END_EVENT_TABLE()
 
     EVT_RIGHT_DOWN(MyFrame::OnRightDown)
 END_EVENT_TABLE()
 

+BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler)
+    EVT_MENU(-1, MyEvtHandler::OnMenuEvent)
+END_EVENT_TABLE()
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -195,16 +226,23 @@ MyFrame::MyFrame()
                  wxDefaultPosition, wxSize(300, 200))
 {
     m_menu = NULL;
                  wxDefaultPosition, wxSize(300, 200))
 {
     m_menu = NULL;

+    m_countDummy = 0;

 
 

-    CreateStatusBar();
+    CreateStatusBar(2);

 
     // create the menubar
     wxMenu *fileMenu = new wxMenu;
     fileMenu->Append(Menu_File_Quit, "E&xit\tAlt-X", "Quit toolbar sample" );
 
     // create the menubar
     wxMenu *fileMenu = new wxMenu;
     fileMenu->Append(Menu_File_Quit, "E&xit\tAlt-X", "Quit toolbar sample" );

+    
+    wxMenuItem *bitmap_menu_item = new wxMenuItem( fileMenu, Menu_File_Quit, "Quit with &bitmap\tAlt-Q" );
+    bitmap_menu_item->SetBitmap( wxBitmap( copy_xpm ) );
+    fileMenu->Append( bitmap_menu_item ); 

 
     wxMenu *menubarMenu = new wxMenu;
     menubarMenu->Append(Menu_MenuBar_Append, "&Append menu\tCtrl-A",
                         "Append a menu to the menubar");
 
     wxMenu *menubarMenu = new wxMenu;
     menubarMenu->Append(Menu_MenuBar_Append, "&Append menu\tCtrl-A",
                         "Append a menu to the menubar");

+    menubarMenu->Append(Menu_MenuBar_Insert, "&Insert menu\tCtrl-I",
+                        "Insert a menu into the menubar");

     menubarMenu->Append(Menu_MenuBar_Delete, "&Delete menu\tCtrl-D",
                         "Delete the last menu from the menubar");
     menubarMenu->Append(Menu_MenuBar_Toggle, "&Toggle menu\tCtrl-T",
     menubarMenu->Append(Menu_MenuBar_Delete, "&Delete menu\tCtrl-D",
                         "Delete the last menu from the menubar");
     menubarMenu->Append(Menu_MenuBar_Toggle, "&Toggle menu\tCtrl-T",


@@ -259,15 +297,31 @@ MyFrame::MyFrame()
 
     // associate the menu bar with the frame
     SetMenuBar(menuBar);
 
     // associate the menu bar with the frame
     SetMenuBar(menuBar);

+
+    // intercept all menu events and log them in this custom event handler
+    PushEventHandler(new MyEvtHandler(this));
+}
+
+MyFrame::~MyFrame()
+{
+    delete m_menu;
+
+    // delete the event handler installed in ctor
+    PopEventHandler(TRUE);

 }
 
 }
 

-wxMenu *MyFrame::CreateDummyMenu()
+wxMenu *MyFrame::CreateDummyMenu(wxString *title)

 {
     wxMenu *menu = new wxMenu;
     menu->Append(Menu_Dummy_First, "First item\tCtrl-F1");
     menu->AppendSeparator();
     menu->Append(Menu_Dummy_Second, "Second item\tCtrl-F2", "", TRUE);
 
 {
     wxMenu *menu = new wxMenu;
     menu->Append(Menu_Dummy_First, "First item\tCtrl-F1");
     menu->AppendSeparator();
     menu->Append(Menu_Dummy_Second, "Second item\tCtrl-F2", "", TRUE);
 

+    if ( title )
+    {
+        title->Printf("Dummy menu &%d", ++m_countDummy);
+    }
+

     return menu;
 }
 
     return menu;
 }
 


@@ -289,6 +343,25 @@ wxMenuItem *MyFrame::GetLastMenuItem() const
     }
 }
 
     }
 }
 

+void MyFrame::LogMenuEvent(const wxCommandEvent& event)
+{
+    int id = event.GetId();
+    if (!GetMenuBar()->FindItem(id))
+        return;
+    wxString msg = wxString::Format("Menu command %d", id);
+    if ( GetMenuBar()->FindItem(id)->IsCheckable() )
+    {
+        msg += wxString::Format(" (the item is currently %schecked)",
+                                event.IsChecked() ? "" : "not ");
+    }
+
+    SetStatusText(msg, 1);
+}
+
+// ----------------------------------------------------------------------------
+// menu callbacks
+// ----------------------------------------------------------------------------
+

 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     Close(TRUE);
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     Close(TRUE);


@@ -317,14 +390,18 @@ void MyFrame::OnDeleteMenu(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

-void MyFrame::OnAppendMenu(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnInsertMenu(wxCommandEvent& WXUNUSED(event))

 {
 {

-    static int s_count = 0;
-

     wxString title;
     wxString title;

-    title.Printf("Dummy menu &%d", ++s_count);
+    wxMenu *menu = CreateDummyMenu(&title);
+    GetMenuBar()->Insert(0, menu, title);
+}

 
 

-    GetMenuBar()->Append(CreateDummyMenu(), title);
+void MyFrame::OnAppendMenu(wxCommandEvent& WXUNUSED(event))
+{
+    wxString title;
+    wxMenu *menu = CreateDummyMenu(&title);
+    GetMenuBar()->Append(menu, title);

 }
 
 void MyFrame::OnToggleMenu(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnToggleMenu(wxCommandEvent& WXUNUSED(event))


@@ -391,10 +468,11 @@ void MyFrame::OnAppendMenuItem(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnAppendSubMenu(wxCommandEvent& WXUNUSED(event))
 {
     wxMenuBar *menubar = GetMenuBar();
 void MyFrame::OnAppendSubMenu(wxCommandEvent& WXUNUSED(event))
 {
     wxMenuBar *menubar = GetMenuBar();

+

     wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1);
 
     wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1);
 

-    menu->Append(Menu_Dummy_Last, "Dummy sub menu\tCtrl-F12",
-                 CreateDummyMenu());
+    menu->Append(Menu_Dummy_Last, "Dummy sub menu",
+                 CreateDummyMenu(NULL), "Dummy sub menu help");

 }
 
 void MyFrame::OnDeleteMenuItem(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnDeleteMenuItem(wxCommandEvent& WXUNUSED(event))


@@ -442,6 +520,8 @@ void MyFrame::OnCheckMenuItem(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnUpdateCheckMenuItemUI(wxUpdateUIEvent& event)
 {
 
 void MyFrame::OnUpdateCheckMenuItemUI(wxUpdateUIEvent& event)
 {

+    wxLogNull nolog;
+

     wxMenuItem *item = GetLastMenuItem();
 
     event.Enable(item && item->IsCheckable());
     wxMenuItem *item = GetLastMenuItem();
 
     event.Enable(item && item->IsCheckable());


@@ -478,7 +558,7 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
         msg << "The item is " << (item->IsEnabled() ? "enabled"
                                                     : "disabled")
             << '\n';
         msg << "The item is " << (item->IsEnabled() ? "enabled"
                                                     : "disabled")
             << '\n';

-                                            
+

         if ( item->IsCheckable() )
         {
             msg << "It is checkable and " << (item->IsChecked() ? "" : "un")
         if ( item->IsCheckable() )
         {
             msg << "It is checkable and " << (item->IsChecked() ? "" : "un")


@@ -548,7 +628,7 @@ void MyFrame::OnRightDown(wxMouseEvent &event )
     wxMenu menu("Test popup");
 
     menu.Append(Menu_Help_About, "&About");
     wxMenu menu("Test popup");
 
     menu.Append(Menu_Help_About, "&About");

-    menu.Append(Menu_Popup_Submenu, "Submenu", CreateDummyMenu());
+    menu.Append(Menu_Popup_Submenu, "Submenu", CreateDummyMenu(NULL));

     menu.Append(Menu_Popup_ToBeDeleted, "To be deleted");
     menu.Append(Menu_Popup_ToBeChecked, "To be checked", "", TRUE);
     menu.Append(Menu_Popup_ToBeGreyed, "To be greyed");
     menu.Append(Menu_Popup_ToBeDeleted, "To be deleted");
     menu.Append(Menu_Popup_ToBeChecked, "To be checked", "", TRUE);
     menu.Append(Menu_Popup_ToBeGreyed, "To be greyed");


@@ -560,4 +640,11 @@ void MyFrame::OnRightDown(wxMouseEvent &event )
     menu.Enable(Menu_Popup_ToBeGreyed, FALSE);
 
     PopupMenu( &menu, event.GetX(), event.GetY() );
     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

 }
 }