reactivate commented out method

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

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 4a7ddf7c9fe868e798ea233a039ed6e43f5356af..760a4ac4ef5c81bde5ca78cedc6f8e1e20ea9799 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -27,10 +27,7 @@
 
 extern "C" {
 static void
 
 extern "C" {
 static void

-gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
-                              GtkNotebookPage *page,
-                              gint WXUNUSED(page_num),
-                              wxMDIParentFrame *parent )
+switch_page(GtkNotebook* widget, GtkNotebookPage*, guint page_num, wxMDIParentFrame* parent)

 {
     // send deactivate event to old child
 
 {
     // send deactivate event to old child
 


@@ -44,11 +41,12 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
 
     // send activate event to new child
 
 
     // send activate event to new child
 

-    wxMDIClientWindow *client_window = parent->GetClientWindow();
-    if (!client_window)
+    wxMDIClientWindowBase *client_window = parent->GetClientWindow();
+    if ( !client_window )

         return;
 
         return;
 

-    child = (wxMDIChildFrame*) NULL;
+    child = NULL;
+    GtkWidget* page = gtk_notebook_get_nth_page(widget, page_num);

 
     wxWindowList::compatibility_iterator node = client_window->GetChildren().GetFirst();
     while ( node )
 
     wxWindowList::compatibility_iterator node = client_window->GetChildren().GetFirst();
     while ( node )


@@ -58,7 +56,7 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
         // child_frame can be NULL when this is called from dtor, probably
         // because g_signal_connect (m_widget, "switch_page", (see below)
         // isn't deleted early enough
         // child_frame can be NULL when this is called from dtor, probably
         // because g_signal_connect (m_widget, "switch_page", (see below)
         // isn't deleted early enough

-        if ( child_frame && child_frame->m_page == page )
+        if (child_frame && child_frame->m_widget == page)

         {
             child = child_frame;
             break;
         {
             child = child_frame;
             break;


@@ -84,11 +82,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame)
 void wxMDIParentFrame::Init()
 {
     m_justInserted = false;
 void wxMDIParentFrame::Init()
 {
     m_justInserted = false;

-    m_clientWindow = (wxMDIClientWindow *) NULL;
-}
-
-wxMDIParentFrame::~wxMDIParentFrame()
-{

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


@@ -103,13 +96,15 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
         return false;
 
     m_clientWindow = OnCreateClient();
         return false;
 
     m_clientWindow = OnCreateClient();

+    if ( !m_clientWindow->CreateClient(this, GetWindowStyleFlag()) )
+        return false;

 
 

-    return m_clientWindow != NULL;
+    return true;

 }
 
 void wxMDIParentFrame::OnInternalIdle()
 {
 }
 
 void wxMDIParentFrame::OnInternalIdle()
 {

-    /* if a an MDI child window has just been inserted
+    /* if a MDI child window has just been inserted

        it has to be brought to the top in idle time. we
        simply set the last notebook page active as new
        pages can only be appended at the end */
        it has to be brought to the top in idle time. we
        simply set the last notebook page active as new
        pages can only be appended at the end */


@@ -117,7 +112,7 @@ void wxMDIParentFrame::OnInternalIdle()
     if (m_justInserted)
     {
         GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
     if (m_justInserted)
     {
         GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);

-        gtk_notebook_set_current_page( notebook, g_list_length( notebook->children ) - 1 );
+        gtk_notebook_set_current_page(notebook, -1);

 
         /* need to set the menubar of the child */
         wxMDIChildFrame *active_child_frame = GetActiveChild();
 
         /* need to set the menubar of the child */
         wxMDIChildFrame *active_child_frame = GetActiveChild();


@@ -126,7 +121,7 @@ void wxMDIParentFrame::OnInternalIdle()
             wxMenuBar *menu_bar = active_child_frame->m_menuBar;
             if (menu_bar)
             {
             wxMenuBar *menu_bar = active_child_frame->m_menuBar;
             if (menu_bar)
             {

-                menu_bar->SetInvokingWindow(active_child_frame);
+                menu_bar->Attach(active_child_frame);

             }
         }
         m_justInserted = false;
             }
         }
         m_justInserted = false;


@@ -152,7 +147,13 @@ void wxMDIParentFrame::OnInternalIdle()
                 {
                     if (menu_bar->Show(true))
                     {
                 {
                     if (menu_bar->Show(true))
                     {

-                        menu_bar->SetInvokingWindow( child_frame );
+                        // Attach() asserts if we call it for an already
+                        // attached menu bar so don't do it if we're already
+                        // associated with this frame (it would be nice to get
+                        // rid of this check and ensure that this doesn't
+                        // happen...)
+                        if ( menu_bar->GetFrame() != child_frame )
+                            menu_bar->Attach( child_frame );

                     }
                     visible_child_menu = true;
                 }
                     }
                     visible_child_menu = true;
                 }


@@ -160,7 +161,7 @@ void wxMDIParentFrame::OnInternalIdle()
                 {
                     if (menu_bar->Show(false))
                     {
                 {
                     if (menu_bar->Show(false))
                     {

-                        menu_bar->UnsetInvokingWindow( child_frame );
+                        menu_bar->Detach();

                     }
                 }
             }
                     }
                 }
             }


@@ -176,12 +177,12 @@ void wxMDIParentFrame::OnInternalIdle()
         if (visible_child_menu)
         {
             m_frameMenuBar->Show( false );
         if (visible_child_menu)
         {
             m_frameMenuBar->Show( false );

-            m_frameMenuBar->UnsetInvokingWindow( this );
+            m_frameMenuBar->Detach();

         }
         else
         {
             m_frameMenuBar->Show( true );
         }
         else
         {
             m_frameMenuBar->Show( true );

-            m_frameMenuBar->SetInvokingWindow( this );
+            m_frameMenuBar->Attach( this );

         }
     }
 }
         }
     }
 }


@@ -209,45 +210,35 @@ void wxMDIParentFrame::DoGetClientSize(int* width, int* height) const
 
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {
 
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {

-    if (!m_clientWindow) return (wxMDIChildFrame*) NULL;
+    if (!m_clientWindow) return NULL;

 
     GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
 
     GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);

-    if (!notebook) return (wxMDIChildFrame*) NULL;
+    if (!notebook) return NULL;

 
     gint i = gtk_notebook_get_current_page( notebook );
 
     gint i = gtk_notebook_get_current_page( notebook );

-    if (i < 0) return (wxMDIChildFrame*) NULL;
+    if (i < 0) return NULL;

 
 

-    GtkNotebookPage* page = (GtkNotebookPage*) (g_list_nth(notebook->children,i)->data);
-    if (!page) return (wxMDIChildFrame*) NULL;
+    GtkWidget* page = gtk_notebook_get_nth_page(notebook, i);
+    if (!page) return NULL;

 
     wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();
     while (node)
     {
         if ( wxPendingDelete.Member(node->GetData()) )
 
     wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();
     while (node)
     {
         if ( wxPendingDelete.Member(node->GetData()) )

-            return (wxMDIChildFrame*) NULL;
+            return NULL;

 
         wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
 
         if (!child_frame)
 
         wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
 
         if (!child_frame)

-            return (wxMDIChildFrame*) NULL;
+            return NULL;

 
 

-        if (child_frame->m_page == page)
+        if (child_frame->m_widget == page)

             return child_frame;
 
         node = node->GetNext();
     }
 
             return child_frame;
 
         node = node->GetNext();
     }
 

-    return (wxMDIChildFrame*) NULL;
-}
-
-wxMDIClientWindow *wxMDIParentFrame::GetClientWindow() const
-{
-    return m_clientWindow;
-}
-
-wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
-{
-    return new wxMDIClientWindow( this );
+    return NULL;

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


@@ -273,68 +264,39 @@ BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
     EVT_MENU_HIGHLIGHT_ALL(wxMDIChildFrame::OnMenuHighlight)
 END_EVENT_TABLE()
 
     EVT_MENU_HIGHLIGHT_ALL(wxMDIChildFrame::OnMenuHighlight)
 END_EVENT_TABLE()
 

-wxMDIChildFrame::wxMDIChildFrame()
+void wxMDIChildFrame::Init()

 {
 {

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

 }
 
 }
 

-wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
-      wxWindowID id, const wxString& title,
-      const wxPoint& WXUNUSED(pos), const wxSize& size,
-      long style, const wxString& name )
+bool wxMDIChildFrame::Create(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 );
+    m_mdiParent = parent;
+    m_title = title;
+
+    return wxWindow::Create(parent->GetClientWindow(), id,
+                            wxDefaultPosition, size,
+                            style, name);

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

-    if (m_menuBar)
-        delete m_menuBar;
+    delete m_menuBar;

 
     // wxMDIClientWindow does not get redrawn properly after last child is removed
     if (m_parent && m_parent->GetChildren().size() <= 1)
         gtk_widget_queue_draw(m_parent->m_widget);
 }
 
 
     // wxMDIClientWindow does not get redrawn properly after last child is removed
     if (m_parent && m_parent->GetChildren().size() <= 1)
         gtk_widget_queue_draw(m_parent->m_widget);
 }
 

-bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
-      wxWindowID id, const wxString& title,
-      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 );
-}
-
-bool wxMDIChildFrame::Destroy()
-{
-    // delayed destruction: the frame will be deleted during
-    // the next idle loop iteration.
-    // I'm not sure if delayed destruction really makes so
-    // much sense for MDI child frames, actually, but hiding
-    // it doesn't make any sense.
-    if ( !wxPendingDelete.Member(this) )
-        wxPendingDelete.Append(this);
-
-    return true;
-}
-
-void wxMDIChildFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
-{
-    wxWindow::DoSetSize( x, y, width, height, sizeFlags );
-}
-
-void wxMDIChildFrame::AddChild( wxWindowBase *child )
-{
-    wxWindow::AddChild(child);
-}
-

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

-    wxASSERT_MSG( m_menuBar == NULL, wxT("Only one menubar allowed") );
+    wxASSERT_MSG( m_menuBar == NULL, "Only one menubar allowed" );

 
     m_menuBar = menu_bar;
 
 
     m_menuBar = menu_bar;
 


@@ -365,10 +327,20 @@ wxMenuBar *wxMDIChildFrame::GetMenuBar() const
     return m_menuBar;
 }
 
     return m_menuBar;
 }
 

+GtkNotebook *wxMDIChildFrame::GTKGetNotebook() const
+{
+    wxMDIClientWindow * const
+        client = wxStaticCast(GetParent(), wxMDIClientWindow);
+    wxCHECK( client, NULL );
+
+    return GTK_NOTEBOOK(client->m_widget);
+}
+

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

-    wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
-    GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
+    GtkNotebook * const notebook = GTKGetNotebook();
+    wxCHECK_RET( notebook, "no parent notebook?" );
+

     gint pageno = gtk_notebook_page_num( notebook, m_widget );
     gtk_notebook_set_current_page( notebook, pageno );
 }
     gint pageno = gtk_notebook_page_num( notebook, m_widget );
     gtk_notebook_set_current_page( notebook, pageno );
 }


@@ -397,69 +369,42 @@ void wxMDIChildFrame::SetTitle( const wxString &title )
 
     m_title = title;
 
 
     m_title = title;
 

-    wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
-    GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
+    GtkNotebook * const notebook = GTKGetNotebook();
+    wxCHECK_RET( notebook, "no parent notebook?" );

     gtk_notebook_set_tab_label_text(notebook, m_widget, wxGTK_CONV( title ) );
 }
 
     gtk_notebook_set_tab_label_text(notebook, m_widget, wxGTK_CONV( title ) );
 }
 

-//-----------------------------------------------------------------------------
-// InsertChild callback for wxMDIClientWindow
-//-----------------------------------------------------------------------------
-
-static void wxInsertChildInMDI(wxWindow* parent, wxWindow* child)
-{
-    wxMDIChildFrame* child_frame = wx_static_cast(wxMDIChildFrame*, child);
-    wxString s = child_frame->GetTitle();
-    if (s.IsNull()) s = _("MDI child");
-
-    GtkWidget *label_widget = gtk_label_new( s.mbc_str() );
-    gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
-
-    GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);
-
-    gtk_notebook_append_page( notebook, child->m_widget, label_widget );
-
-    child_frame->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
-
-    wxMDIParentFrame *parent_frame = wx_static_cast(wxMDIParentFrame*, parent->GetParent());
-    parent_frame->m_justInserted = true;
-}
-

 //-----------------------------------------------------------------------------
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow,wxWindow)
-
-wxMDIClientWindow::wxMDIClientWindow()
-{
-}
-
-wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
-{
-    CreateClient( parent, style );
-}
+IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)

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

-
+    // disconnect our handler because our ~wxWindow (which is going to be called
+    // after this dtor) will call DestroyChildren(); in turns our children
+    // ~wxWindow dtors will call wxWindow::Show(false) and this will generate
+    // a call to gtk_mdi_page_change_callback with an invalid parent
+    // (because gtk_mdi_page_change_callback expects a wxMDIClientWindow but
+    //  at that point of the dtor chain we are a simple wxWindow!)
+    g_signal_handlers_disconnect_by_func(m_widget, (void*)switch_page, GetParent());

 }
 
 }
 

-bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
+bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)

 {
 {

-    m_insertCallback = wxInsertChildInMDI;
-
-    if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
-        !CreateBase( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
+    if ( !PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
+         !CreateBase( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                       style, wxDefaultValidator, "wxMDIClientWindow" ))

     {
     {

-        wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );
+        wxFAIL_MSG( "wxMDIClientWindow creation failed" );

         return false;
     }
 
     m_widget = gtk_notebook_new();
         return false;
     }
 
     m_widget = gtk_notebook_new();

+    g_object_ref(m_widget);

 
 

-    g_signal_connect (m_widget, "switch_page",
-                      G_CALLBACK (gtk_mdi_page_change_callback), parent);
+    g_signal_connect(m_widget, "switch_page", G_CALLBACK(switch_page), parent);

 
     gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
 
     gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 


@@ -472,4 +417,22 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
     return true;
 }
 
     return true;
 }
 

+void wxMDIClientWindow::AddChildGTK(wxWindowGTK* child)
+{
+    wxMDIChildFrame* child_frame = static_cast<wxMDIChildFrame*>(child);
+    wxString s = child_frame->GetTitle();
+    if ( s.empty() )
+        s = _("MDI child");
+
+    GtkWidget *label_widget = gtk_label_new( s.mbc_str() );
+    gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
+
+    GtkNotebook* notebook = GTK_NOTEBOOK(m_widget);
+
+    gtk_notebook_append_page( notebook, child->m_widget, label_widget );
+
+    wxMDIParentFrame* parent_frame = static_cast<wxMDIParentFrame*>(GetParent());
+    parent_frame->m_justInserted = true;
+}
+

 #endif // wxUSE_MDI
 #endif // wxUSE_MDI