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 0c9c7b2657b17f4d74338b6f101879544e684760..7ca53327c4a910519f00d6a614b5644b7b98121d 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -107,9 +107,9 @@ protected:
 #endif
 
     void OnMenuOpen(wxMenuEvent& event)
-        { LogMenuOpenOrClose(event, _T("opened")); }
+        { LogMenuOpenOrClose(event, _T("opened")); event.Skip(); }
     void OnMenuClose(wxMenuEvent& event)
-        { LogMenuOpenOrClose(event, _T("closed")); }
+        { LogMenuOpenOrClose(event, _T("closed")); event.Skip(); }
 
     void OnUpdateCheckMenuItemUI(wxUpdateUIEvent& event);
 
@@ -463,7 +463,7 @@ wxMenuItem *MyFrame::GetLastMenuItem() const
     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!"));
@@ -876,7 +876,7 @@ void MyFrame::ShowContextMenu(const wxPoint& pos)
 #endif // 0
 }
 
-void MyFrame::OnTestNormal(wxCommandEvent& event)
+void MyFrame::OnTestNormal(wxCommandEvent& WXUNUSED(event))
 {
     wxLogMessage(_T("Normal item selected"));
 }
@@ -919,7 +919,7 @@ void MyFrame::OnUpdateSubMenuRadio(wxUpdateUIEvent& event)
         event.Check(FALSE);
 }
 
-void MyFrame::OnSize(wxSizeEvent& event)
+void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
 {
     if ( !m_textctrl )
         return;