* Fixed a memory leak in wxThread

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

diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index 160828e8cd4120d2f26e785f8160de0d2835472c..4b3a894b75f9bcebd156880f4ea4a5d7d00057f6 100644 (file)
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -2,10 +2,9 @@
 // Name:        mdi.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        mdi.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -13,49 +12,94 @@
 #endif
 
 #include "wx/mdi.h"
 #endif
 
 #include "wx/mdi.h"

+#include "wx/dialog.h"
+#include "wx/menu.h"
+#include "wx/gtk/win_gtk.h"
+#include <wx/intl.h>

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxMDIParentFrame
+// constants
+//-----------------------------------------------------------------------------
+
+const int wxMENU_HEIGHT    = 30;
+
+//-----------------------------------------------------------------------------
+// globals
+//-----------------------------------------------------------------------------
+
+extern wxList wxPendingDelete;
+
+//-----------------------------------------------------------------------------
+// "size_allocate"

 //-----------------------------------------------------------------------------
 
 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))
   {
     return;

-  };
-  
+  }
+

   win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
   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),
+                                      wxMDIClientWindow *client_win )
+{
+  wxNode *node = client_win->m_children.First();
+  while (node)
+  {
+    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();
+  }
+}
+
+//-----------------------------------------------------------------------------
+// wxMDIParentFrame

 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame)
 
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame)
 

+BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
+END_EVENT_TABLE()
+

 wxMDIParentFrame::wxMDIParentFrame(void)
 {
 wxMDIParentFrame::wxMDIParentFrame(void)
 {

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

   m_parentFrameActive = TRUE;
   m_parentFrameActive = TRUE;

-};
+}

 
 wxMDIParentFrame::wxMDIParentFrame( wxWindow *parent,
       wxWindowID id, const wxString& title,
       const wxPoint& pos, const wxSize& size,
       long style, const wxString& name )
 {
 
 wxMDIParentFrame::wxMDIParentFrame( wxWindow *parent,
       wxWindowID id, const wxString& title,
       const wxPoint& pos, const wxSize& size,
       long style, const wxString& name )
 {

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

   m_parentFrameActive = TRUE;
   Create( parent, id, title, pos, size, style, name );
   m_parentFrameActive = TRUE;
   Create( parent, id, title, pos, size, style, name );

-};
+}

 
 wxMDIParentFrame::~wxMDIParentFrame(void)
 {
 
 wxMDIParentFrame::~wxMDIParentFrame(void)
 {

-};
+}

 
 bool wxMDIParentFrame::Create( wxWindow *parent,
       wxWindowID id, const wxString& title,
 
 bool wxMDIParentFrame::Create( wxWindow *parent,
       wxWindowID id, const wxString& title,


@@ -63,80 +107,123 @@ bool wxMDIParentFrame::Create( wxWindow *parent,
       long style, const wxString& name )
 {
   wxFrame::Create( parent, id, title, pos, size, style, name );
       long style, const wxString& name )
 {
   wxFrame::Create( parent, id, title, pos, size, style, name );

-  
+

   OnCreateClient();
   OnCreateClient();

-  
-  return TRUE;
-};

 
 

-void wxMDIParentFrame::OnSize( wxSizeEvent& event )
-{
-  wxFrame::OnSize( event );
-};
+  return TRUE;
+}

 
 

-void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )
+void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )

 {
 {

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

 
 

-void wxMDIParentFrame::SetMenuBar( wxMenuBar *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 );
+  }
+}
+
+void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar )

 {
 {

-  wxFrame::SetMenuBar( 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 );
+  }
+}

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

-};
+}

 
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild(void) const
 {
   return m_currentChild;
 
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild(void) const
 {
   return m_currentChild;

-};
+}

 
 wxMDIClientWindow *wxMDIParentFrame::GetClientWindow(void) const
 {
   return m_clientWindow;
 
 wxMDIClientWindow *wxMDIParentFrame::GetClientWindow(void) const
 {
   return m_clientWindow;

-};
+}

 
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient(void)
 {
   m_clientWindow = new wxMDIClientWindow( this );
   return m_clientWindow;
 
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient(void)
 {
   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) );
+}

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

-};
+  if (m_clientWindow)
+    gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
+}
+
+void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )
+{
+}

 
 void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(event) )
 {
 
 void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(event) )
 {

-};
+}

 
 //-----------------------------------------------------------------------------
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxPanel)
+IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxFrame)

   
   

+BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
+  EVT_ACTIVATE(wxMDIChildFrame::OnActivate)
+END_EVENT_TABLE()
+

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

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

 
 wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
       wxWindowID id, const wxString& title,
       const wxPoint& WXUNUSED(pos), const wxSize& size,
       long style, const wxString& name )
 {
 
 wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
       wxWindowID id, const wxString& title,
       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 );
   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)
+    {
+      mdi_frame->SetMDIMenuBar( (wxMenuBar *) NULL );
+      mdi_frame->m_currentChild = (wxMDIChildFrame *) NULL;
+    }
+    delete m_menuBar;
+  }
+}

 
 bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
       wxWindowID id, const wxString& title,
 
 bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
       wxWindowID id, const wxString& title,


@@ -144,16 +231,98 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
       long style, const wxString& name )
 {
   m_title = title;
       long style, const wxString& name )
 {
   m_title = title;

-  return wxPanel::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
-};
+  
+  return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
+}
+
+void wxMDIChildFrame::GetClientSize( int *width, int *height ) const
+{
+  wxWindow::GetClientSize( width, height );
+}
+
+void wxMDIChildFrame::AddChild( wxWindow *child )
+{
+  wxWindow::AddChild( child );
+}
+  
+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();
+  }
+}
+
+void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
+{
+  m_menuBar = menu_bar;

 
 

-void wxMDIChildFrame::SetMenuBar( wxMenuBar *WXUNUSED(menu_bar) )
+  if (m_menuBar)
+  {
+    wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent;
+
+    if (m_menuBar->m_parent != this)
+    {
+      wxNode *node = m_menuBar->m_menus.First();
+      while (node)
+      {
+        wxMenu *menu = (wxMenu*)node->Data();
+        SetInvokingWindow( menu, this );
+        node = node->Next();
+      }
+
+      m_menuBar->m_parent = mdi_frame;
+    }
+    mdi_frame->SetMDIMenuBar( m_menuBar );
+
+    gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_wxwindow),
+      m_menuBar->m_widget, m_menuBar->m_x, m_menuBar->m_y );
+  }
+}
+
+wxMenuBar *wxMDIChildFrame::GetMenuBar()

 {
 {

-};
+  return m_menuBar;
+}

 
 void wxMDIChildFrame::Activate(void)
 {
 
 void wxMDIChildFrame::Activate(void)
 {

-};
+}
+
+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
 
 //-----------------------------------------------------------------------------
 // wxMDIClientWindow


@@ -163,54 +332,42 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow,wxWindow)
 
 wxMDIClientWindow::wxMDIClientWindow(void)
 {
 
 wxMDIClientWindow::wxMDIClientWindow(void)
 {

-};
+}

 
 wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
 {
   CreateClient( parent, style );
 
 wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
 {
   CreateClient( parent, style );

-};
+}

 
 wxMDIClientWindow::~wxMDIClientWindow(void)
 {
 
 wxMDIClientWindow::~wxMDIClientWindow(void)
 {

-};
+}

 
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {
   m_needParent = TRUE;
   
 
 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" );
 
   m_widget = gtk_notebook_new();
   PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" );
 
   m_widget = gtk_notebook_new();

+
+  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 );
+
+  m_parent->AddChild( this );
+
+  (m_parent->m_insertCallback)( m_parent, this );

   
   PostCreation();
   
   PostCreation();

-  
-  Show( TRUE );
-  
-  return TRUE;
-};

 
 

-void wxMDIClientWindow::AddChild( wxWindow *child )
-{
-  m_children.Append( child );
-  
-  wxString s;
+  Show( TRUE );

 
 

-  if (child->IsKindOf(CLASSINFO(wxMDIChildFrame)))
-  {
-    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 );
+  return TRUE;
+}

 
 

-  gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), child->m_widget, label_widget );
-};