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 b12097f5c45e9ebffe08245c3ad6ee4dd9136221..0a15c650aff7e784c60b0e3c5e6dbc4cde816f30 100644 (file)
--- a/src/stubs/frame.cpp
+++ b/src/stubs/frame.cpp
@@ -163,6 +163,13 @@ bool wxFrame::IsIconized() const
     return FALSE;
 }
 
+// Is the frame maximized?
+bool wxFrame::IsMaximized(void) const
+{
+    // TODO
+    return FALSE;
+}
+
 void wxFrame::SetTitle(const wxString& title)
 {
     // TODO
@@ -190,7 +197,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
 
     // Set the height according to the font and the border size
     wxClientDC dc(statusBar);
-    dc.SetFont(* statusBar->GetFont());
+    dc.SetFont(statusBar->GetFont());
 
     long x, y;
     dc.GetTextExtent("X", &x, &y);
@@ -264,7 +271,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menuBar)
 void wxFrame::Fit()
 {
   // Work out max. size
-  wxNode *node = GetChildren()->First();
+  wxNode *node = GetChildren().First();
   int max_width = 0;
   int max_height = 0;
   while (node)
@@ -321,7 +328,7 @@ void wxFrame::OnSize(wxSizeEvent& event)
 
   // do we have _exactly_ one child?
   wxWindow *child = NULL;
-  for ( wxNode *node = GetChildren()->First(); node; node = node->Next() )
+  for ( wxNode *node = GetChildren().First(); node; node = node->Next() )
   {
     wxWindow *win = (wxWindow *)node->Data();
     if ( !win->IsKindOf(CLASSINFO(wxFrame))  &&
@@ -351,7 +358,7 @@ void wxFrame::OnSize(wxSizeEvent& event)
 // subwindow found.
 void wxFrame::OnActivate(wxActivateEvent& event)
 {
-  for(wxNode *node = GetChildren()->First(); node; node = node->Next())
+  for(wxNode *node = GetChildren().First(); node; node = node->Next())
   {
     // Find a child that's a subwindow, but not a dialog box.
     wxWindow *child = (wxWindow *)node->Data();
@@ -364,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)
@@ -454,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