Corrections in light of recent toolbar and other changes

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

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index 3bfdbc8e77965ddf0b9eef3b5e0511c4be07a4bb..942d2df319fd5bc0a657106acf037f5b4e205332 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -18,15 +18,20 @@
 // ----------------------------------------------------------------------------
 
 // 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
 
 #if !wxUSE_MENUS
 #endif
 
 #if !wxUSE_MENUS


@@ -36,16 +41,6 @@
 
 #include "copy.xpm"
 
 
 #include "copy.xpm"
 

-#ifdef __WXUNIVERSAL__
-    #include "wx/univ/theme.h"
-
-    WX_USE_THEME(win32);
-    WX_USE_THEME(gtk);
-
-    // not implemented yet
-    #define wxMessageBox
-#endif // __WXUNIVERSAL__
-

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


@@ -67,7 +62,10 @@ public:
 
     void LogMenuEvent(const wxCommandEvent& event);
 
 
     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);


@@ -90,19 +88,43 @@ public:
     void OnGetLabelMenu(wxCommandEvent& event);
     void OnSetLabelMenu(wxCommandEvent& event);
 
     void OnGetLabelMenu(wxCommandEvent& event);
     void OnSetLabelMenu(wxCommandEvent& event);
 

-    void OnRightDown(wxMouseEvent& 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:

+    void LogMenuOpenOrClose(const wxMenuEvent& event, const wxChar *what);
+    void ShowContextMenu(const wxPoint& pos);
+

     wxMenu *CreateDummyMenu(wxString *title);
 
     wxMenuItem *GetLastMenuItem() const;
 
     wxMenu *CreateDummyMenu(wxString *title);
 
     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;
 
     size_t m_countDummy;
 

+    // the control used for logging
+    wxTextCtrl *m_textctrl;
+
+    // the previous log target
+    wxLog *m_logOld;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -132,6 +154,7 @@ 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,


@@ -172,7 +195,8 @@ 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_Help_About, MyFrame::OnAbout)
 


@@ -198,7 +222,16 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
     EVT_UPDATE_UI(Menu_Menu_Check, MyFrame::OnUpdateCheckMenuItemUI)
 
 
     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)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler)


@@ -225,7 +258,7 @@ bool MyApp::OnInit()
     frame->Show(TRUE);
 
 #if wxUSE_STATUSBAR
     frame->Show(TRUE);
 
 #if wxUSE_STATUSBAR

-    frame->SetStatusText("Hello, wxWindows");
+    frame->SetStatusText("Welcome to wxWindows menu sample");

 #endif // wxUSE_STATUSBAR
 
     SetTopWindow(frame);
 #endif // wxUSE_STATUSBAR
 
     SetTopWindow(frame);


@@ -240,26 +273,26 @@ 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_countDummy = 0;
     m_menu = NULL;
     m_countDummy = 0;

+    m_logOld = NULL;

 
 #if wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR

-    CreateStatusBar(2);
+    CreateStatusBar();

 #endif // wxUSE_STATUSBAR
 
     // create the menubar
     wxMenu *fileMenu = new wxMenu;
 #endif // wxUSE_STATUSBAR
 
     // create the menubar
     wxMenu *fileMenu = new wxMenu;

-    fileMenu->Append(Menu_File_Quit, "E&xit\tAlt-X", "Quit toolbar sample");
-
-    // not supported just yet
-#ifndef __WXUNIVERSAL__
-    wxMenuItem *itemBitmap = new wxMenuItem(fileMenu, Menu_File_Quit,
-                                            "Quit with &bitmap\tAlt-Q");
-    itemBitmap->SetBitmap(wxBitmap(copy_xpm));
-    fileMenu->Append(itemBitmap);
-#endif // __WXUNIVERSAL__
+
+    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",
 
     wxMenu *menubarMenu = new wxMenu;
     menubarMenu->Append(Menu_MenuBar_Append, "&Append menu\tCtrl-A",


@@ -323,6 +356,21 @@ MyFrame::MyFrame()
 
     // intercept all menu events and log them in this custom event handler
     PushEventHandler(new MyEvtHandler(this));
 
     // 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"));

 }
 
 MyFrame::~MyFrame()
 }
 
 MyFrame::~MyFrame()


@@ -331,18 +379,21 @@ MyFrame::~MyFrame()
 
     // delete the event handler installed in ctor
     PopEventHandler(TRUE);
 
     // 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 *MyFrame::CreateDummyMenu(wxString *title)
 {
     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 )
     {
 
     if ( title )
     {

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

     }
 
     return menu;
     }
 
     return menu;


@@ -356,7 +407,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;
     }


@@ -369,18 +420,17 @@ wxMenuItem *MyFrame::GetLastMenuItem() const
 void MyFrame::LogMenuEvent(const wxCommandEvent& event)
 {
     int id = event.GetId();
 void MyFrame::LogMenuEvent(const wxCommandEvent& event)
 {
     int id = event.GetId();

-    if (!GetMenuBar()->FindItem(id))
+    if ( !GetMenuBar()->FindItem(id) )

         return;
         return;

-    wxString msg = wxString::Format("Menu command %d", id);
+
+    wxString msg = wxString::Format(wxT("Menu command %d"), id);

     if ( GetMenuBar()->FindItem(id)->IsCheckable() )
     {
     if ( GetMenuBar()->FindItem(id)->IsCheckable() )
     {

-        msg += wxString::Format(" (the item is currently %schecked)",
+        msg += wxString::Format(wxT(" (the item is currently %schecked)"),

                                 event.IsChecked() ? "" : "not ");
     }
 
                                 event.IsChecked() ? "" : "not ");
     }
 

-#if wxUSE_STATUSBAR
-    SetStatusText(msg, 1);
-#endif // wxUSE_STATUSBAR
+    wxLogMessage(msg);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -392,9 +442,14 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
     Close(TRUE);
 }
 
     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);
 }


@@ -407,7 +462,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
     {


@@ -445,15 +500,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))


@@ -461,7 +513,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());
 }
 


@@ -470,14 +524,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))


@@ -486,7 +551,7 @@ 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);
 }
 
                  "Checkable item", TRUE);
 }
 


@@ -496,7 +561,7 @@ void MyFrame::OnAppendSubMenu(wxCommandEvent& WXUNUSED(event))
 
     wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1);
 
 
     wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1);
 

-    menu->Append(Menu_Dummy_Last, "Dummy sub menu",
+    menu->Append(Menu_Dummy_Last, "&Dummy sub menu",

                  CreateDummyMenu(NULL), "Dummy sub menu help");
 }
 
                  CreateDummyMenu(NULL), "Dummy sub menu help");
 }
 


@@ -508,7 +573,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
     {


@@ -558,7 +623,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());
     }
 }


@@ -569,7 +634,18 @@ 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);
+        }

     }
 }
 
     }
 }
 


@@ -648,15 +724,15 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

-void MyFrame::OnRightDown(wxMouseEvent &event )
+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(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_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");
 


@@ -664,12 +740,36 @@ 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, event.GetX(), event.GetY() );
+    PopupMenu(&menu, pos.x, pos.y);

 
     // test for destroying items in popup menus
 
     // test for destroying items in popup menus

-#if 0
+#if 0 // doesn't work in wxGTK!

     menu.Destroy(Menu_Popup_Submenu);
 
     PopupMenu( &menu, event.GetX(), event.GetY() );
 #endif // 0
 }
     menu.Destroy(Menu_Popup_Submenu);
 
     PopupMenu( &menu, event.GetX(), event.GetY() );
 #endif // 0
 }

+
+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__
+}
+