Build fix for VC, fixed reading after end of wxChar*, source cleaning.

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

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index 378fa444723c91885f8897b8309eca29358d2410..3a87b4dc188189ff42d717f4afd5deaf940a6e94 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -41,11 +41,23 @@
 
 // not all ports have support for EVT_CONTEXT_MENU yet, don't define
 // USE_CONTEXT_MENU for those which don't
 
 // 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__)
-    #define USE_CONTEXT_MENU
+#if defined(__WXMOTIF__) || defined(__WXPM__)
+    #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
 
 #endif
 

+#if wxUSE_OWNER_DRAWN

 #include "copy.xpm"
 #include "copy.xpm"

+#endif

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


@@ -70,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);
 


@@ -83,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);


@@ -94,7 +112,9 @@ 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 OnTestNormal(wxCommandEvent& event);
     void OnTestCheck(wxCommandEvent& event);


@@ -105,17 +125,24 @@ protected:
     void OnUpdateSubMenuRadio(wxUpdateUIEvent& event);
 
 #if USE_CONTEXT_MENU
     void OnUpdateSubMenuRadio(wxUpdateUIEvent& event);
 
 #if USE_CONTEXT_MENU

-    void OnContextMenu(wxContextMenuEvent& event)
-        { ShowContextMenu(ScreenToClient(event.GetPosition())); }
+    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")); event.Skip(); }
+        {
+#if USE_LOG_WINDOW
+            LogMenuOpenOrClose(event, _T("opened")); event.Skip();
+#endif
+        }

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

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

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


@@ -135,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;


@@ -169,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,


@@ -178,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,


@@ -188,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,


@@ -211,7 +248,7 @@ enum
     Menu_Dummy_Fourth,
     Menu_Dummy_Last,
 
     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,


@@ -227,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)
 


@@ -237,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)


@@ -247,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)


@@ -280,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()
 
 // ============================================================================


@@ -303,7 +348,7 @@ bool MyApp::OnInit()
     frame->Show(true);
 
 #if wxUSE_STATUSBAR
     frame->Show(true);
 
 #if wxUSE_STATUSBAR

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

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


@@ -317,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;


@@ -332,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;


@@ -354,18 +404,20 @@ MyFrame::MyFrame()
     menubarMenu->AppendSeparator();
     menubarMenu->Append(Menu_MenuBar_GetLabel, _T("&Get menu label\tCtrl-G"),
                         _T("Get the label of the last menu"));
     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"));
 
     wxMenu* subMenu = new wxMenu;
     subMenu->Append(Menu_SubMenu_Normal, _T("&Normal submenu item"), _T("Disabled submenu item"));
     subMenu->AppendCheckItem(Menu_SubMenu_Check, _T("&Unchecked submenu item"), _T("Unchecked submenu item"));

-    subMenu->AppendRadioItem(Menu_SubMenu_Radio1, _T("&Radio item 1"), _T("Radio item"));
-    subMenu->AppendRadioItem(Menu_SubMenu_Radio2, _T("&Radio item 2"), _T("Radio item"));
-    subMenu->AppendRadioItem(Menu_SubMenu_Radio3, _T("&Radio item 3"), _T("Radio item"));
+    subMenu->AppendRadioItem(Menu_SubMenu_Radio1, _T("Radio item &1"), _T("Radio item"));
+    subMenu->AppendRadioItem(Menu_SubMenu_Radio2, _T("Radio item &2"), _T("Radio item"));
+    subMenu->AppendRadioItem(Menu_SubMenu_Radio3, _T("Radio item &3"), _T("Radio item"));

 
     menubarMenu->Append(Menu_SubMenu, _T("Submenu"), subMenu);
 
 
     menubarMenu->Append(Menu_SubMenu, _T("Submenu"), subMenu);
 


@@ -386,9 +438,13 @@ MyFrame::MyFrame()
     menuMenu->AppendSeparator();
     menuMenu->Append(Menu_Menu_GetInfo, _T("Get menu item in&fo\tAlt-F"),
                      _T("Show the state of the last menu item"));
     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->Append(Menu_Menu_SetLabel, _T("Set menu item label\tAlt-L"),
+                     _T("Set the label of a menu item"));
+#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"));


@@ -422,8 +478,9 @@ 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, _T(""),

                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE);
     m_textctrl->SetEditable(false);
                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE);
     m_textctrl->SetEditable(false);


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


@@ -445,8 +503,10 @@ MyFrame::~MyFrame()
     // delete the event handler installed in ctor
     PopEventHandler(true);
 
     // delete the event handler installed in ctor
     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)


@@ -454,7 +514,7 @@ 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 )
     {


@@ -507,15 +567,17 @@ 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);
 }
 


@@ -584,6 +646,7 @@ void MyFrame::OnGetLabelMenu(wxCommandEvent& WXUNUSED(event))
                  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();


@@ -634,6 +697,7 @@ void MyFrame::OnFindMenu(wxCommandEvent& WXUNUSED(event))
         }
     }
 }
         }
     }
 }

+#endif

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


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

+#if wxUSE_TEXTDLG

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


@@ -736,6 +801,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() )
         {


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

+#endif

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


@@ -819,6 +886,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();


@@ -854,6 +922,7 @@ void MyFrame::OnFindMenuItem(wxCommandEvent& WXUNUSED(event))
         }
     }
 }
         }
     }
 }

+#endif

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


@@ -862,7 +931,7 @@ void MyFrame::ShowContextMenu(const wxPoint& pos)
     menu.Append(Menu_Help_About, _T("&About"));
     menu.Append(Menu_Popup_Submenu, _T("&Submenu"), CreateDummyMenu(NULL));
     menu.Append(Menu_Popup_ToBeDeleted, _T("To be &deleted"));
     menu.Append(Menu_Help_About, _T("&About"));
     menu.Append(Menu_Popup_Submenu, _T("&Submenu"), CreateDummyMenu(NULL));
     menu.Append(Menu_Popup_ToBeDeleted, _T("To be &deleted"));

-    menu.Append(Menu_Popup_ToBeChecked, _T("To be &checked"), _T(""), true);
+    menu.AppendCheckItem(Menu_Popup_ToBeChecked, _T("To be &checked"));

     menu.Append(Menu_Popup_ToBeGreyed, _T("To be &greyed"),
                 _T("This menu item should be initially greyed out"));
     menu.AppendSeparator();
     menu.Append(Menu_Popup_ToBeGreyed, _T("To be &greyed"),
                 _T("This menu item should be initially greyed out"));
     menu.AppendSeparator();


@@ -899,6 +968,7 @@ 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)
 {
     wxString msg;
 void MyFrame::LogMenuOpenOrClose(const wxMenuEvent& event, const wxChar *what)
 {
     wxString msg;


@@ -910,6 +980,7 @@ void MyFrame::LogMenuOpenOrClose(const wxMenuEvent& event, const wxChar *what)
 
     wxLogStatus(this, msg.c_str());
 }
 
     wxLogStatus(this, msg.c_str());
 }

+#endif

 
 void MyFrame::OnUpdateSubMenuNormal(wxUpdateUIEvent& event)
 {
 
 void MyFrame::OnUpdateSubMenuNormal(wxUpdateUIEvent& event)
 {


@@ -931,14 +1002,32 @@ void MyFrame::OnUpdateSubMenuRadio(wxUpdateUIEvent& event)
         event.Check(false);
 }
 
         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))
 {
 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