* 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 66a39023cd23742efa7d22b2b23069849f337c76..4b3a894b75f9bcebd156880f4ea4a5d7d00057f6 100644 (file)
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -2,9 +2,8 @@
 // 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
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -16,13 +15,22 @@
 #include "wx/dialog.h"
 #include "wx/menu.h"
 #include "wx/gtk/win_gtk.h"
 #include "wx/dialog.h"
 #include "wx/menu.h"
 #include "wx/gtk/win_gtk.h"

+#include <wx/intl.h>

 
 

+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
+
+const int wxMENU_HEIGHT    = 30;
+
+//-----------------------------------------------------------------------------
+// globals

 //-----------------------------------------------------------------------------
 
 extern wxList wxPendingDelete;
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
 extern wxList wxPendingDelete;
 
 //-----------------------------------------------------------------------------

-// wxMDIParentFrame
+// "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 )


@@ -33,12 +41,15 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
       (win->m_height == alloc->height))
   {
     return;
       (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
 // page change callback

+//-----------------------------------------------------------------------------
+

 static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget),
                                       GtkNotebookPage *page,
                                       gint WXUNUSED(nPage),
 static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget),
                                       GtkNotebookPage *page,
                                       gint WXUNUSED(nPage),


@@ -54,11 +65,13 @@ static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget),
       mdi_frame->m_currentChild = child_frame;
       mdi_frame->SetMDIMenuBar( child_frame->m_menuBar );
       return;
       mdi_frame->m_currentChild = child_frame;
       mdi_frame->SetMDIMenuBar( child_frame->m_menuBar );
       return;

-    };
+    }

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

+//-----------------------------------------------------------------------------
+// wxMDIParentFrame

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


@@ -68,25 +81,25 @@ 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,


@@ -98,7 +111,7 @@ bool wxMDIParentFrame::Create( wxWindow *parent,
   OnCreateClient();
 
   return TRUE;
   OnCreateClient();
 
   return TRUE;

-};
+}

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


@@ -106,12 +119,14 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
 
   if (m_mdiMenuBar)
   {
 
   if (m_mdiMenuBar)
   {

-    int x = 0;
-    int y = 0;
-    GetClientSize( &x, &y );
-    m_mdiMenuBar->SetSize( 1, 1, x-2, 26 );
+    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 )
 {
 
 void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar )
 {


@@ -119,54 +134,56 @@ void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar )
   m_mdiMenuBar = menu_bar;
   if (m_mdiMenuBar)
   {
   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 = 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 );
   }
     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)
 {
   if (m_clientWindow)
     gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
 
 void wxMDIParentFrame::ActivateNext(void)
 {
   if (m_clientWindow)
     gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );

-};
+}

 
 void wxMDIParentFrame::ActivatePrevious(void)
 {
   if (m_clientWindow)
     gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
 
 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::OnActivate( wxActivateEvent& WXUNUSED(event) )
 {

-};
+}

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

-};
+}

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


@@ -180,19 +197,19 @@ END_EVENT_TABLE()
 
 wxMDIChildFrame::wxMDIChildFrame(void)
 {
 
 wxMDIChildFrame::wxMDIChildFrame(void)
 {

-  m_menuBar = NULL;
-  m_page = NULL;
-};
+  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 = NULL;
-  m_page = NULL;
+  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)
 {


@@ -201,12 +218,12 @@ wxMDIChildFrame::~wxMDIChildFrame(void)
     wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent;
     if (mdi_frame->m_currentChild == this)
     {
     wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent;
     if (mdi_frame->m_currentChild == this)
     {

-      mdi_frame->SetMDIMenuBar( NULL );
-      mdi_frame->m_currentChild = NULL;
-    };
+      mdi_frame->SetMDIMenuBar( (wxMenuBar *) NULL );
+      mdi_frame->m_currentChild = (wxMDIChildFrame *) NULL;
+    }

     delete m_menuBar;
   }
     delete m_menuBar;
   }

-};
+}

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


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

+  

   return wxWindow::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
 {
 
 void wxMDIChildFrame::GetClientSize( int *width, int *height ) const
 {


@@ -237,8 +255,8 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
     if (menuitem->IsSubMenu())
       SetInvokingWindow( menuitem->GetSubMenu(), win );
     node = node->Next();
     if (menuitem->IsSubMenu())
       SetInvokingWindow( menuitem->GetSubMenu(), win );
     node = node->Next();

-  };
-};
+  }
+}

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


@@ -256,29 +274,55 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
         wxMenu *menu = (wxMenu*)node->Data();
         SetInvokingWindow( menu, this );
         node = node->Next();
         wxMenu *menu = (wxMenu*)node->Data();
         SetInvokingWindow( menu, this );
         node = node->Next();

-      };
+      }

 
       m_menuBar->m_parent = mdi_frame;
     }
     mdi_frame->SetMDIMenuBar( m_menuBar );
 
 
       m_menuBar->m_parent = mdi_frame;
     }
     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 );
   }
       m_menuBar->m_widget, m_menuBar->m_x, m_menuBar->m_y );
   }

-};
+}

 
 wxMenuBar *wxMDIChildFrame::GetMenuBar()
 {
   return m_menuBar;
 
 wxMenuBar *wxMDIChildFrame::GetMenuBar()
 {
   return m_menuBar;

-};
+}

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

-};
+}

 
 void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) )
 {
 
 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


@@ -288,20 +332,22 @@ 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" );
 
 
   PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" );
 


@@ -312,42 +358,16 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 
   gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
 
   gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 

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

   PostCreation();
 
   Show( TRUE );
 
   return TRUE;
   PostCreation();
 
   Show( TRUE );
 
   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( NULL, mdi_child->m_page, 0, this );
-};