Minor header cleaning.

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

diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index 958a37294436427771423322cf3453d141b65342..47b3493b95b725a287e030d763d5bb0450812a4c 100644 (file)
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mdi.cpp
+// Name:        src/gtk1/mdi.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,22 +7,26 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "mdi.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_MDI

 
 #include "wx/mdi.h"
 
 
 #include "wx/mdi.h"
 

-#if wxUSE_MDI_ARCHITECTURE
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/menu.h"
+    #include "wx/dialog.h"
+#endif

 
 

-#include "wx/dialog.h"
-#include "wx/menu.h"
-#include "wx/intl.h"
+#include "wx/notebook.h"
+#include "wx/gtk1/private.h"

 
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>

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

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


@@ -41,12 +45,11 @@ extern bool g_isIdle;
 // globals
 //-----------------------------------------------------------------------------
 
 // globals
 //-----------------------------------------------------------------------------
 

-extern wxList wxPendingDelete;
-

 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void
 gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
                               GtkNotebookPage *page,
 static void
 gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
                               GtkNotebookPage *page,


@@ -61,7 +64,7 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
     wxMDIChildFrame *child = parent->GetActiveChild();
     if (child)
     {
     wxMDIChildFrame *child = parent->GetActiveChild();
     if (child)
     {

-        wxActivateEvent event1( wxEVT_ACTIVATE, FALSE, child->GetId() );
+        wxActivateEvent event1( wxEVT_ACTIVATE, false, child->GetId() );

         event1.SetEventObject( child);
         child->GetEventHandler()->ProcessEvent( event1 );
     }
         event1.SetEventObject( child);
         child->GetEventHandler()->ProcessEvent( event1 );
     }


@@ -74,25 +77,32 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
 
     child = (wxMDIChildFrame*) NULL;
 
 
     child = (wxMDIChildFrame*) NULL;
 

-    wxNode *node = client_window->GetChildren().First();
+    wxWindowList::compatibility_iterator node = client_window->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
+        wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
+        // CE: we come here in the destructor with a null child_frame - I think because
+        // gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", (see below)
+        // isn't deleted early enough
+        if (!child_frame)
+          return ;
+

         if (child_frame->m_page == page)
         {
             child = child_frame;
             break;
         }
         if (child_frame->m_page == page)
         {
             child = child_frame;
             break;
         }

-        node = node->Next();
+        node = node->GetNext();

     }
 
     if (!child)
          return;
 
     }
 
     if (!child)
          return;
 

-    wxActivateEvent event2( wxEVT_ACTIVATE, TRUE, child->GetId() );
+    wxActivateEvent event2( wxEVT_ACTIVATE, true, child->GetId() );

     event2.SetEventObject( child);
     child->GetEventHandler()->ProcessEvent( event2 );
 }
     event2.SetEventObject( child);
     child->GetEventHandler()->ProcessEvent( event2 );
 }

+}

 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame
 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame


@@ -102,7 +112,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame)
 
 void wxMDIParentFrame::Init()
 {
 
 void wxMDIParentFrame::Init()
 {

-    m_justInserted = FALSE;
+    m_justInserted = false;

     m_clientWindow = (wxMDIClientWindow *) NULL;
 }
 
     m_clientWindow = (wxMDIClientWindow *) NULL;
 }
 


@@ -122,7 +132,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
 
     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 )


@@ -157,20 +167,35 @@ void wxMDIParentFrame::OnInternalIdle()
         GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
         gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 );
 
         GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
         gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 );
 

-        m_justInserted = FALSE;
+        /* need to set the menubar of the child */
+        wxMDIChildFrame *active_child_frame = GetActiveChild();
+        if (active_child_frame != NULL)
+        {
+            wxMenuBar *menu_bar = active_child_frame->m_menuBar;
+            if (menu_bar)
+            {
+                menu_bar->m_width = m_width;
+                menu_bar->m_height = wxMENU_HEIGHT;
+                gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
+                                    menu_bar->m_widget,
+                                    0, 0, m_width, wxMENU_HEIGHT );
+                menu_bar->SetInvokingWindow(active_child_frame);
+            }
+        }
+        m_justInserted = false;

         return;
     }
 
     wxFrame::OnInternalIdle();
 
     wxMDIChildFrame *active_child_frame = GetActiveChild();
         return;
     }
 
     wxFrame::OnInternalIdle();
 
     wxMDIChildFrame *active_child_frame = GetActiveChild();

-    bool visible_child_menu = FALSE;
+    bool visible_child_menu = false;

 
 

-    wxNode *node = m_clientWindow->GetChildren().First();
+    wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxObject *child = node->Data();
-        wxMDIChildFrame *child_frame = wxDynamicCast(child, wxMDIChildFrame);
+        wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
+

         if ( child_frame )
         {
             wxMenuBar *menu_bar = child_frame->m_menuBar;
         if ( child_frame )
         {
             wxMenuBar *menu_bar = child_frame->m_menuBar;


@@ -178,7 +203,7 @@ void wxMDIParentFrame::OnInternalIdle()
             {
                 if (child_frame == active_child_frame)
                 {
             {
                 if (child_frame == active_child_frame)
                 {

-                    if (menu_bar->Show(TRUE))
+                    if (menu_bar->Show(true))

                     {
                         menu_bar->m_width = m_width;
                         menu_bar->m_height = wxMENU_HEIGHT;
                     {
                         menu_bar->m_width = m_width;
                         menu_bar->m_height = wxMENU_HEIGHT;


@@ -187,11 +212,11 @@ void wxMDIParentFrame::OnInternalIdle()
                                             0, 0, m_width, wxMENU_HEIGHT );
                         menu_bar->SetInvokingWindow( child_frame );
                     }
                                             0, 0, m_width, wxMENU_HEIGHT );
                         menu_bar->SetInvokingWindow( child_frame );
                     }

-                    visible_child_menu = TRUE;
+                    visible_child_menu = true;

                 }
                 else
                 {
                 }
                 else
                 {

-                    if (menu_bar->Show(FALSE))
+                    if (menu_bar->Show(false))

                     {
                         menu_bar->UnsetInvokingWindow( child_frame );
                     }
                     {
                         menu_bar->UnsetInvokingWindow( child_frame );
                     }


@@ -199,7 +224,7 @@ void wxMDIParentFrame::OnInternalIdle()
             }
         }
 
             }
         }
 

-        node = node->Next();
+        node = node->GetNext();

     }
 
     /* show/hide parent menu bar as required */
     }
 
     /* show/hide parent menu bar as required */


@@ -208,12 +233,12 @@ void wxMDIParentFrame::OnInternalIdle()
     {
         if (visible_child_menu)
         {
     {
         if (visible_child_menu)
         {

-            m_frameMenuBar->Show( FALSE );
+            m_frameMenuBar->Show( false );

             m_frameMenuBar->UnsetInvokingWindow( this );
         }
         else
         {
             m_frameMenuBar->UnsetInvokingWindow( this );
         }
         else
         {

-            m_frameMenuBar->Show( TRUE );
+            m_frameMenuBar->Show( true );

             m_frameMenuBar->SetInvokingWindow( this );
 
             m_frameMenuBar->m_width = m_width;
             m_frameMenuBar->SetInvokingWindow( this );
 
             m_frameMenuBar->m_width = m_width;


@@ -243,13 +268,16 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
     GtkNotebookPage* page = (GtkNotebookPage*) (g_list_nth(notebook->children,i)->data);
     if (!page) return (wxMDIChildFrame*) NULL;
 
     GtkNotebookPage* page = (GtkNotebookPage*) (g_list_nth(notebook->children,i)->data);
     if (!page) return (wxMDIChildFrame*) NULL;
 

-    wxNode *node = m_clientWindow->GetChildren().First();
+    wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
+        wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
+
+        wxASSERT_MSG( child_frame, _T("child is not a wxMDIChildFrame") );
+

         if (child_frame->m_page == page)
             return child_frame;
         if (child_frame->m_page == page)
             return child_frame;

-        node = node->Next();
+        node = node->GetNext();

     }
 
     return (wxMDIChildFrame*) NULL;
     }
 
     return (wxMDIChildFrame*) NULL;


@@ -399,13 +427,14 @@ void wxMDIChildFrame::SetTitle( const wxString &title )
 
     wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
     GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
 
     wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
     GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);

-    gtk_notebook_set_tab_label_text(notebook, m_widget, title.mbc_str());
+    gtk_notebook_set_tab_label_text(notebook, m_widget, wxGTK_CONV( title ) );

 }
 
 //-----------------------------------------------------------------------------
 // "size_allocate"
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "size_allocate"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();


@@ -421,6 +450,7 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 
     win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 }
 
     win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 }

+}

 
 //-----------------------------------------------------------------------------
 // InsertChild callback for wxMDIClientWindow
 
 //-----------------------------------------------------------------------------
 // InsertChild callback for wxMDIClientWindow


@@ -428,7 +458,7 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 
 static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child )
 {
 
 static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child )
 {

-    wxString s = child->m_title;
+    wxString s = child->GetTitle();

     if (s.IsNull()) s = _("MDI child");
 
     GtkWidget *label_widget = gtk_label_new( s.mbc_str() );
     if (s.IsNull()) s = _("MDI child");
 
     GtkWidget *label_widget = gtk_label_new( s.mbc_str() );


@@ -444,7 +474,7 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
     child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
 
     wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->GetParent();
     child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
 
     wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->GetParent();

-    parent_frame->m_justInserted = TRUE;
+    parent_frame->m_justInserted = true;

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


@@ -464,19 +494,20 @@ wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
 
 wxMDIClientWindow::~wxMDIClientWindow()
 {
 
 wxMDIClientWindow::~wxMDIClientWindow()
 {

+

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

-    m_needParent = TRUE;
+    m_needParent = true;

 
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
 
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||

-        !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
+        !CreateBase( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))

     {
         wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );
     {
         wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );

-        return FALSE;
+        return false;

     }
 
     m_widget = gtk_notebook_new();
     }
 
     m_widget = gtk_notebook_new();


@@ -490,9 +521,9 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 
     PostCreation();
 
 
     PostCreation();
 

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

 
 

-    return TRUE;
+    return true;

 }
 
 #endif
 }
 
 #endif