X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b84947323739900eb1174f507679878ea3e35fe4..cb41a69b152026d6c586d21148e34913291cd733:/src/univ/winuniv.cpp diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp index 9ec63e0861..87300a6984 100644 --- a/src/univ/winuniv.cpp +++ b/src/univ/winuniv.cpp @@ -4,7 +4,6 @@ // Author: Vadim Zeitlin // Modified by: // Created: 06.08.00 -// RCS-ID: $Id$ // Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -94,8 +93,6 @@ public: IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowGTK) #elif defined(__WXOSX_OR_COCOA__) IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMac) -#elif defined(__WXMGL__) - IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMGL) #elif defined(__WXDFB__) IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowDFB) #elif defined(__WXX11__) @@ -1324,7 +1321,7 @@ void wxWindow::OnKeyDown(wxKeyEvent& event) int command = win->GetAcceleratorTable()->GetCommand(event); if ( command != -1 ) { - wxCommandEvent eventCmd(wxEVT_COMMAND_MENU_SELECTED, command); + wxCommandEvent eventCmd(wxEVT_MENU, command); if ( win->GetEventHandler()->ProcessEvent(eventCmd) ) { // skip "event.Skip()" below @@ -1355,7 +1352,7 @@ void wxWindow::OnKeyDown(wxKeyEvent& event) wxWindow* child = win->FindWindow(command); if ( child && wxDynamicCast(child, wxButton) ) { - wxCommandEvent eventCmd(wxEVT_COMMAND_BUTTON_CLICKED, command); + wxCommandEvent eventCmd(wxEVT_BUTTON, command); eventCmd.SetEventObject(child); if ( child->GetEventHandler()->ProcessEvent(eventCmd) ) { @@ -1430,7 +1427,7 @@ void wxWindow::OnChar(wxKeyEvent& event) wxButton *btn = wxDynamicCast(tlw->GetDefaultItem(), wxButton); if ( btn ) { - wxCommandEvent evt(wxEVT_COMMAND_BUTTON_CLICKED, btn->GetId()); + wxCommandEvent evt(wxEVT_BUTTON, btn->GetId()); evt.SetEventObject(btn); btn->Command(evt); return;