Version updates, manual date change, no change to dragimmg.cpp

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

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index 7fa2267150dfec3cab89304c3ccd1562d6ec4411..bc87eebf62fb36fb180a7f4aaa0c02b18c5c43a1 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -18,18 +18,29 @@
 // ----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".
 // ----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP

-    #include <wx/wx.h>
-
-    #include <wx/log.h>
+    #include "wx/app.h"
+    #include "wx/frame.h"
+    #include "wx/menu.h"
+    #include "wx/msgdlg.h"
+    #include "wx/log.h"
+    #include "wx/textctrl.h"
+    #include "wx/textdlg.h"

 #endif
 
 #endif
 

+#if !wxUSE_MENUS
+    // nice try...
+    #error "menu sample requires wxUSE_MENUS=1"
+#endif // wxUSE_MENUS
+
+#include "copy.xpm"
+

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


@@ -47,9 +58,14 @@ class MyFrame: public wxFrame
 public:
     MyFrame();
 
 public:
     MyFrame();
 

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

 
 

+protected:

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

+    void OnClearLog(wxCommandEvent& event);
+

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


@@ -62,24 +78,75 @@ public:
     void OnEnableMenuItem(wxCommandEvent& event);
     void OnGetLabelMenuItem(wxCommandEvent& event);
     void OnSetLabelMenuItem(wxCommandEvent& event);
     void OnEnableMenuItem(wxCommandEvent& event);
     void OnGetLabelMenuItem(wxCommandEvent& event);
     void OnSetLabelMenuItem(wxCommandEvent& event);

+    void OnGetMenuItemInfo(wxCommandEvent& event);

 
     void OnAppendMenu(wxCommandEvent& event);
 
     void OnAppendMenu(wxCommandEvent& event);

+    void OnInsertMenu(wxCommandEvent& event);

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

-    void OnRightDown(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 OnUpdateCheckMenuItemUI(wxUpdateUIEvent& event);
 

+    void OnSize(wxSizeEvent& event);
+

 private:
 private:

-    wxMenu *CreateDummyMenu();
+    void LogMenuOpenOrClose(const wxMenuEvent& event, const wxChar *what);
+    void ShowContextMenu(const wxPoint& pos);
+
+    wxMenu *CreateDummyMenu(wxString *title);

 
     wxMenuItem *GetLastMenuItem() const;
 
 
     wxMenuItem *GetLastMenuItem() const;
 

-    wxMenu     *m_menu;
+    // the menu previously detached from the menubar (may be NULL)
+    wxMenu *m_menu;
+
+    // the count of dummy menus already created
+    size_t m_countDummy;
+
+    // the control used for logging
+    wxTextCtrl *m_textctrl;
+
+    // the previous log target
+    wxLog *m_logOld;
+
+    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()
 };


@@ -91,9 +158,11 @@ private:
 enum
 {
     Menu_File_Quit = 100,
 enum
 {
     Menu_File_Quit = 100,

+    Menu_File_ClearLog,

 
     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,


@@ -107,8 +176,15 @@ enum
     Menu_Menu_Check,
     Menu_Menu_GetLabel,
     Menu_Menu_SetLabel,
     Menu_Menu_Check,
     Menu_Menu_GetLabel,
     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,
     Menu_Dummy_Second,
     Menu_Dummy_Third,
     Menu_Dummy_Fourth,


@@ -129,12 +205,14 @@ enum
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

-    EVT_MENU(Menu_File_Quit, MyFrame::OnQuit)
+    EVT_MENU(Menu_File_Quit,     MyFrame::OnQuit)
+    EVT_MENU(Menu_File_ClearLog, MyFrame::OnClearLog)

 
     EVT_MENU(Menu_Help_About, MyFrame::OnAbout)
 
     EVT_MENU(Menu_MenuBar_Toggle,   MyFrame::OnToggleMenu)
     EVT_MENU(Menu_MenuBar_Append,   MyFrame::OnAppendMenu)
 
     EVT_MENU(Menu_Help_About, MyFrame::OnAbout)
 
     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)


@@ -145,15 +223,35 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Menu_Menu_Insert,    MyFrame::OnInsertMenuItem)
     EVT_MENU(Menu_Menu_Delete,    MyFrame::OnDeleteMenuItem)
     EVT_MENU(Menu_Menu_Enable,    MyFrame::OnEnableMenuItem)
     EVT_MENU(Menu_Menu_Insert,    MyFrame::OnInsertMenuItem)
     EVT_MENU(Menu_Menu_Delete,    MyFrame::OnDeleteMenuItem)
     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_SetLabel,  MyFrame::OnSetLabelMenuItem)
     EVT_MENU(Menu_Menu_GetLabel,  MyFrame::OnGetLabelMenuItem)
     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)
 
 
     EVT_MENU_RANGE(Menu_Dummy_First, Menu_Dummy_Last, MyFrame::OnDummy)
 
     EVT_UPDATE_UI(Menu_Menu_Check, MyFrame::OnUpdateCheckMenuItemUI)
 

-    EVT_RIGHT_DOWN(MyFrame::OnRightDown)
+#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()
+
+BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler)
+    EVT_MENU(-1, MyEvtHandler::OnMenuEvent)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -175,7 +273,9 @@ bool MyApp::OnInit()
 
     frame->Show(TRUE);
 
 
     frame->Show(TRUE);
 

-    frame->SetStatusText("Hello, wxWindows");
+#if wxUSE_STATUSBAR
+    frame->SetStatusText("Welcome to wxWindows menu sample");
+#endif // wxUSE_STATUSBAR

 
     SetTopWindow(frame);
 
 
     SetTopWindow(frame);
 


@@ -189,19 +289,32 @@ bool MyApp::OnInit()
 // Define my frame constructor
 MyFrame::MyFrame()
        : wxFrame((wxFrame *)NULL, -1, "wxWindows menu sample",
 // Define my frame constructor
 MyFrame::MyFrame()
        : wxFrame((wxFrame *)NULL, -1, "wxWindows menu sample",

-                 wxDefaultPosition, wxSize(300, 200))
+                 wxDefaultPosition, wxSize(400, 250))

 {
 {

+    m_textctrl = NULL;

     m_menu = NULL;
     m_menu = NULL;

+    m_countDummy = 0;
+    m_logOld = NULL;

 
 

+#if wxUSE_STATUSBAR

     CreateStatusBar();
     CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
     // create the menubar
     wxMenu *fileMenu = new wxMenu;
 
     // create the menubar
     wxMenu *fileMenu = new wxMenu;

-    fileMenu->Append(Menu_File_Quit, "E&xit\tAlt-X", "Quit toolbar sample" );
+
+    wxMenuItem *item = new wxMenuItem(fileMenu, Menu_File_ClearLog,
+                                      "Clear &log\tCtrl-L");
+    item->SetBitmap(copy_xpm);
+    fileMenu->Append(item);
+    fileMenu->AppendSeparator();
+    fileMenu->Append(Menu_File_Quit, "E&xit\tAlt-X", "Quit menu sample");

 
     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",


@@ -234,6 +347,18 @@ MyFrame::MyFrame()
                      "Get the label of the last menu item");
     menuMenu->Append(Menu_Menu_SetLabel, "&Set menu item label\tAlt-S",
                      "Change the label of the last menu item");
                      "Get the label of the last menu item");
     menuMenu->Append(Menu_Menu_SetLabel, "&Set menu item label\tAlt-S",
                      "Change the label of the last menu item");

+    menuMenu->AppendSeparator();
+    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");
 
     wxMenu *helpMenu = new wxMenu;
     helpMenu->Append(Menu_Help_About, "&About\tF1", "About menu sample");


@@ -243,6 +368,7 @@ MyFrame::MyFrame()
     menuBar->Append(fileMenu, "&File");
     menuBar->Append(menubarMenu, "Menu&bar");
     menuBar->Append(menuMenu, "&Menu");
     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
     menuBar->Append(helpMenu, "&Help");
 
     // these items should be initially checked


@@ -253,14 +379,48 @@ 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));
+
+    // create the log text window
+    m_textctrl = new wxTextCtrl(this, -1, _T(""),
+                                wxDefaultPosition, wxDefaultSize,
+                                wxTE_MULTILINE);
+    m_textctrl->SetEditable(FALSE);
+
+    wxLog::SetTimestamp(NULL);
+    m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_textctrl));
+
+    wxLogMessage(_T("Brief explanations: the commands or the \"Menu\" menu ")
+                 _T("append/insert/delete items to/from the last menu.\n")
+                 _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"));

 }
 
 }
 

-wxMenu *MyFrame::CreateDummyMenu()
+MyFrame::~MyFrame()
+{
+    delete m_menu;
+
+    // delete the event handler installed in ctor
+    PopEventHandler(TRUE);
+
+    // restore old logger
+    delete wxLog::SetActiveTarget(m_logOld);
+}
+
+wxMenu *MyFrame::CreateDummyMenu(wxString *title)

 {
     wxMenu *menu = new wxMenu;
 {
     wxMenu *menu = new wxMenu;

-    menu->Append(Menu_Dummy_First, "First item\tCtrl-F1");
+    menu->Append(Menu_Dummy_First, "&First item\tCtrl-F1");

     menu->AppendSeparator();
     menu->AppendSeparator();

-    menu->Append(Menu_Dummy_Second, "Second item\tCtrl-F2", "", TRUE);
+    menu->Append(Menu_Dummy_Second, "&Second item\tCtrl-F2", "", TRUE);
+
+    if ( title )
+    {
+        title->Printf(wxT("Dummy menu &%d"), ++m_countDummy);
+    }

 
     return menu;
 }
 
     return menu;
 }


@@ -273,7 +433,7 @@ wxMenuItem *MyFrame::GetLastMenuItem() const
     wxMenuItemList::Node *node = menu->GetMenuItems().GetLast();
     if ( !node )
     {
     wxMenuItemList::Node *node = menu->GetMenuItems().GetLast();
     if ( !node )
     {

-        wxLogWarning("No last item in the last menu!");
+        wxLogWarning(wxT("No last item in the last menu!"));

 
         return NULL;
     }
 
         return NULL;
     }


@@ -283,14 +443,39 @@ wxMenuItem *MyFrame::GetLastMenuItem() const
     }
 }
 
     }
 }
 

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

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

+void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
+{
+    m_textctrl->Clear();
+}
+

 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    (void)wxMessageBox("wxWindows toolbar sample",
+    (void)wxMessageBox("wxWindows menu sample\n© 1999-2001 Vadim Zeitlin",

                        "About wxWindows menu sample",
                        wxICON_INFORMATION);
 }
                        "About wxWindows menu sample",
                        wxICON_INFORMATION);
 }


@@ -303,7 +488,7 @@ void MyFrame::OnDeleteMenu(wxCommandEvent& WXUNUSED(event))
     if ( count == 2 )
     {
         // don't let delete the first 2 menus
     if ( count == 2 )
     {
         // don't let delete the first 2 menus

-        wxLogError("Can't delete any more menus");
+        wxLogError(wxT("Can't delete any more menus"));

     }
     else
     {
     }
     else
     {


@@ -311,14 +496,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))


@@ -337,15 +526,12 @@ void MyFrame::OnToggleMenu(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

-void MyFrame::OnEnableMenu(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnEnableMenu(wxCommandEvent& event)

 {
     wxMenuBar *mbar = GetMenuBar();
     size_t count = mbar->GetMenuCount();
 
 {
     wxMenuBar *mbar = GetMenuBar();
     size_t count = mbar->GetMenuCount();
 

-    static bool s_enabled = TRUE;
-
-    s_enabled = !s_enabled;
-    mbar->EnableTop(count - 1, s_enabled);
+    mbar->EnableTop(count - 1, event.IsChecked());

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


@@ -353,7 +539,9 @@ void MyFrame::OnGetLabelMenu(wxCommandEvent& WXUNUSED(event))
     wxMenuBar *mbar = GetMenuBar();
     size_t count = mbar->GetMenuCount();
 
     wxMenuBar *mbar = GetMenuBar();
     size_t count = mbar->GetMenuCount();
 

-    wxLogMessage("The label of the last menu item is '%s'",
+    wxCHECK_RET( count, _T("no last menu?") );
+
+    wxLogMessage(wxT("The label of the last menu item is '%s'"),

                  mbar->GetLabelTop(count - 1).c_str());
 }
 
                  mbar->GetLabelTop(count - 1).c_str());
 }
 


@@ -362,14 +550,25 @@ void MyFrame::OnSetLabelMenu(wxCommandEvent& WXUNUSED(event))
     wxMenuBar *mbar = GetMenuBar();
     size_t count = mbar->GetMenuCount();
 
     wxMenuBar *mbar = GetMenuBar();
     size_t count = mbar->GetMenuCount();
 

-    mbar->SetLabelTop(count - 1, "Dummy label &0");
+    wxCHECK_RET( count, _T("no last menu?") );
+
+    wxString label = wxGetTextFromUser
+                     (
+                        _T("Enter new label: "),
+                        _T("Change last menu text"),
+                        mbar->GetLabelTop(count - 1),
+                        this
+                     );
+
+    if ( !label.empty() )
+    {
+        mbar->SetLabelTop(count - 1, label);
+    }

 }
 
 void MyFrame::OnDummy(wxCommandEvent& event)
 {
 }
 
 void MyFrame::OnDummy(wxCommandEvent& event)
 {

-    wxString s;
-    s.Printf("Dummy item #%d", event.GetId() - Menu_Dummy_First + 1);
-    wxMessageBox(s, "Menu sample", wxICON_INFORMATION);
+    wxLogMessage(wxT("Dummy item #%d"), event.GetId() - Menu_Dummy_First + 1);

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


@@ -378,17 +577,18 @@ void MyFrame::OnAppendMenuItem(wxCommandEvent& WXUNUSED(event))
     wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1);
 
     menu->AppendSeparator();
     wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1);
 
     menu->AppendSeparator();

-    menu->Append(Menu_Dummy_Third, "Third dummy item\tCtrl-F3",
+    menu->Append(Menu_Dummy_Third, "&Third dummy item\tCtrl-F3",

                  "Checkable item", TRUE);
 }
 
 void MyFrame::OnAppendSubMenu(wxCommandEvent& WXUNUSED(event))
 {
     wxMenuBar *menubar = GetMenuBar();
                  "Checkable item", TRUE);
 }
 
 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))


@@ -399,7 +599,7 @@ void MyFrame::OnDeleteMenuItem(wxCommandEvent& WXUNUSED(event))
     size_t count = menu->GetMenuItemCount();
     if ( !count )
     {
     size_t count = menu->GetMenuItemCount();
     if ( !count )
     {

-        wxLogWarning("No items to delete!");
+        wxLogWarning(wxT("No items to delete!"));

     }
     else
     {
     }
     else
     {


@@ -436,6 +636,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());


@@ -447,7 +649,7 @@ void MyFrame::OnGetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
 
     if ( item )
     {
 
     if ( item )
     {

-        wxLogMessage("The label of the last menu item is '%s'",
+        wxLogMessage(wxT("The label of the last menu item is '%s'"),

                      item->GetLabel().c_str());
     }
 }
                      item->GetLabel().c_str());
     }
 }


@@ -458,19 +660,105 @@ void MyFrame::OnSetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
 
     if ( item )
     {
 
     if ( item )
     {

-        item->SetText("Dummy menu item text");
+        wxString label = wxGetTextFromUser
+                         (
+                            _T("Enter new label: "),
+                            _T("Change last menu item text"),
+                            item->GetLabel(),
+                            this
+                         );
+
+        if ( !label.empty() )
+        {
+            item->SetText(label);
+        }

     }
 }
 
     }
 }
 

-void MyFrame::OnRightDown(wxMouseEvent &event )
+void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
+{
+    wxMenuItem *item = GetLastMenuItem();
+
+    if ( item )
+    {
+        wxString msg;
+        msg << "The item is " << (item->IsEnabled() ? "enabled"
+                                                    : "disabled")
+            << '\n';
+
+        if ( item->IsCheckable() )
+        {
+            msg << "It is checkable and " << (item->IsChecked() ? "" : "un")
+                << "checked\n";
+        }
+
+#if wxUSE_ACCEL
+        wxAcceleratorEntry *accel = item->GetAccel();
+        if ( accel )
+        {
+            msg << "Its accelerator is ";
+
+            int flags = accel->GetFlags();
+            if ( flags & wxACCEL_ALT )
+                msg << wxT("Alt-");
+            if ( flags & wxACCEL_CTRL )
+                msg << wxT("Ctrl-");
+            if ( flags & wxACCEL_SHIFT )
+                msg << wxT("Shift-");
+
+            int code = accel->GetKeyCode();
+            switch ( code )
+            {
+                case WXK_F1:
+                case WXK_F2:
+                case WXK_F3:
+                case WXK_F4:
+                case WXK_F5:
+                case WXK_F6:
+                case WXK_F7:
+                case WXK_F8:
+                case WXK_F9:
+                case WXK_F10:
+                case WXK_F11:
+                case WXK_F12:
+                    msg << wxT('F') << code - WXK_F1 + 1;
+                    break;
+
+                // if there are any other keys wxGetAccelFromString() may return,
+                // we should process them here
+
+                default:
+                    if ( wxIsalnum(code) )
+                    {
+                        msg << (wxChar)code;
+
+                        break;
+                    }
+
+                    wxFAIL_MSG( wxT("unknown keyboard accel") );
+            }
+
+            delete accel;
+        }
+        else
+        {
+            msg << "It doesn't have an accelerator";
+        }
+#endif // wxUSE_ACCEL
+
+        wxLogMessage(msg);
+    }
+}
+
+void MyFrame::ShowContextMenu(const wxPoint& pos)

 {
     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_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_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.AppendSeparator();
     menu.Append(Menu_File_Quit, "E&xit");
 
     menu.AppendSeparator();
     menu.Append(Menu_File_Quit, "E&xit");
 


@@ -478,5 +766,53 @@ void MyFrame::OnRightDown(wxMouseEvent &event )
     menu.Check(Menu_Popup_ToBeChecked, TRUE);
     menu.Enable(Menu_Popup_ToBeGreyed, FALSE);
 
     menu.Check(Menu_Popup_ToBeChecked, TRUE);
     menu.Enable(Menu_Popup_ToBeGreyed, FALSE);
 

+    PopupMenu(&menu, pos.x, pos.y);
+
+    // test for destroying items in popup menus
+#if 0 // doesn't work in wxGTK!
+    menu.Destroy(Menu_Popup_Submenu);
+

     PopupMenu( &menu, event.GetX(), event.GetY() );
     PopupMenu( &menu, event.GetX(), event.GetY() );

+#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 )
+        return;
+
+    // leave a band below for popup menu testing
+    wxSize size = GetClientSize();
+    m_textctrl->SetSize(0, 0, size.x, (3*size.y)/4);
+
+    // 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
+    // entire frame then
+#ifdef __WXUNIVERSAL__
+    PositionMenuBar();
+#endif // __WXUNIVERSAL__

 }
 }

+