Don't reset the best size to wxDefaultSize unless we have a bitmap, otherwise

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

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index c06efa1a51a8b3f7723a9abed3d624301d3f000a..031eae9e191359f4cb62081105d1b509fd987525 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -16,11 +16,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/menu.h"
+    #include "wx/dialog.h"

 #endif
 
 #include "wx/notebook.h"
 #endif
 
 #include "wx/notebook.h"

-#include "wx/dialog.h"
-#include "wx/menu.h"

 #include "wx/gtk/private.h"
 
 #include <glib.h>
 #include "wx/gtk/private.h"
 
 #include <glib.h>


@@ -38,8 +38,6 @@ const int wxMENU_HEIGHT = 27;
 // globals
 //-----------------------------------------------------------------------------
 
 // globals
 //-----------------------------------------------------------------------------
 

-extern wxList wxPendingDelete;
-

 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------


@@ -128,9 +126,9 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
+void wxMDIParentFrame::GtkOnSize()

 {
 {

-    wxFrame::GtkOnSize( x, y, width, height );
+    wxFrame::GtkOnSize();

 
     wxMDIChildFrame *child_frame = GetActiveChild();
     if (!child_frame) return;
 
     wxMDIChildFrame *child_frame = GetActiveChild();
     if (!child_frame) return;


@@ -243,11 +241,6 @@ void wxMDIParentFrame::OnInternalIdle()
     }
 }
 
     }
 }
 

-void wxMDIParentFrame::DoGetClientSize(int *width, int *height ) const
-{
-    wxFrame::DoGetClientSize( width, height );
-}
-

 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {
     if (!m_clientWindow) return (wxMDIChildFrame*) NULL;
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {
     if (!m_clientWindow) return (wxMDIChildFrame*) NULL;