X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f63ec3f93070e6824da775cf8d2565a025c2406..e6a5dc94a45c73a621133768b82ba9ebc8b57969:/src/stubs/frame.cpp diff --git a/src/stubs/frame.cpp b/src/stubs/frame.cpp index 1e8c9e9ae5..0a15c650af 100644 --- a/src/stubs/frame.cpp +++ b/src/stubs/frame.cpp @@ -371,21 +371,11 @@ void wxFrame::OnActivate(wxActivateEvent& event) } } -// The default implementation for the close window event - calls -// OnClose for backward compatibility. +// The default implementation for the close window event. void wxFrame::OnCloseWindow(wxCloseEvent& event) { - // Compatibility - if ( GetEventHandler()->OnClose() || event.GetForce()) - { - this->Destroy(); - } -} - -bool wxFrame::OnClose() -{ - return TRUE; + this->Destroy(); } // Destroy the window (delayed, if a managed window) @@ -461,7 +451,8 @@ void wxFrame::ProcessCommand(int id) } */ - GetEventHandler()->ProcessEvent(commandEvent); + wxEvtHandler* evtHandler = GetEventHandler(); + evtHandler->ProcessEvent(commandEvent); } // Checks if there is a toolbar, and returns the first free client position