added wxTo/FromString() overloads for wxFont (1st part of patch 1760073)

[wxWidgets.git] / src / gtk1 / mdi.cpp

diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index b95b07de757a60ce44433bdd9686ef66a8f0d02c..295aef91fb8b2e9ebb0ac67c74c0d86f5a1c20f3 100644 (file)
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -16,11 +16,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/menu.h"
+    #include "wx/dialog.h"
 #endif
 
 #include "wx/notebook.h"
-#include "wx/dialog.h"
-#include "wx/menu.h"
 #include "wx/gtk1/private.h"
 
 #include <glib.h>
@@ -45,8 +45,6 @@ extern bool g_isIdle;
 // globals
 //-----------------------------------------------------------------------------
 
-extern wxList wxPendingDelete;
-
 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------
@@ -411,7 +409,7 @@ void wxMDIChildFrame::OnMenuHighlight( wxMenuEvent& event )
 {
 #if wxUSE_STATUSBAR
     wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent();
-    if ( !ShowMenuHelp(mdi_frame->GetStatusBar(), event.GetMenuId()) )
+    if ( !ShowMenuHelp(event.GetMenuId()) )
     {
         // we don't have any help text for this item, but may be the MDI frame
         // does?