X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c6f51f6bb72864ceccba4b01ad9a01f8119741e..0d73e5a104a6c61d942c223d053a38626599b893:/src/common/event.cpp

diff --git a/src/common/event.cpp b/src/common/event.cpp
index ca75848e40..5917d2a595 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -55,6 +55,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent)
 
 const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; }
 
@@ -378,8 +379,8 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
   return FALSE;
 }
 
-void wxEvtHandler::Connect( const int id, const int lastId,
-                            const int eventType, 
+void wxEvtHandler::Connect( int id, int lastId,
+                            int eventType,
 		            wxObjectEventFunction func,
 		            wxObject *userData )
 {
@@ -432,85 +433,6 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
   return FALSE;
 };
 
-#if WXWIN_COMPATIBILITY
-void wxEvtHandler::OldOnMenuCommand(int cmd)
-{
-    if (GetNextHandler()) GetNextHandler()->OldOnMenuCommand(cmd);
-}
-
-void wxEvtHandler::OldOnMenuSelect(int cmd)
-{
-    if (GetNextHandler()) GetNextHandler()->OldOnMenuSelect(cmd);
-}
-
-void wxEvtHandler::OldOnInitMenuPopup(int pos)
-{
-    if (GetNextHandler()) GetNextHandler()->OldOnInitMenuPopup(pos);
-}
-
-void wxEvtHandler::OldOnScroll(wxCommandEvent& event)
-{
-    if (GetNextHandler()) GetNextHandler()->OldOnScroll(event);
-}
-
-void wxEvtHandler::OldOnPaint(void)
-{
-    if (GetNextHandler()) GetNextHandler()->OldOnPaint();
-}
-void wxEvtHandler::OldOnSize(int width, int height)
-{
-    if (GetNextHandler()) GetNextHandler()->OldOnSize(width, height);
-}
-
-void wxEvtHandler::OldOnMove(int x, int y)
-{
-    if (GetNextHandler()) GetNextHandler()->OldOnMove(x, y);
-}
-
-void wxEvtHandler::OldOnMouseEvent(wxMouseEvent& event)
-{
-    if (GetNextHandler()) GetNextHandler()->OldOnMouseEvent(event);
-}
-
-void wxEvtHandler::OldOnChar(wxKeyEvent& event)
-{
-    if (GetNextHandler()) GetNextHandler()->OldOnChar(event);
-}
-
-// Under Windows, we can intercept character input per dialog or frame
-bool wxEvtHandler::OldOnCharHook(wxKeyEvent& event)
-{
-    if (GetNextHandler()) return GetNextHandler()->OldOnCharHook(event);
- 	else return FALSE;
-}
-
-void wxEvtHandler::OldOnActivate(bool active)
-{
-    if (GetNextHandler()) GetNextHandler()->OldOnActivate(active);
-}
-
-void wxEvtHandler::OldOnSetFocus(void)
-{
-    if (GetNextHandler()) GetNextHandler()->OldOnSetFocus();
-}
-
-void wxEvtHandler::OldOnKillFocus(void)
-{
-    if (GetNextHandler()) GetNextHandler()->OldOnKillFocus();
-}
-
-bool wxEvtHandler::OldOnSysColourChange(void)
-{
-    if (GetNextHandler()) return GetNextHandler()->OldOnSysColourChange();
-    return FALSE;
-}
-
-void wxEvtHandler::OldOnDropFiles(int n, char *files[], int x, int y)
-{
-    if (GetNextHandler()) GetNextHandler()->OldOnDropFiles(n, files, x, y);
-}
-#endif
-
 bool wxEvtHandler::OnClose(void)
 {
     if (GetNextHandler()) return GetNextHandler()->OnClose();