Fix wrong in wxListCtrl::SetItemColumnImage() in r74716.

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

diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp
index 579f253dcdff276426e97a2c0ed951b710030d6a..7a11cd84fff89ab069a54c1e6add3f081d45a9d7 100644 (file)
--- a/samples/keyboard/keyboard.cpp
+++ b/samples/keyboard/keyboard.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by: Marcin Wojdyr
 // Created:     07.04.02
 // Author:      Vadim Zeitlin
 // Modified by: Marcin Wojdyr
 // Created:     07.04.02

-// RCS-ID:      $Id$

 // Copyright:   (c) 2002 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2002 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -225,30 +224,30 @@ MyFrame::MyFrame(const wxString& title)
 
     // connect menu event handlers
 
 
     // connect menu event handlers
 

-    Connect(QuitID, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(QuitID, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnQuit));
 
             wxCommandEventHandler(MyFrame::OnQuit));
 

-    Connect(wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(wxID_ABOUT, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnAbout));
 
             wxCommandEventHandler(MyFrame::OnAbout));
 

-    Connect(ClearID, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(ClearID, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnClear));
 
             wxCommandEventHandler(MyFrame::OnClear));
 

-    Connect(SkipHook, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(SkipHook, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnSkipHook));
             wxCommandEventHandler(MyFrame::OnSkipHook));

-    Connect(SkipDown, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(SkipDown, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnSkipDown));
 
             wxCommandEventHandler(MyFrame::OnSkipDown));
 

-    Connect(IDInputCustom, IDInputText, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(IDInputCustom, IDInputText, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnInputWindowKind));
 
             wxCommandEventHandler(MyFrame::OnInputWindowKind));
 

-    Connect(TestAccelA, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(TestAccelA, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnTestAccelA));
 
             wxCommandEventHandler(MyFrame::OnTestAccelA));
 

-    Connect(TestAccelCtrlA, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(TestAccelCtrlA, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnTestAccelCtrlA));
 
             wxCommandEventHandler(MyFrame::OnTestAccelCtrlA));
 

-    Connect(TestAccelEsc, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(TestAccelEsc, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnTestAccelEsc));
 
     // notice that we don't connect OnCharHook() to the input window, unlike
             wxCommandEventHandler(MyFrame::OnTestAccelEsc));
 
     // notice that we don't connect OnCharHook() to the input window, unlike