mac support as stubs added

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

diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index 541afecfe8117131056a9abe2fdb1cef9b74b38c..361210958074774d058b6c551b18b99838d81cca 100644 (file)
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -21,7 +21,7 @@
 // constants
 //-----------------------------------------------------------------------------
 
-const int wxMENU_HEIGHT    = 30;
+const int wxMENU_HEIGHT    = 27;
 
 //-----------------------------------------------------------------------------
 // globals
@@ -38,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;
   }
@@ -119,12 +120,12 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
 
   if (m_mdiMenuBar)
   {
-    m_mdiMenuBar->m_x = 1;  
-    m_mdiMenuBar->m_y = 1;
-    m_mdiMenuBar->m_width = m_width-2;
-    m_mdiMenuBar->m_height = wxMENU_HEIGHT-2;
-    gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_mdiMenuBar->m_widget, 1, 1 );
-    gtk_widget_set_usize( m_mdiMenuBar->m_widget, m_width-2, wxMENU_HEIGHT-2 );
+    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 );
   }
 }
 
@@ -134,12 +135,12 @@ void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar )
   m_mdiMenuBar = menu_bar;
   if (m_mdiMenuBar)
   {
-    m_mdiMenuBar->m_x = 1;  
-    m_mdiMenuBar->m_y = 1;
-    m_mdiMenuBar->m_width = m_width-2;
-    m_mdiMenuBar->m_height = wxMENU_HEIGHT-2;
-    gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_mdiMenuBar->m_widget, 1, 1 );
-    gtk_widget_set_usize( m_mdiMenuBar->m_widget, m_width-2, wxMENU_HEIGHT-2 );
+    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 );
   }
 }
@@ -358,7 +359,9 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 
   gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
-  gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x, m_y );
+  m_parent->AddChild( this );
+
+  (m_parent->m_insertCallback)( m_parent, this );
   
   PostCreation();