Found bug that skrewed up display wrt horizontal

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

diff --git a/src/stubs/frame.cpp b/src/stubs/frame.cpp
index 1e8c9e9ae5fbca33a987c67e08ca267a942d9ea0..aeb2a7800755437db1b5c4d485fd02a96f9c0342 100644 (file)
--- a/src/stubs/frame.cpp
+++ b/src/stubs/frame.cpp
@@ -26,7 +26,6 @@
 extern wxList wxModelessWindows;
 extern wxList wxPendingDelete;
 
 extern wxList wxModelessWindows;
 extern wxList wxPendingDelete;
 

-#if !USE_SHARED_LIBRARY

 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
   EVT_SIZE(wxFrame::OnSize)
   EVT_ACTIVATE(wxFrame::OnActivate)
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
   EVT_SIZE(wxFrame::OnSize)
   EVT_ACTIVATE(wxFrame::OnActivate)


@@ -37,7 +36,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxWindow)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)

-#endif

 
 #if wxUSE_NATIVE_STATUSBAR
 bool wxFrame::m_useNativeStatusBar = TRUE;
 
 #if wxUSE_NATIVE_STATUSBAR
 bool wxFrame::m_useNativeStatusBar = TRUE;


@@ -371,21 +369,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)
 {
 
 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)
 }
 
 // Destroy the window (delayed, if a managed window)


@@ -461,7 +449,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
 }
 
 // Checks if there is a toolbar, and returns the first free client position