wxTopLevelWindows is now a wxWindowList, better compatibility with the old

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

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 4b3a894b75f9bcebd156880f4ea4a5d7d00057f6..e0b6d4aecaf70bc824a5a0d292d0e3325f4d8b8f 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -14,14 +14,18 @@
 #include "wx/mdi.h"
 #include "wx/dialog.h"
 #include "wx/menu.h"
 #include "wx/mdi.h"
 #include "wx/dialog.h"
 #include "wx/menu.h"

-#include "wx/gtk/win_gtk.h"

 #include <wx/intl.h>
 
 #include <wx/intl.h>
 

+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "wx/gtk/win_gtk.h"
+

 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 

-const int wxMENU_HEIGHT    = 30;
+const int wxMENU_HEIGHT    = 27;

 
 //-----------------------------------------------------------------------------
 // globals
 
 //-----------------------------------------------------------------------------
 // globals


@@ -35,19 +39,20 @@ extern wxList wxPendingDelete;
 
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
 
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {

-  if ((win->m_x == alloc->x) &&
-      (win->m_y == alloc->y) &&
-      (win->m_width == alloc->width) &&
-      (win->m_height == alloc->height))
-  {
-    return;
-  }
+    if ((win->m_x == alloc->x) &&
+        (win->m_y == alloc->y) &&
+        (win->m_width == alloc->width) &&
+        (win->m_height == alloc->height) &&
+        (win->m_sizeSet))
+    {
+        return;
+    }

 
 

-  win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
+    win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// page change callback
+// "switch_page"

 //-----------------------------------------------------------------------------
 
 static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget),
 //-----------------------------------------------------------------------------
 
 static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget),


@@ -55,19 +60,19 @@ static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget),
                                       gint WXUNUSED(nPage),
                                       wxMDIClientWindow *client_win )
 {
                                       gint WXUNUSED(nPage),
                                       wxMDIClientWindow *client_win )
 {

-  wxNode *node = client_win->m_children.First();
-  while (node)
-  {
-    wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
-    if (child_frame->m_page == page)
+    wxNode *node = client_win->m_children.First();
+    while (node)

     {
     {

-      wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)client_win->m_parent;
-      mdi_frame->m_currentChild = child_frame;
-      mdi_frame->SetMDIMenuBar( child_frame->m_menuBar );
-      return;
+        wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
+        if (child_frame->m_page == page)
+        {
+            wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)client_win->m_parent;
+            mdi_frame->m_currentChild = child_frame;
+            mdi_frame->SetMDIMenuBar( child_frame->m_menuBar );
+            return;
+        }
+        node = node->Next();

     }
     }

-    node = node->Next();
-  }

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -81,9 +86,9 @@ END_EVENT_TABLE()
 
 wxMDIParentFrame::wxMDIParentFrame(void)
 {
 
 wxMDIParentFrame::wxMDIParentFrame(void)
 {

-  m_clientWindow = (wxMDIClientWindow *) NULL;
-  m_currentChild = (wxMDIChildFrame *) NULL;
-  m_parentFrameActive = TRUE;
+    m_clientWindow = (wxMDIClientWindow *) NULL;
+    m_currentChild = (wxMDIChildFrame *) NULL;
+    m_parentFrameActive = TRUE;

 }
 
 wxMDIParentFrame::wxMDIParentFrame( wxWindow *parent,
 }
 
 wxMDIParentFrame::wxMDIParentFrame( wxWindow *parent,


@@ -91,10 +96,10 @@ wxMDIParentFrame::wxMDIParentFrame( wxWindow *parent,
       const wxPoint& pos, const wxSize& size,
       long style, const wxString& name )
 {
       const wxPoint& pos, const wxSize& size,
       long style, const wxString& name )
 {

-  m_clientWindow = (wxMDIClientWindow *) NULL;
-  m_currentChild = (wxMDIChildFrame *) NULL;
-  m_parentFrameActive = TRUE;
-  Create( parent, id, title, pos, size, style, name );
+    m_clientWindow = (wxMDIClientWindow *) NULL;
+    m_currentChild = (wxMDIChildFrame *) NULL;
+    m_parentFrameActive = TRUE;
+    Create( parent, id, title, pos, size, style, name );

 }
 
 wxMDIParentFrame::~wxMDIParentFrame(void)
 }
 
 wxMDIParentFrame::~wxMDIParentFrame(void)


@@ -106,75 +111,82 @@ bool wxMDIParentFrame::Create( wxWindow *parent,
       const wxPoint& pos, const wxSize& size,
       long style, const wxString& name )
 {
       const wxPoint& pos, const wxSize& size,
       long style, const wxString& name )
 {

-  wxFrame::Create( parent, id, title, pos, size, style, name );
+    wxFrame::Create( parent, id, title, pos, size, style, name );

 
 

-  OnCreateClient();
+    OnCreateClient();

 
 

-  return TRUE;
+    return TRUE;

 }
 
 void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
 {
 }
 
 void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
 {

-  wxFrame::GtkOnSize( x, y, width, height );
+    wxFrame::GtkOnSize( x, y, width, 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 );
-  }
+    if (m_mdiMenuBar)
+    {
+        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 );
+    }

 }
 
 void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar )
 {
 }
 
 void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar )
 {

-  if (m_mdiMenuBar) m_mdiMenuBar->Show( FALSE );
-  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->Show( TRUE );
-  }
+    /* hide old child menu bar */
+    if (m_mdiMenuBar) m_mdiMenuBar->Show( FALSE );
+
+    m_mdiMenuBar = menu_bar;
+
+    /* show and resize new menu child menu bar */
+    if (m_mdiMenuBar)
+    {
+        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 );
+    }
+
+    /* show/hide parent menu bar as required */
+    if (m_frameMenuBar) m_frameMenuBar->Show( (m_mdiMenuBar == NULL) );

 }
 
 void wxMDIParentFrame::GetClientSize(int *width, int *height ) const
 {
 }
 
 void wxMDIParentFrame::GetClientSize(int *width, int *height ) const
 {

-  wxFrame::GetClientSize( width, height );
+    wxFrame::GetClientSize( width, height );

 }
 
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild(void) const
 {
 }
 
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild(void) const
 {

-  return m_currentChild;
+    return m_currentChild;

 }
 
 wxMDIClientWindow *wxMDIParentFrame::GetClientWindow(void) const
 {
 }
 
 wxMDIClientWindow *wxMDIParentFrame::GetClientWindow(void) const
 {

-  return m_clientWindow;
+    return m_clientWindow;

 }
 
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient(void)
 {
 }
 
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient(void)
 {

-  m_clientWindow = new wxMDIClientWindow( this );
-  return m_clientWindow;
+    m_clientWindow = new wxMDIClientWindow( this );
+    return m_clientWindow;

 }
 
 void wxMDIParentFrame::ActivateNext(void)
 {
 }
 
 void wxMDIParentFrame::ActivateNext(void)
 {

-  if (m_clientWindow)
-    gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
+    if (m_clientWindow)
+      gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );

 }
 
 void wxMDIParentFrame::ActivatePrevious(void)
 {
 }
 
 void wxMDIParentFrame::ActivatePrevious(void)
 {

-  if (m_clientWindow)
-    gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
+    if (m_clientWindow)
+      gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );

 }
 
 void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )
 }
 
 void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )


@@ -190,15 +202,15 @@ void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(eve
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxFrame)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxFrame)

-  
+

 BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
 BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)

-  EVT_ACTIVATE(wxMDIChildFrame::OnActivate)
+    EVT_ACTIVATE(wxMDIChildFrame::OnActivate)

 END_EVENT_TABLE()
 
 wxMDIChildFrame::wxMDIChildFrame(void)
 {
 END_EVENT_TABLE()
 
 wxMDIChildFrame::wxMDIChildFrame(void)
 {

-  m_menuBar = (wxMenuBar *) NULL;
-  m_page = (GtkNotebookPage *) NULL;
+    m_menuBar = (wxMenuBar *) NULL;
+    m_page = (GtkNotebookPage *) NULL;

 }
 
 wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
 }
 
 wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,


@@ -206,23 +218,23 @@ wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
       const wxPoint& WXUNUSED(pos), const wxSize& size,
       long style, const wxString& name )
 {
       const wxPoint& WXUNUSED(pos), const wxSize& size,
       long style, const wxString& name )
 {

-  m_menuBar = (wxMenuBar *) NULL;
-  m_page = (GtkNotebookPage *) NULL;
-  Create( parent, id, title, wxDefaultPosition, size, style, name );
+    m_menuBar = (wxMenuBar *) NULL;
+    m_page = (GtkNotebookPage *) NULL;
+    Create( parent, id, title, wxDefaultPosition, size, style, name );

 }
 
 wxMDIChildFrame::~wxMDIChildFrame(void)
 {
 }
 
 wxMDIChildFrame::~wxMDIChildFrame(void)
 {

-  if (m_menuBar)
-  {
-    wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent;
-    if (mdi_frame->m_currentChild == this)
+    if (m_menuBar)

     {
     {

-      mdi_frame->SetMDIMenuBar( (wxMenuBar *) NULL );
-      mdi_frame->m_currentChild = (wxMDIChildFrame *) NULL;
+        wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent;
+        if (mdi_frame->m_currentChild == this)
+        {
+            mdi_frame->SetMDIMenuBar( (wxMenuBar *) NULL );
+            mdi_frame->m_currentChild = (wxMDIChildFrame *) NULL;
+        }
+        delete m_menuBar;

     }
     }

-    delete m_menuBar;
-  }

 }
 
 bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
 }
 
 bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,


@@ -230,64 +242,65 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
       const wxPoint& WXUNUSED(pos), const wxSize& size,
       long style, const wxString& name )
 {
       const wxPoint& WXUNUSED(pos), const wxSize& size,
       long style, const wxString& name )
 {

-  m_title = title;
-  
-  return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
+    m_title = title;
+
+    return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );

 }
 
 void wxMDIChildFrame::GetClientSize( int *width, int *height ) const
 {
 }
 
 void wxMDIChildFrame::GetClientSize( int *width, int *height ) const
 {

-  wxWindow::GetClientSize( width, height );
+    wxWindow::GetClientSize( width, height );

 }
 
 void wxMDIChildFrame::AddChild( wxWindow *child )
 {
 }
 
 void wxMDIChildFrame::AddChild( wxWindow *child )
 {

-  wxWindow::AddChild( child );
+    wxWindow::AddChild( child );

 }
 }

-  
+

 static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
 {
 static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
 {

-  menu->SetInvokingWindow( win );
-  wxNode *node = menu->m_items.First();
-  while (node)
-  {
-    wxMenuItem *menuitem = (wxMenuItem*)node->Data();
-    if (menuitem->IsSubMenu())
-      SetInvokingWindow( menuitem->GetSubMenu(), win );
-    node = node->Next();
-  }
+    menu->SetInvokingWindow( win );
+    wxNode *node = menu->GetItems().First();
+    while (node)
+    {
+        wxMenuItem *menuitem = (wxMenuItem*)node->Data();
+        if (menuitem->IsSubMenu())
+            SetInvokingWindow( menuitem->GetSubMenu(), win );
+        node = node->Next();
+    }

 }
 
 void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
 {
 }
 
 void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
 {

-  m_menuBar = menu_bar;
+    m_menuBar = menu_bar;

 
 

-  if (m_menuBar)
-  {
-    wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent;
-
-    if (m_menuBar->m_parent != this)
+    if (m_menuBar)

     {
     {

-      wxNode *node = m_menuBar->m_menus.First();
-      while (node)
-      {
-        wxMenu *menu = (wxMenu*)node->Data();
-        SetInvokingWindow( menu, this );
-        node = node->Next();
-      }
+        wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent;

 
 

-      m_menuBar->m_parent = mdi_frame;
-    }
-    mdi_frame->SetMDIMenuBar( m_menuBar );
+       if (m_menuBar->m_parent != this)
+       {
+            wxNode *node = m_menuBar->GetMenus().First();
+            while (node)
+            {
+                wxMenu *menu = (wxMenu*)node->Data();
+                SetInvokingWindow( menu, this );
+                node = node->Next();
+            }
+
+            m_menuBar->m_parent = mdi_frame;
+        }

 
 

-    gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_wxwindow),
-      m_menuBar->m_widget, m_menuBar->m_x, m_menuBar->m_y );
-  }
+        gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_wxwindow),
+          m_menuBar->m_widget, m_menuBar->m_x, m_menuBar->m_y );
+
+        mdi_frame->SetMDIMenuBar( m_menuBar );
+    }

 }
 
 }
 

-wxMenuBar *wxMDIChildFrame::GetMenuBar()
+wxMenuBar *wxMDIChildFrame::GetMenuBar() const

 {
 {

-  return m_menuBar;
+    return m_menuBar;

 }
 
 void wxMDIChildFrame::Activate(void)
 }
 
 void wxMDIChildFrame::Activate(void)


@@ -304,24 +317,24 @@ void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) )
 
 static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child )
 {
 
 static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child )
 {

-  wxString s = child->m_title;
-  if (s.IsNull()) s = _("MDI 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 );

 
 

-  GtkWidget *label_widget = gtk_label_new( s );
-  gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
+    GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);

 
 

-  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 );
+    gtk_notebook_append_page( notebook, child->m_widget, label_widget );

 
 

-  child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
+    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 );
+    gtk_notebook_set_page( notebook, parent->m_children.Number()-1 );
+
+    gtk_page_change_callback( (GtkNotebook *) NULL, child->m_page, 0, parent );

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -336,7 +349,7 @@ wxMDIClientWindow::wxMDIClientWindow(void)
 
 wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
 {
 
 wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
 {

-  CreateClient( parent, style );
+    CreateClient( parent, style );

 }
 
 wxMDIClientWindow::~wxMDIClientWindow(void)
 }
 
 wxMDIClientWindow::~wxMDIClientWindow(void)


@@ -345,28 +358,28 @@ wxMDIClientWindow::~wxMDIClientWindow(void)
 
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {
 
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {

-  m_needParent = TRUE;
-  
-  m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
+    m_needParent = TRUE;
+
+    m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
+
+    PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" );

 
 

-  PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" );
+    m_widget = gtk_notebook_new();

 
 

-  m_widget = gtk_notebook_new();
+    gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
+                        GTK_SIGNAL_FUNC(gtk_page_change_callback), (gpointer)this );

 
 

-  gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
-                      GTK_SIGNAL_FUNC(gtk_page_change_callback), (gpointer)this );
+    gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );

 
 

-  gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
+    m_parent->AddChild( this );

 
 

-  m_parent->AddChild( this );
+    (m_parent->m_insertCallback)( m_parent, this );

 
 

-  (m_parent->m_insertCallback)( m_parent, this );
-  
-  PostCreation();
+    PostCreation();

 
 

-  Show( TRUE );
+    Show( TRUE );

 
 

-  return TRUE;
+    return TRUE;

 }
 
 
 }