Unicode compilation fix

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

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index 8f7118d094f7e5e6f780639dd6c9c137ca6aaad5..5d1c12e335b3ac80559481eeb3a00c49734ba74c 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -39,7 +39,25 @@
     #error "menu sample requires wxUSE_MENUS=1"
 #endif // wxUSE_MENUS
 
     #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"
 #include "copy.xpm"

+#endif

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


@@ -64,7 +82,9 @@ public:
 
 protected:
     void OnQuit(wxCommandEvent& event);
 
 protected:
     void OnQuit(wxCommandEvent& event);

+#if USE_LOG_WINDOW

     void OnClearLog(wxCommandEvent& event);
     void OnClearLog(wxCommandEvent& event);

+#endif

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


@@ -77,9 +97,13 @@ protected:
     void OnCheckMenuItem(wxCommandEvent& event);
     void OnEnableMenuItem(wxCommandEvent& event);
     void OnGetLabelMenuItem(wxCommandEvent& event);
     void OnCheckMenuItem(wxCommandEvent& event);
     void OnEnableMenuItem(wxCommandEvent& event);
     void OnGetLabelMenuItem(wxCommandEvent& event);

+#if wxUSE_TEXTDLG

     void OnSetLabelMenuItem(wxCommandEvent& event);
     void OnSetLabelMenuItem(wxCommandEvent& event);

+#endif

     void OnGetMenuItemInfo(wxCommandEvent& event);
     void OnGetMenuItemInfo(wxCommandEvent& event);

+#if wxUSE_TEXTDLG

     void OnFindMenuItem(wxCommandEvent& event);
     void OnFindMenuItem(wxCommandEvent& event);

+#endif

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


@@ -88,24 +112,37 @@ protected:
     void OnEnableMenu(wxCommandEvent& event);
     void OnGetLabelMenu(wxCommandEvent& event);
     void OnSetLabelMenu(wxCommandEvent& event);
     void OnEnableMenu(wxCommandEvent& event);
     void OnGetLabelMenu(wxCommandEvent& event);
     void OnSetLabelMenu(wxCommandEvent& event);

+#if wxUSE_TEXTDLG

     void OnFindMenu(wxCommandEvent& event);
     void OnFindMenu(wxCommandEvent& event);

+#endif

 
     void OnTestNormal(wxCommandEvent& event);
     void OnTestCheck(wxCommandEvent& event);
     void OnTestRadio(wxCommandEvent& event);
 
 
     void OnTestNormal(wxCommandEvent& event);
     void OnTestCheck(wxCommandEvent& event);
     void OnTestRadio(wxCommandEvent& event);
 

-#if defined( __WXMSW__ ) || defined( __WXMAC__ )
-    void OnContextMenu(wxContextMenuEvent& event)
-        { ShowContextMenu(ScreenToClient(event.GetPosition())); }
+    void OnUpdateSubMenuNormal(wxUpdateUIEvent& event);
+    void OnUpdateSubMenuCheck(wxUpdateUIEvent& event);
+    void OnUpdateSubMenuRadio(wxUpdateUIEvent& event);
+
+#if USE_CONTEXT_MENU
+    void OnContextMenu(wxContextMenuEvent& event);

 #else
     void OnRightUp(wxMouseEvent& event)
         { ShowContextMenu(event.GetPosition()); }
 #endif
 
     void OnMenuOpen(wxMenuEvent& event)
 #else
     void OnRightUp(wxMouseEvent& event)
         { ShowContextMenu(event.GetPosition()); }
 #endif
 
     void OnMenuOpen(wxMenuEvent& event)

-        { LogMenuOpenOrClose(event, _T("opened")); }
+        {
+#if USE_LOG_WINDOW
+            LogMenuOpenOrClose(event, _T("opened")); event.Skip();
+#endif
+        }

     void OnMenuClose(wxMenuEvent& event)
     void OnMenuClose(wxMenuEvent& event)

-        { LogMenuOpenOrClose(event, _T("closed")); }
+        {
+#if USE_LOG_WINDOW
+          LogMenuOpenOrClose(event, _T("closed")); event.Skip();
+#endif
+       }

 
     void OnUpdateCheckMenuItemUI(wxUpdateUIEvent& event);
 
 
     void OnUpdateCheckMenuItemUI(wxUpdateUIEvent& event);
 


@@ -125,8 +162,10 @@ private:
     // the count of dummy menus already created
     size_t m_countDummy;
 
     // the count of dummy menus already created
     size_t m_countDummy;
 

+#if USE_LOG_WINDOW

     // the control used for logging
     wxTextCtrl *m_textctrl;
     // the control used for logging
     wxTextCtrl *m_textctrl;

+#endif

 
     // the previous log target
     wxLog *m_logOld;
 
     // the previous log target
     wxLog *m_logOld;


@@ -159,8 +198,10 @@ private:
 
 enum
 {
 
 enum
 {

-    Menu_File_Quit = 100,
+    Menu_File_Quit = wxID_EXIT,
+#if USE_LOG_WINDOW

     Menu_File_ClearLog,
     Menu_File_ClearLog,

+#endif

 
     Menu_MenuBar_Toggle = 200,
     Menu_MenuBar_Append,
 
     Menu_MenuBar_Toggle = 200,
     Menu_MenuBar_Append,


@@ -168,8 +209,10 @@ enum
     Menu_MenuBar_Delete,
     Menu_MenuBar_Enable,
     Menu_MenuBar_GetLabel,
     Menu_MenuBar_Delete,
     Menu_MenuBar_Enable,
     Menu_MenuBar_GetLabel,

+#if wxUSE_TEXTDLG

     Menu_MenuBar_SetLabel,
     Menu_MenuBar_FindMenu,
     Menu_MenuBar_SetLabel,
     Menu_MenuBar_FindMenu,

+#endif

 
     Menu_Menu_Append = 300,
     Menu_Menu_AppendSub,
 
     Menu_Menu_Append = 300,
     Menu_Menu_AppendSub,


@@ -178,9 +221,13 @@ enum
     Menu_Menu_Enable,
     Menu_Menu_Check,
     Menu_Menu_GetLabel,
     Menu_Menu_Enable,
     Menu_Menu_Check,
     Menu_Menu_GetLabel,

+#if wxUSE_TEXTDLG

     Menu_Menu_SetLabel,
     Menu_Menu_SetLabel,

+#endif

     Menu_Menu_GetInfo,
     Menu_Menu_GetInfo,

+#if wxUSE_TEXTDLG

     Menu_Menu_FindItem,
     Menu_Menu_FindItem,

+#endif

 
     Menu_Test_Normal = 400,
     Menu_Test_Check,
 
     Menu_Test_Normal = 400,
     Menu_Test_Check,


@@ -188,13 +235,20 @@ enum
     Menu_Test_Radio2,
     Menu_Test_Radio3,
 
     Menu_Test_Radio2,
     Menu_Test_Radio3,
 

+    Menu_SubMenu = 450,
+    Menu_SubMenu_Normal,
+    Menu_SubMenu_Check,
+    Menu_SubMenu_Radio1,
+    Menu_SubMenu_Radio2,
+    Menu_SubMenu_Radio3,
+

     Menu_Dummy_First = 500,
     Menu_Dummy_Second,
     Menu_Dummy_Third,
     Menu_Dummy_Fourth,
     Menu_Dummy_Last,
 
     Menu_Dummy_First = 500,
     Menu_Dummy_Second,
     Menu_Dummy_Third,
     Menu_Dummy_Fourth,
     Menu_Dummy_Last,
 

-    Menu_Help_About = 1000,
+    Menu_Help_About = wxID_ABOUT,

 
     Menu_Popup_ToBeDeleted = 2000,
     Menu_Popup_ToBeGreyed,
 
     Menu_Popup_ToBeDeleted = 2000,
     Menu_Popup_ToBeGreyed,


@@ -210,7 +264,9 @@ enum
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Menu_File_Quit,     MyFrame::OnQuit)
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Menu_File_Quit,     MyFrame::OnQuit)

+#if USE_LOG_WINDOW

     EVT_MENU(Menu_File_ClearLog, MyFrame::OnClearLog)
     EVT_MENU(Menu_File_ClearLog, MyFrame::OnClearLog)

+#endif

 
     EVT_MENU(Menu_Help_About, MyFrame::OnAbout)
 
 
     EVT_MENU(Menu_Help_About, MyFrame::OnAbout)
 


@@ -220,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)
     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)
     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)
 
     EVT_MENU(Menu_Menu_Append,    MyFrame::OnAppendMenuItem)
     EVT_MENU(Menu_Menu_AppendSub, MyFrame::OnAppendSubMenu)


@@ -230,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)
     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)
     EVT_MENU(Menu_Menu_SetLabel,  MyFrame::OnSetLabelMenuItem)

+#endif

     EVT_MENU(Menu_Menu_GetInfo,   MyFrame::OnGetMenuItemInfo)
     EVT_MENU(Menu_Menu_GetInfo,   MyFrame::OnGetMenuItemInfo)

+#if wxUSE_TEXTDLG

     EVT_MENU(Menu_Menu_FindItem,  MyFrame::OnFindMenuItem)
     EVT_MENU(Menu_Menu_FindItem,  MyFrame::OnFindMenuItem)

+#endif

 
     EVT_MENU(Menu_Test_Normal,    MyFrame::OnTestNormal)
     EVT_MENU(Menu_Test_Check,     MyFrame::OnTestCheck)
 
     EVT_MENU(Menu_Test_Normal,    MyFrame::OnTestNormal)
     EVT_MENU(Menu_Test_Check,     MyFrame::OnTestCheck)


@@ -240,11 +302,17 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Menu_Test_Radio2,    MyFrame::OnTestRadio)
     EVT_MENU(Menu_Test_Radio3,    MyFrame::OnTestRadio)
 
     EVT_MENU(Menu_Test_Radio2,    MyFrame::OnTestRadio)
     EVT_MENU(Menu_Test_Radio3,    MyFrame::OnTestRadio)
 

+    EVT_UPDATE_UI(Menu_SubMenu_Normal,    MyFrame::OnUpdateSubMenuNormal)
+    EVT_UPDATE_UI(Menu_SubMenu_Check,     MyFrame::OnUpdateSubMenuCheck)
+    EVT_UPDATE_UI(Menu_SubMenu_Radio1,    MyFrame::OnUpdateSubMenuRadio)
+    EVT_UPDATE_UI(Menu_SubMenu_Radio2,    MyFrame::OnUpdateSubMenuRadio)
+    EVT_UPDATE_UI(Menu_SubMenu_Radio3,    MyFrame::OnUpdateSubMenuRadio)
+

     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)
 

-#if defined( __WXMSW__ ) || defined( __WXMAC__ )
+#if USE_CONTEXT_MENU

     EVT_CONTEXT_MENU(MyFrame::OnContextMenu)
 #else
     EVT_RIGHT_UP(MyFrame::OnRightUp)
     EVT_CONTEXT_MENU(MyFrame::OnContextMenu)
 #else
     EVT_RIGHT_UP(MyFrame::OnRightUp)


@@ -257,7 +325,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler)

-    EVT_MENU(-1, MyEvtHandler::OnMenuEvent)
+    EVT_MENU(wxID_ANY, MyEvtHandler::OnMenuEvent)

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


@@ -277,15 +345,15 @@ bool MyApp::OnInit()
     // Create the main frame window
     MyFrame* frame = new MyFrame;
 
     // Create the main frame window
     MyFrame* frame = new MyFrame;
 

-    frame->Show(TRUE);
+    frame->Show(true);

 
 #if wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR

-    frame->SetStatusText(_T("Welcome to wxWindows menu sample"));
+    frame->SetStatusText(_T("Welcome to wxWidgets menu sample"));

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

-    return TRUE;
+    return true;

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


@@ -294,10 +362,11 @@ bool MyApp::OnInit()
 
 // Define my frame constructor
 MyFrame::MyFrame()
 
 // 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;
     m_textctrl = NULL;

+#endif

     m_menu = NULL;
     m_countDummy = 0;
     m_logOld = NULL;
     m_menu = NULL;
     m_countDummy = 0;
     m_logOld = NULL;


@@ -309,11 +378,15 @@ MyFrame::MyFrame()
     // create the menubar
     wxMenu *fileMenu = new wxMenu;
 
     // create the menubar
     wxMenu *fileMenu = new wxMenu;
 

+#if USE_LOG_WINDOW

     wxMenuItem *item = new wxMenuItem(fileMenu, Menu_File_ClearLog,
                                       _T("Clear &log\tCtrl-L"));
     wxMenuItem *item = new wxMenuItem(fileMenu, Menu_File_ClearLog,
                                       _T("Clear &log\tCtrl-L"));

+#if wxUSE_OWNER_DRAWN

     item->SetBitmap(copy_xpm);
     item->SetBitmap(copy_xpm);

+#endif

     fileMenu->Append(item);
     fileMenu->AppendSeparator();
     fileMenu->Append(item);
     fileMenu->AppendSeparator();

+#endif

     fileMenu->Append(Menu_File_Quit, _T("E&xit\tAlt-X"), _T("Quit menu sample"));
 
     wxMenu *menubarMenu = new wxMenu;
     fileMenu->Append(Menu_File_Quit, _T("E&xit\tAlt-X"), _T("Quit menu sample"));
 
     wxMenu *menubarMenu = new wxMenu;


@@ -324,18 +397,29 @@ MyFrame::MyFrame()
     menubarMenu->Append(Menu_MenuBar_Delete, _T("&Delete menu\tCtrl-D"),
                         _T("Delete the last menu from the menubar"));
     menubarMenu->Append(Menu_MenuBar_Toggle, _T("&Toggle menu\tCtrl-T"),
     menubarMenu->Append(Menu_MenuBar_Delete, _T("&Delete menu\tCtrl-D"),
                         _T("Delete the last menu from the menubar"));
     menubarMenu->Append(Menu_MenuBar_Toggle, _T("&Toggle menu\tCtrl-T"),

-                        _T("Toggle the first menu in the menubar"), TRUE);
+                        _T("Toggle the first menu in the menubar"), true);

     menubarMenu->AppendSeparator();
     menubarMenu->Append(Menu_MenuBar_Enable, _T("&Enable menu\tCtrl-E"),
     menubarMenu->AppendSeparator();
     menubarMenu->Append(Menu_MenuBar_Enable, _T("&Enable menu\tCtrl-E"),

-                        _T("Enable or disable the last menu"), TRUE);
+                        _T("Enable or disable the last menu"), true);

     menubarMenu->AppendSeparator();
     menubarMenu->Append(Menu_MenuBar_GetLabel, _T("&Get menu label\tCtrl-G"),
                         _T("Get the label of the last menu"));
     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"));
     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"));
+
+    menubarMenu->Append(Menu_SubMenu, _T("Submenu"), subMenu);

 
     wxMenu *menuMenu = new wxMenu;
     menuMenu->Append(Menu_Menu_Append, _T("&Append menu item\tAlt-A"),
 
     wxMenu *menuMenu = new wxMenu;
     menuMenu->Append(Menu_Menu_Append, _T("&Append menu item\tAlt-A"),


@@ -348,15 +432,21 @@ MyFrame::MyFrame()
                      _T("Delete the last menu item from the last menu"));
     menuMenu->AppendSeparator();
     menuMenu->Append(Menu_Menu_Enable, _T("&Enable menu item\tAlt-E"),
                      _T("Delete the last menu item from the last menu"));
     menuMenu->AppendSeparator();
     menuMenu->Append(Menu_Menu_Enable, _T("&Enable menu item\tAlt-E"),

-                     _T("Enable or disable the last menu item"), TRUE);
+                     _T("Enable or disable the last menu item"), true);

     menuMenu->Append(Menu_Menu_Check, _T("&Check menu item\tAlt-C"),
     menuMenu->Append(Menu_Menu_Check, _T("&Check menu item\tAlt-C"),

-                     _T("Check or uncheck the last menu item"), TRUE);
+                     _T("Check or uncheck the last menu item"), true);

     menuMenu->AppendSeparator();
     menuMenu->Append(Menu_Menu_GetInfo, _T("Get menu item in&fo\tAlt-F"),
                      _T("Show the state of the last menu item"));
     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"));
     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"));
 
     wxMenu *testMenu = new wxMenu;
     testMenu->Append(Menu_Test_Normal, _T("&Normal item"));


@@ -379,10 +469,10 @@ MyFrame::MyFrame()
     menuBar->Append(helpMenu, _T("&Help"));
 
     // these items should be initially checked
     menuBar->Append(helpMenu, _T("&Help"));
 
     // these items should be initially checked

-    menuBar->Check(Menu_MenuBar_Toggle, TRUE);
-    menuBar->Check(Menu_MenuBar_Enable, TRUE);
-    menuBar->Check(Menu_Menu_Enable, TRUE);
-    menuBar->Check(Menu_Menu_Check, FALSE);
+    menuBar->Check(Menu_MenuBar_Toggle, true);
+    menuBar->Check(Menu_MenuBar_Enable, true);
+    menuBar->Check(Menu_Menu_Enable, true);
+    menuBar->Check(Menu_Menu_Check, false);

 
     // associate the menu bar with the frame
     SetMenuBar(menuBar);
 
     // associate the menu bar with the frame
     SetMenuBar(menuBar);


@@ -390,11 +480,12 @@ 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));
 

+#if USE_LOG_WINDOW

     // create the log text 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);
                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE);

-    m_textctrl->SetEditable(FALSE);
+    m_textctrl->SetEditable(false);

 
     wxLog::SetTimestamp(NULL);
     m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_textctrl));
 
     wxLog::SetTimestamp(NULL);
     m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_textctrl));


@@ -404,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"));
                  _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()
 }
 
 MyFrame::~MyFrame()


@@ -411,10 +503,12 @@ MyFrame::~MyFrame()
     delete m_menu;
 
     // delete the event handler installed in ctor
     delete m_menu;
 
     // delete the event handler installed in ctor

-    PopEventHandler(TRUE);
+    PopEventHandler(true);

 
 

+#if USE_LOG_WINDOW

     // restore old logger
     delete wxLog::SetActiveTarget(m_logOld);
     // restore old logger
     delete wxLog::SetActiveTarget(m_logOld);

+#endif

 }
 
 wxMenu *MyFrame::CreateDummyMenu(wxString *title)
 }
 
 wxMenu *MyFrame::CreateDummyMenu(wxString *title)


@@ -422,11 +516,11 @@ wxMenu *MyFrame::CreateDummyMenu(wxString *title)
     wxMenu *menu = new wxMenu;
     menu->Append(Menu_Dummy_First, _T("&First item\tCtrl-F1"));
     menu->AppendSeparator();
     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 )
     {
 
     if ( title )
     {

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

     }
 
     return menu;
     }
 
     return menu;


@@ -437,10 +531,10 @@ wxMenuItem *MyFrame::GetLastMenuItem() const
     wxMenuBar *menubar = GetMenuBar();
     wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1);
 
     wxMenuBar *menubar = GetMenuBar();
     wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1);
 

-    wxMenuItemList::Node *node = menu->GetMenuItems().GetLast();
+    wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetLast();

     if ( !node )
     {
     if ( !node )
     {

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

 
         return NULL;
     }
 
         return NULL;
     }


@@ -453,14 +547,16 @@ 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) )
-        return;

 
 

-    wxString msg = wxString::Format(wxT("Menu command %d"), id);
-    if ( GetMenuBar()->FindItem(id)->IsCheckable() )
+    wxString msg = wxString::Format(_T("Menu command %d"), id);
+
+    // 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(wxT(" (the item is currently %schecked)"),
-                                event.IsChecked() ? "" : "not ");
+        msg += wxString::Format(_T(" (the item is currently %schecked)"),
+                                event.IsChecked() ? _T("") : _T("not "));

     }
 
     wxLogMessage(msg);
     }
 
     wxLogMessage(msg);


@@ -472,18 +568,20 @@ void MyFrame::LogMenuEvent(const wxCommandEvent& event)
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    Close(TRUE);
+    Close(true);

 }
 
 }
 

+#if USE_LOG_WINDOW

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

+#endif

 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 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);
 }
 
                        wxICON_INFORMATION);
 }
 


@@ -495,7 +593,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(wxT("Can't delete any more menus"));
+        wxLogError(_T("Can't delete any more menus"));

     }
     else
     {
     }
     else
     {


@@ -548,10 +646,11 @@ void MyFrame::OnGetLabelMenu(wxCommandEvent& WXUNUSED(event))
 
     wxCHECK_RET( count, _T("no last menu?") );
 
 
     wxCHECK_RET( count, _T("no last menu?") );
 

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

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

+#if wxUSE_TEXTDLG

 void MyFrame::OnSetLabelMenu(wxCommandEvent& WXUNUSED(event))
 {
     wxMenuBar *mbar = GetMenuBar();
 void MyFrame::OnSetLabelMenu(wxCommandEvent& WXUNUSED(event))
 {
     wxMenuBar *mbar = GetMenuBar();


@@ -584,7 +683,7 @@ void MyFrame::OnFindMenu(wxCommandEvent& WXUNUSED(event))
                      (
                         _T("Enter label to search for: "),
                         _T("Find menu"),
                      (
                         _T("Enter label to search for: "),
                         _T("Find menu"),

-                        _T(""),
+                        wxEmptyString,

                         this
                      );
 
                         this
                      );
 


@@ -594,18 +693,19 @@ void MyFrame::OnFindMenu(wxCommandEvent& WXUNUSED(event))
 
         if (index == wxNOT_FOUND)
         {
 
         if (index == wxNOT_FOUND)
         {

-            wxLogWarning(wxT("No menu with label '%s'"), label.c_str());
+            wxLogWarning(_T("No menu with label '%s'"), label.c_str());

         }
         else
         {
         }
         else
         {

-            wxLogMessage(wxT("Menu %d has label '%s'"), index, label.c_str());
+            wxLogMessage(_T("Menu %d has label '%s'"), index, label.c_str());

         }
     }
 }
         }
     }
 }

+#endif

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

-    wxLogMessage(wxT("Dummy item #%d"), event.GetId() - Menu_Dummy_First + 1);
+    wxLogMessage(_T("Dummy item #%d"), event.GetId() - Menu_Dummy_First + 1);

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


@@ -615,7 +715,7 @@ void MyFrame::OnAppendMenuItem(wxCommandEvent& WXUNUSED(event))
 
     menu->AppendSeparator();
     menu->Append(Menu_Dummy_Third, _T("&Third dummy item\tCtrl-F3"),
 
     menu->AppendSeparator();
     menu->Append(Menu_Dummy_Third, _T("&Third dummy item\tCtrl-F3"),

-                 _T("Checkable item"), TRUE);
+                 _T("Checkable item"), true);

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


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

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

     }
     else
     {
     }
     else
     {


@@ -651,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(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))
 }
 
 void MyFrame::OnEnableMenuItem(wxCommandEvent& WXUNUSED(event))


@@ -686,11 +786,12 @@ void MyFrame::OnGetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
 
     if ( item )
     {
 
     if ( item )
     {

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

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

+#if wxUSE_TEXTDLG

 void MyFrame::OnSetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
 {
     wxMenuItem *item = GetLastMenuItem();
 void MyFrame::OnSetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
 {
     wxMenuItem *item = GetLastMenuItem();


@@ -704,6 +805,7 @@ void MyFrame::OnSetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
                             item->GetLabel(),
                             this
                          );
                             item->GetLabel(),
                             this
                          );

+        label.Replace( _T("\\t"), _T("\t") );

 
         if ( !label.empty() )
         {
 
         if ( !label.empty() )
         {


@@ -711,6 +813,7 @@ void MyFrame::OnSetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
         }
     }
 }
         }
     }
 }

+#endif

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


@@ -721,7 +824,7 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
         wxString msg;
         msg << _T("The item is ") << (item->IsEnabled() ? _T("enabled")
                                                     : _T("disabled"))
         wxString msg;
         msg << _T("The item is ") << (item->IsEnabled() ? _T("enabled")
                                                     : _T("disabled"))

-            << '\n';
+            << _T('\n');

 
         if ( item->IsCheckable() )
         {
 
         if ( item->IsCheckable() )
         {


@@ -737,11 +840,11 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
 
             int flags = accel->GetFlags();
             if ( flags & wxACCEL_ALT )
 
             int flags = accel->GetFlags();
             if ( flags & wxACCEL_ALT )

-                msg << wxT("Alt-");
+                msg << _T("Alt-");

             if ( flags & wxACCEL_CTRL )
             if ( flags & wxACCEL_CTRL )

-                msg << wxT("Ctrl-");
+                msg << _T("Ctrl-");

             if ( flags & wxACCEL_SHIFT )
             if ( flags & wxACCEL_SHIFT )

-                msg << wxT("Shift-");
+                msg << _T("Shift-");

 
             int code = accel->GetKeyCode();
             switch ( code )
 
             int code = accel->GetKeyCode();
             switch ( code )


@@ -758,7 +861,7 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
                 case WXK_F10:
                 case WXK_F11:
                 case WXK_F12:
                 case WXK_F10:
                 case WXK_F11:
                 case WXK_F12:

-                    msg << wxT('F') << code - WXK_F1 + 1;
+                    msg << _T('F') << code - WXK_F1 + 1;

                     break;
 
                 // if there are any other keys wxGetAccelFromString() may return,
                     break;
 
                 // if there are any other keys wxGetAccelFromString() may return,


@@ -772,7 +875,7 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
                         break;
                     }
 
                         break;
                     }
 

-                    wxFAIL_MSG( wxT("unknown keyboard accel") );
+                    wxFAIL_MSG( _T("unknown keyboard accel") );

             }
 
             delete accel;
             }
 
             delete accel;


@@ -787,6 +890,7 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+#if wxUSE_TEXTDLG

 void MyFrame::OnFindMenuItem(wxCommandEvent& WXUNUSED(event))
 {
     wxMenuBar *mbar = GetMenuBar();
 void MyFrame::OnFindMenuItem(wxCommandEvent& WXUNUSED(event))
 {
     wxMenuBar *mbar = GetMenuBar();


@@ -798,30 +902,31 @@ void MyFrame::OnFindMenuItem(wxCommandEvent& WXUNUSED(event))
                      (
                         _T("Enter label to search for: "),
                         _T("Find menu item"),
                      (
                         _T("Enter label to search for: "),
                         _T("Find menu item"),

-                        _T(""),
+                        wxEmptyString,

                         this
                      );
 
     if ( !label.empty() )
     {
                         this
                      );
 
     if ( !label.empty() )
     {

-        size_t menuindex = 0;
+        size_t menuindex;

         int index = wxNOT_FOUND;
         int index = wxNOT_FOUND;

-        
+

         for (menuindex = 0; (menuindex < count) && (index == wxNOT_FOUND); ++menuindex)
         {
             index = mbar->FindMenuItem(mbar->GetMenu(menuindex)->GetTitle(), label);
         }
         if (index == wxNOT_FOUND)
         {
         for (menuindex = 0; (menuindex < count) && (index == wxNOT_FOUND); ++menuindex)
         {
             index = mbar->FindMenuItem(mbar->GetMenu(menuindex)->GetTitle(), label);
         }
         if (index == wxNOT_FOUND)
         {

-            wxLogWarning(wxT("No menu item with label '%s'"), label.c_str());
+            wxLogWarning(_T("No menu item with label '%s'"), label.c_str());

         }
         else
         {
         }
         else
         {

-            wxLogMessage(wxT("Menu item %d in menu %lu has label '%s'"),
+            wxLogMessage(_T("Menu item %d in menu %lu has label '%s'"),

                          index, (unsigned long)menuindex, label.c_str());
         }
     }
 }
                          index, (unsigned long)menuindex, label.c_str());
         }
     }
 }

+#endif

 
 void MyFrame::ShowContextMenu(const wxPoint& pos)
 {
 
 void MyFrame::ShowContextMenu(const wxPoint& pos)
 {


@@ -830,14 +935,15 @@ 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_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.Append(Menu_Popup_ToBeGreyed, _T("To be &greyed"));
+    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();
     menu.Append(Menu_File_Quit, _T("E&xit"));
 
     menu.Delete(Menu_Popup_ToBeDeleted);
     menu.AppendSeparator();
     menu.Append(Menu_File_Quit, _T("E&xit"));
 
     menu.Delete(Menu_Popup_ToBeDeleted);

-    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);
 
 
     PopupMenu(&menu, pos.x, pos.y);
 


@@ -849,7 +955,7 @@ void MyFrame::ShowContextMenu(const wxPoint& pos)
 #endif // 0
 }
 
 #endif // 0
 }
 

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

 {
     wxLogMessage(_T("Normal item selected"));
 }
 {
     wxLogMessage(_T("Normal item selected"));
 }


@@ -866,20 +972,66 @@ void MyFrame::OnTestRadio(wxCommandEvent& event)
                  event.GetId() - Menu_Test_Radio1 + 1);
 }
 
                  event.GetId() - Menu_Test_Radio1 + 1);
 }
 

+#if USE_LOG_WINDOW

 void MyFrame::LogMenuOpenOrClose(const wxMenuEvent& event, const wxChar *what)
 {
 void MyFrame::LogMenuOpenOrClose(const wxMenuEvent& event, const wxChar *what)
 {

-    wxLogStatus(this, _T("A %smenu has been %s."),
-                event.IsPopup() ? _T("popup ") : _T(""), what);
+    wxString msg;
+    msg << _T("A ")
+        << ( event.IsPopup() ? _T("popup ") : _T("") )
+        << _T("menu has been ")
+        << what
+        << _T(".");
+
+    wxLogStatus(this, msg.c_str());

 }
 }

+#endif

 
 

-void MyFrame::OnSize(wxSizeEvent& event)
+void MyFrame::OnUpdateSubMenuNormal(wxUpdateUIEvent& event)

 {
 {

+    event.Enable(false);
+}
+
+void MyFrame::OnUpdateSubMenuCheck(wxUpdateUIEvent& event)
+{
+    event.Enable(true);
+    event.Check(true);
+}
+
+void MyFrame::OnUpdateSubMenuRadio(wxUpdateUIEvent& event)
+{
+    int which = (event.GetId() - Menu_SubMenu_Radio1 + 1);
+    if (which == 2)
+        event.Check(true);
+    else
+        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);
     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
 
     // 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