Applied patch [ 853031 ] Japanese po file

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

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index ef1ee21bf529cbb99c4c50dfa8484a0d982a875b..7ca53327c4a910519f00d6a614b5644b7b98121d 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -79,6 +79,7 @@ protected:
     void OnGetLabelMenuItem(wxCommandEvent& event);
     void OnSetLabelMenuItem(wxCommandEvent& event);
     void OnGetMenuItemInfo(wxCommandEvent& event);
     void OnGetLabelMenuItem(wxCommandEvent& event);
     void OnSetLabelMenuItem(wxCommandEvent& event);
     void OnGetMenuItemInfo(wxCommandEvent& event);

+    void OnFindMenuItem(wxCommandEvent& event);

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


@@ -87,12 +88,17 @@ 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);

+    void OnFindMenu(wxCommandEvent& event);

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

-#ifdef __WXMSW__
+    void OnUpdateSubMenuNormal(wxUpdateUIEvent& event);
+    void OnUpdateSubMenuCheck(wxUpdateUIEvent& event);
+    void OnUpdateSubMenuRadio(wxUpdateUIEvent& event);
+
+#if defined( __WXMSW__ ) || defined( __WXMAC__ )

     void OnContextMenu(wxContextMenuEvent& event)
         { ShowContextMenu(ScreenToClient(event.GetPosition())); }
 #else
     void OnContextMenu(wxContextMenuEvent& event)
         { ShowContextMenu(ScreenToClient(event.GetPosition())); }
 #else


@@ -101,9 +107,9 @@ protected:
 #endif
 
     void OnMenuOpen(wxMenuEvent& event)
 #endif
 
     void OnMenuOpen(wxMenuEvent& event)

-        { LogMenuOpenOrClose(event, _T("opened")); }
+        { LogMenuOpenOrClose(event, _T("opened")); event.Skip(); }

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

-        { LogMenuOpenOrClose(event, _T("closed")); }
+        { LogMenuOpenOrClose(event, _T("closed")); event.Skip(); }

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


@@ -167,6 +173,7 @@ enum
     Menu_MenuBar_Enable,
     Menu_MenuBar_GetLabel,
     Menu_MenuBar_SetLabel,
     Menu_MenuBar_Enable,
     Menu_MenuBar_GetLabel,
     Menu_MenuBar_SetLabel,

+    Menu_MenuBar_FindMenu,

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


@@ -177,6 +184,7 @@ enum
     Menu_Menu_GetLabel,
     Menu_Menu_SetLabel,
     Menu_Menu_GetInfo,
     Menu_Menu_GetLabel,
     Menu_Menu_SetLabel,
     Menu_Menu_GetInfo,

+    Menu_Menu_FindItem,

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


@@ -184,6 +192,13 @@ 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_First = 500,
     Menu_Dummy_Second,
     Menu_Dummy_Third,


@@ -217,6 +232,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Menu_MenuBar_Enable,   MyFrame::OnEnableMenu)
     EVT_MENU(Menu_MenuBar_GetLabel, MyFrame::OnGetLabelMenu)
     EVT_MENU(Menu_MenuBar_SetLabel, MyFrame::OnSetLabelMenu)
     EVT_MENU(Menu_MenuBar_Enable,   MyFrame::OnEnableMenu)
     EVT_MENU(Menu_MenuBar_GetLabel, MyFrame::OnGetLabelMenu)
     EVT_MENU(Menu_MenuBar_SetLabel, MyFrame::OnSetLabelMenu)

+    EVT_MENU(Menu_MenuBar_FindMenu, MyFrame::OnFindMenu)

 
     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)


@@ -227,6 +243,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Menu_Menu_GetLabel,  MyFrame::OnGetLabelMenuItem)
     EVT_MENU(Menu_Menu_SetLabel,  MyFrame::OnSetLabelMenuItem)
     EVT_MENU(Menu_Menu_GetInfo,   MyFrame::OnGetMenuItemInfo)
     EVT_MENU(Menu_Menu_GetLabel,  MyFrame::OnGetLabelMenuItem)
     EVT_MENU(Menu_Menu_SetLabel,  MyFrame::OnSetLabelMenuItem)
     EVT_MENU(Menu_Menu_GetInfo,   MyFrame::OnGetMenuItemInfo)

+    EVT_MENU(Menu_Menu_FindItem,  MyFrame::OnFindMenuItem)

 
     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)


@@ -234,11 +251,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)
 

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

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


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

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

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


@@ -288,7 +311,7 @@ bool MyApp::OnInit()
 
 // Define my frame constructor
 MyFrame::MyFrame()
 
 // Define my frame constructor
 MyFrame::MyFrame()

-       : wxFrame((wxFrame *)NULL, -1, "wxWindows menu sample",
+       : wxFrame((wxFrame *)NULL, -1, _T("wxWindows menu sample"),

                  wxDefaultPosition, wxSize(400, 250))
 {
     m_textctrl = NULL;
                  wxDefaultPosition, wxSize(400, 250))
 {
     m_textctrl = NULL;


@@ -304,72 +327,82 @@ MyFrame::MyFrame()
     wxMenu *fileMenu = new wxMenu;
 
     wxMenuItem *item = new wxMenuItem(fileMenu, Menu_File_ClearLog,
     wxMenu *fileMenu = new wxMenu;
 
     wxMenuItem *item = new wxMenuItem(fileMenu, Menu_File_ClearLog,

-                                      "Clear &log\tCtrl-L");
+                                      _T("Clear &log\tCtrl-L"));

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

-    fileMenu->Append(Menu_File_Quit, "E&xit\tAlt-X", "Quit menu sample");
+    fileMenu->Append(Menu_File_Quit, _T("E&xit\tAlt-X"), _T("Quit menu sample"));

 
     wxMenu *menubarMenu = new wxMenu;
 
     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",
-                        "Toggle the first menu in the menubar", TRUE);
+    menubarMenu->Append(Menu_MenuBar_Append, _T("&Append menu\tCtrl-A"),
+                        _T("Append a menu to the menubar"));
+    menubarMenu->Append(Menu_MenuBar_Insert, _T("&Insert menu\tCtrl-I"),
+                        _T("Insert a menu into the menubar"));
+    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);
+    menubarMenu->AppendSeparator();
+    menubarMenu->Append(Menu_MenuBar_Enable, _T("&Enable menu\tCtrl-E"),
+                        _T("Enable or disable the last menu"), TRUE);

     menubarMenu->AppendSeparator();
     menubarMenu->AppendSeparator();

-    menubarMenu->Append(Menu_MenuBar_Enable, "&Enable menu\tCtrl-E",
-                        "Enable or disable the last menu", TRUE);
+    menubarMenu->Append(Menu_MenuBar_GetLabel, _T("&Get menu label\tCtrl-G"),
+                        _T("Get the label of the last menu"));
+    menubarMenu->Append(Menu_MenuBar_SetLabel, _T("&Set menu label\tCtrl-S"),
+                        _T("Change the label of the last menu"));

     menubarMenu->AppendSeparator();
     menubarMenu->AppendSeparator();

-    menubarMenu->Append(Menu_MenuBar_GetLabel, "&Get menu label\tCtrl-G",
-                        "Get the label of the last menu");
-    menubarMenu->Append(Menu_MenuBar_SetLabel, "&Set menu label\tCtrl-S",
-                        "Change the label of the last menu");
+    menubarMenu->Append(Menu_MenuBar_FindMenu, _T("&Find menu from label\tCtrl-F"),
+                        _T("Find a menu by searching for its label"));
+
+    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;
 
     wxMenu *menuMenu = new wxMenu;

-    menuMenu->Append(Menu_Menu_Append, "&Append menu item\tAlt-A",
-                     "Append a menu item to the last menu");
-    menuMenu->Append(Menu_Menu_AppendSub, "&Append sub menu\tAlt-S",
-                     "Append a sub menu to the last menu");
-    menuMenu->Append(Menu_Menu_Insert, "&Insert menu item\tAlt-I",
-                     "Insert a menu item in head of the last menu");
-    menuMenu->Append(Menu_Menu_Delete, "&Delete menu item\tAlt-D",
-                     "Delete the last menu item from the last menu");
+    menuMenu->Append(Menu_Menu_Append, _T("&Append menu item\tAlt-A"),
+                     _T("Append a menu item to the last menu"));
+    menuMenu->Append(Menu_Menu_AppendSub, _T("&Append sub menu\tAlt-S"),
+                     _T("Append a sub menu to the last menu"));
+    menuMenu->Append(Menu_Menu_Insert, _T("&Insert menu item\tAlt-I"),
+                     _T("Insert a menu item in head of the last menu"));
+    menuMenu->Append(Menu_Menu_Delete, _T("&Delete menu item\tAlt-D"),
+                     _T("Delete the last menu item from the last menu"));

     menuMenu->AppendSeparator();
     menuMenu->AppendSeparator();

-    menuMenu->Append(Menu_Menu_Enable, "&Enable menu item\tAlt-E",
-                     "Enable or disable the last menu item", TRUE);
-    menuMenu->Append(Menu_Menu_Check, "&Check menu item\tAlt-C",
-                     "Check or uncheck the last menu item", TRUE);
+    menuMenu->Append(Menu_Menu_Enable, _T("&Enable menu item\tAlt-E"),
+                     _T("Enable or disable the last menu item"), TRUE);
+    menuMenu->Append(Menu_Menu_Check, _T("&Check menu item\tAlt-C"),
+                     _T("Check or uncheck the last menu item"), TRUE);

     menuMenu->AppendSeparator();
     menuMenu->AppendSeparator();

-    menuMenu->Append(Menu_Menu_GetLabel, "&Get menu item label\tAlt-G",
-                     "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->Append(Menu_Menu_GetInfo, _T("Get menu item in&fo\tAlt-F"),
+                     _T("Show the state of the last menu item"));

     menuMenu->AppendSeparator();
     menuMenu->AppendSeparator();

-    menuMenu->Append(Menu_Menu_GetInfo, "Get menu item in&fo\tAlt-F",
-                     "Show the state of the last menu item");
+    menuMenu->Append(Menu_Menu_FindItem, _T("Find menu item from label"),
+                     _T("Find a menu item by searching for its label"));

 
     wxMenu *testMenu = new wxMenu;
 
     wxMenu *testMenu = new wxMenu;

-    testMenu->Append(Menu_Test_Normal, "&Normal item");
+    testMenu->Append(Menu_Test_Normal, _T("&Normal item"));

     testMenu->AppendSeparator();
     testMenu->AppendSeparator();

-    testMenu->AppendCheckItem(Menu_Test_Check, "&Check item");
+    testMenu->AppendCheckItem(Menu_Test_Check, _T("&Check item"));

     testMenu->AppendSeparator();
     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");
+    testMenu->AppendRadioItem(Menu_Test_Radio1, _T("Radio item &1"));
+    testMenu->AppendRadioItem(Menu_Test_Radio2, _T("Radio item &2"));
+    testMenu->AppendRadioItem(Menu_Test_Radio3, _T("Radio item &3"));

 
     wxMenu *helpMenu = new wxMenu;
 
     wxMenu *helpMenu = new wxMenu;

-    helpMenu->Append(Menu_Help_About, "&About\tF1", "About menu sample");
+    helpMenu->Append(Menu_Help_About, _T("&About\tF1"), _T("About menu sample"));

 
     wxMenuBar* menuBar = new wxMenuBar( wxMB_DOCKABLE );
 
 
     wxMenuBar* menuBar = new wxMenuBar( wxMB_DOCKABLE );
 

-    menuBar->Append(fileMenu, "&File");
-    menuBar->Append(menubarMenu, "Menu&bar");
-    menuBar->Append(menuMenu, "&Menu");
-    menuBar->Append(testMenu, "&Test");
-    menuBar->Append(helpMenu, "&Help");
+    menuBar->Append(fileMenu, _T("&File"));
+    menuBar->Append(menubarMenu, _T("Menu&bar"));
+    menuBar->Append(menuMenu, _T("&Menu"));
+    menuBar->Append(testMenu, _T("&Test"));
+    menuBar->Append(helpMenu, _T("&Help"));

 
     // these items should be initially checked
     menuBar->Check(Menu_MenuBar_Toggle, TRUE);
 
     // these items should be initially checked
     menuBar->Check(Menu_MenuBar_Toggle, TRUE);


@@ -413,9 +446,9 @@ MyFrame::~MyFrame()
 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, _T("&First item\tCtrl-F1"));

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

-    menu->Append(Menu_Dummy_Second, "&Second item\tCtrl-F2", "", TRUE);
+    menu->Append(Menu_Dummy_Second, _T("&Second item\tCtrl-F2"), _T(""), TRUE);

 
     if ( title )
     {
 
     if ( title )
     {


@@ -430,7 +463,7 @@ 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 )
     {
         wxLogWarning(wxT("No last item in the last menu!"));
     if ( !node )
     {
         wxLogWarning(wxT("No last item in the last menu!"));


@@ -475,8 +508,8 @@ void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

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

                        wxICON_INFORMATION);
 }
 
                        wxICON_INFORMATION);
 }
 


@@ -521,7 +554,7 @@ void MyFrame::OnToggleMenu(wxCommandEvent& WXUNUSED(event))
     else
     {
         // restore it
     else
     {
         // restore it

-        mbar->Insert(0, m_menu, "&File");
+        mbar->Insert(0, m_menu, _T("&File"));

         m_menu = NULL;
     }
 }
         m_menu = NULL;
     }
 }


@@ -566,6 +599,36 @@ void MyFrame::OnSetLabelMenu(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+void MyFrame::OnFindMenu(wxCommandEvent& WXUNUSED(event))
+{
+    wxMenuBar *mbar = GetMenuBar();
+    size_t count = mbar->GetMenuCount();
+
+    wxCHECK_RET( count, _T("no last menu?") );
+
+    wxString label = wxGetTextFromUser
+                     (
+                        _T("Enter label to search for: "),
+                        _T("Find menu"),
+                        _T(""),
+                        this
+                     );
+
+    if ( !label.empty() )
+    {
+        int index = mbar->FindMenu(label);
+
+        if (index == wxNOT_FOUND)
+        {
+            wxLogWarning(wxT("No menu with label '%s'"), label.c_str());
+        }
+        else
+        {
+            wxLogMessage(wxT("Menu %d has label '%s'"), index, label.c_str());
+        }
+    }
+}
+

 void MyFrame::OnDummy(wxCommandEvent& event)
 {
     wxLogMessage(wxT("Dummy item #%d"), event.GetId() - Menu_Dummy_First + 1);
 void MyFrame::OnDummy(wxCommandEvent& event)
 {
     wxLogMessage(wxT("Dummy item #%d"), event.GetId() - Menu_Dummy_First + 1);


@@ -577,18 +640,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",
-                 "Checkable item", TRUE);
+    menu->Append(Menu_Dummy_Third, _T("&Third dummy item\tCtrl-F3"),
+                 _T("Checkable item"), TRUE);

 }
 
 void MyFrame::OnAppendSubMenu(wxCommandEvent& WXUNUSED(event))
 {
     wxMenuBar *menubar = GetMenuBar();
 
 }
 
 void MyFrame::OnAppendSubMenu(wxCommandEvent& WXUNUSED(event))
 {
     wxMenuBar *menubar = GetMenuBar();
 

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

 
 

-    menu->Append(Menu_Dummy_Last, "&Dummy sub menu",
-                 CreateDummyMenu(NULL), "Dummy sub menu help");
+    menu->Append(Menu_Dummy_Last, _T("&Dummy sub menu"),
+                 CreateDummyMenu(NULL), _T("Dummy sub menu help"));

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


@@ -613,8 +676,8 @@ void MyFrame::OnInsertMenuItem(wxCommandEvent& WXUNUSED(event))
     wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1);
 
     menu->Insert(0, wxMenuItem::New(menu, Menu_Dummy_Fourth,
     wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1);
 
     menu->Insert(0, wxMenuItem::New(menu, Menu_Dummy_Fourth,

-                                    "Fourth dummy item\tCtrl-F4"));
-    menu->Insert(1, wxMenuItem::New(menu, wxID_SEPARATOR, ""));
+                                    _T("Fourth dummy item\tCtrl-F4")));
+    menu->Insert(1, wxMenuItem::New(menu, wxID_SEPARATOR, _T("")));

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


@@ -682,21 +745,21 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
     if ( item )
     {
         wxString msg;
     if ( item )
     {
         wxString msg;

-        msg << "The item is " << (item->IsEnabled() ? "enabled"
-                                                    : "disabled")
+        msg << _T("The item is ") << (item->IsEnabled() ? _T("enabled")
+                                                    : _T("disabled"))

             << '\n';
 
         if ( item->IsCheckable() )
         {
             << '\n';
 
         if ( item->IsCheckable() )
         {

-            msg << "It is checkable and " << (item->IsChecked() ? "" : "un")
-                << "checked\n";
+            msg << _T("It is checkable and ") << (item->IsChecked() ? _T("") : _T("un"))
+                << _T("checked\n");

         }
 
 #if wxUSE_ACCEL
         wxAcceleratorEntry *accel = item->GetAccel();
         if ( accel )
         {
         }
 
 #if wxUSE_ACCEL
         wxAcceleratorEntry *accel = item->GetAccel();
         if ( accel )
         {

-            msg << "Its accelerator is ";
+            msg << _T("Its accelerator is ");

 
             int flags = accel->GetFlags();
             if ( flags & wxACCEL_ALT )
 
             int flags = accel->GetFlags();
             if ( flags & wxACCEL_ALT )


@@ -742,7 +805,7 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
         }
         else
         {
         }
         else
         {

-            msg << "It doesn't have an accelerator";
+            msg << _T("It doesn't have an accelerator");

         }
 #endif // wxUSE_ACCEL
 
         }
 #endif // wxUSE_ACCEL
 


@@ -750,17 +813,54 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+void MyFrame::OnFindMenuItem(wxCommandEvent& WXUNUSED(event))
+{
+    wxMenuBar *mbar = GetMenuBar();
+    size_t count = mbar->GetMenuCount();
+
+    wxCHECK_RET( count, _T("no last menu?") );
+
+    wxString label = wxGetTextFromUser
+                     (
+                        _T("Enter label to search for: "),
+                        _T("Find menu item"),
+                        _T(""),
+                        this
+                     );
+
+    if ( !label.empty() )
+    {
+        size_t menuindex = 0;
+        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)
+        {
+            wxLogWarning(wxT("No menu item with label '%s'"), label.c_str());
+        }
+        else
+        {
+            wxLogMessage(wxT("Menu item %d in menu %lu has label '%s'"),
+                         index, (unsigned long)menuindex, label.c_str());
+        }
+    }
+}
+

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

-    wxMenu menu("Test popup");
+    wxMenu menu(_T("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_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"),
+                _T("This menu item should be initially greyed out"));

     menu.AppendSeparator();
     menu.AppendSeparator();

-    menu.Append(Menu_File_Quit, "E&xit");
+    menu.Append(Menu_File_Quit, _T("E&xit"));

 
     menu.Delete(Menu_Popup_ToBeDeleted);
     menu.Check(Menu_Popup_ToBeChecked, TRUE);
 
     menu.Delete(Menu_Popup_ToBeDeleted);
     menu.Check(Menu_Popup_ToBeChecked, TRUE);


@@ -776,7 +876,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"));
 }


@@ -799,7 +899,27 @@ void MyFrame::LogMenuOpenOrClose(const wxMenuEvent& event, const wxChar *what)
                 event.IsPopup() ? _T("popup ") : _T(""), what);
 }
 
                 event.IsPopup() ? _T("popup ") : _T(""), what);
 }
 

-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);
+}
+
+void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))

 {
     if ( !m_textctrl )
         return;
 {
     if ( !m_textctrl )
         return;