1. compilation fix for wxHelpHtmlController (which shouldn't be compiled #if

[wxWidgets.git] / src / stubs / frame.cpp

diff --git a/src/stubs/frame.cpp b/src/stubs/frame.cpp
index a961e3616f8e4a180f5f3a5546586744fb8c0c11..0a15c650aff7e784c60b0e3c5e6dbc4cde816f30 100644 (file)
--- a/src/stubs/frame.cpp
+++ b/src/stubs/frame.cpp
@@ -371,23 +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.CanVeto())
-    {
-        this->Destroy();
-    }
-    else
-        event.Veto(TRUE);
-}
-
-bool wxFrame::OnClose()
-{
-    return TRUE;
+    this->Destroy();
 }
 
 // Destroy the window (delayed, if a managed window)
@@ -463,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