X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a81258bee4e20d3fa9b3d2f6bf3bcd1200d1e5e0..5de5db0eb14aa86b5b177050720deb0f4c210fba:/src/gtk/mdi.cpp

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 112eb90a9f..3612109580 100644
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -17,12 +17,20 @@
 #include "wx/gtk/win_gtk.h"
 #include <wx/intl.h>
 
+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
+
+const int wxMENU_HEIGHT    = 27;
+
+//-----------------------------------------------------------------------------
+// globals
 //-----------------------------------------------------------------------------
 
 extern wxList wxPendingDelete;
 
 //-----------------------------------------------------------------------------
-// wxMDIParentFrame
+// "size_allocate"
 //-----------------------------------------------------------------------------
 
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
@@ -30,7 +38,8 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
   if ((win->m_x == alloc->x) &&
       (win->m_y == alloc->y) &&
       (win->m_width == alloc->width) &&
-      (win->m_height == alloc->height))
+      (win->m_height == alloc->height) &&
+      (win->m_sizeSet))
   {
     return;
   }
@@ -38,7 +47,10 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
   win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 }
 
+//-----------------------------------------------------------------------------
 // page change callback
+//-----------------------------------------------------------------------------
+
 static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget),
                                       GtkNotebookPage *page,
                                       gint WXUNUSED(nPage),
@@ -59,6 +71,8 @@ static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget),
   }
 }
 
+//-----------------------------------------------------------------------------
+// wxMDIParentFrame
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame)
@@ -106,10 +120,12 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
 
   if (m_mdiMenuBar)
   {
-    int x = 0;
-    int y = 0;
-    GetClientSize( &x, &y );
-    m_mdiMenuBar->SetSize( 1, 1, x-2, 26 );
+    m_mdiMenuBar->m_x = 0;  
+    m_mdiMenuBar->m_y = 0;
+    m_mdiMenuBar->m_width = m_width;
+    m_mdiMenuBar->m_height = wxMENU_HEIGHT;
+    gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_mdiMenuBar->m_widget, 0, 0 );
+    gtk_widget_set_usize( m_mdiMenuBar->m_widget, m_width, wxMENU_HEIGHT );
   }
 }
 
@@ -119,10 +135,12 @@ void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar )
   m_mdiMenuBar = menu_bar;
   if (m_mdiMenuBar)
   {
-    int x = 0;
-    int y = 0;
-    GetClientSize( &x, &y );
-    m_mdiMenuBar->SetSize( 1, 1, x-2, 26 );
+    m_mdiMenuBar->m_x = 0;  
+    m_mdiMenuBar->m_y = 0;
+    m_mdiMenuBar->m_width = m_width;
+    m_mdiMenuBar->m_height = wxMENU_HEIGHT;
+    gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_mdiMenuBar->m_widget, 0, 0 );
+    gtk_widget_set_usize( m_mdiMenuBar->m_widget, m_width, wxMENU_HEIGHT );
     m_mdiMenuBar->Show( TRUE );
   }
 }
@@ -214,6 +232,7 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
       long style, const wxString& name )
 {
   m_title = title;
+  
   return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
 }
 
@@ -262,7 +281,7 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
     }
     mdi_frame->SetMDIMenuBar( m_menuBar );
 
-    gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_mainWindow),
+    gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_wxwindow),
       m_menuBar->m_widget, m_menuBar->m_x, m_menuBar->m_y );
   }
 }
@@ -280,6 +299,32 @@ void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) )
 {
 }
 
+//-----------------------------------------------------------------------------
+// InsertChild callback for wxMDIClientWindow
+//-----------------------------------------------------------------------------
+
+static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child )
+{
+  wxString s = child->m_title;
+  if (s.IsNull()) s = _("MDI child");
+
+  GtkWidget *label_widget = gtk_label_new( s );
+  gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
+
+  gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
+    GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
+    
+  GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);
+    
+  gtk_notebook_append_page( notebook, child->m_widget, label_widget );
+
+  child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
+
+  gtk_notebook_set_page( notebook, parent->m_children.Number()-1 );
+  
+  gtk_page_change_callback( (GtkNotebook *) NULL, child->m_page, 0, parent );
+}
+
 //-----------------------------------------------------------------------------
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
@@ -302,6 +347,8 @@ wxMDIClientWindow::~wxMDIClientWindow(void)
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {
   m_needParent = TRUE;
+  
+  m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
 
   PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" );
 
@@ -312,6 +359,10 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 
   gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
+  m_parent->AddChild( this );
+
+  (m_parent->m_insertCallback)( m_parent, this );
+  
   PostCreation();
 
   Show( TRUE );
@@ -319,35 +370,5 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
   return TRUE;
 }
 
-void wxMDIClientWindow::AddChild( wxWindow *child )
-{
-  if (!child->IsKindOf(CLASSINFO(wxMDIChildFrame)))
-  {
-     wxFAIL_MSG("wxNotebook::AddChild: Child has to be wxMDIChildFrame");
-     return;
-  }
-
-  m_children.Append( child );
-
-  wxString s;
-  wxMDIChildFrame* mdi_child = (wxMDIChildFrame*) child;
-  s = mdi_child->m_title;
-  if (s.IsNull()) s = _("MDI child");
-
-  GtkWidget *label_widget;
-  label_widget = gtk_label_new( s );
-  gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
-
-  gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
-    GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
-    
-  gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), child->m_widget, label_widget );
-
-  mdi_child->m_page = (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data);
-
-  gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), m_children.Number()-1 );
-  
-  gtk_page_change_callback( (GtkNotebook *) NULL, mdi_child->m_page, 0, this );
-}