moved wxDash typedef to gdicmn.h

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

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 82f5e1c2601d7202f9cb8a0f2caa77c2e3085897..3fa7de98fd7f1b19ef7b60264db6a99fd57c8821 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -12,20 +12,30 @@
 #endif
 
 #include "wx/mdi.h"
 #endif
 
 #include "wx/mdi.h"

+
+#if wxUSE_MDI_ARCHITECTURE
+

 #include "wx/dialog.h"
 #include "wx/menu.h"
 #include "wx/dialog.h"
 #include "wx/menu.h"

-#include <wx/intl.h>
+#include "wx/intl.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"
 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 

-const int wxMENU_HEIGHT    = 27;
+const int wxMENU_HEIGHT = 27;
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;

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


@@ -33,6 +43,57 @@ const int wxMENU_HEIGHT    = 27;
 
 extern wxList wxPendingDelete;
 
 
 extern wxList wxPendingDelete;
 

+//-----------------------------------------------------------------------------
+// "switch_page"
+//-----------------------------------------------------------------------------
+
+static void 
+gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
+                              GtkNotebookPage *page,
+                             gint WXUNUSED(page_num),
+                             wxMDIParentFrame *parent )
+{
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
+
+    // send deactivate event to old child
+
+    wxMDIChildFrame *child = parent->GetActiveChild();
+    if (child)
+    {
+        wxActivateEvent event1( wxEVT_ACTIVATE, FALSE, child->GetId() );
+        event1.SetEventObject( child);
+        child->GetEventHandler()->ProcessEvent( event1 );
+    }
+    
+    // send activate event to new child
+    
+    wxMDIClientWindow *client_window = parent->GetClientWindow();
+    if (!client_window)
+        return;
+
+    child = (wxMDIChildFrame*) NULL;
+
+    wxNode *node = client_window->GetChildren().First();
+    while (node)
+    {
+        wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
+        if (child_frame->m_page == page)
+       {
+            child = child_frame;
+           break;
+       }
+        node = node->Next();
+    }
+    
+    if (!child)
+         return;
+    
+    wxActivateEvent event2( wxEVT_ACTIVATE, TRUE, child->GetId() );
+    event2.SetEventObject( child);
+    child->GetEventHandler()->ProcessEvent( event2 );
+}
+

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


@@ -77,20 +138,21 @@ bool wxMDIParentFrame::Create( wxWindow *parent,
 void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
 {
     wxFrame::GtkOnSize( x, y, width, height );
 void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
 {
     wxFrame::GtkOnSize( x, y, width, height );

-    
+

     wxMDIChildFrame *child_frame = GetActiveChild();
     if (!child_frame) return;
     wxMDIChildFrame *child_frame = GetActiveChild();
     if (!child_frame) return;

-    
+

     wxMenuBar *menu_bar = child_frame->m_menuBar;
     if (!menu_bar) return;
     if (!menu_bar->m_widget) return;
     wxMenuBar *menu_bar = child_frame->m_menuBar;
     if (!menu_bar) return;
     if (!menu_bar->m_widget) return;

-    
+

     menu_bar->m_x = 0;
     menu_bar->m_y = 0;
     menu_bar->m_width = m_width;
     menu_bar->m_height = wxMENU_HEIGHT;
     menu_bar->m_x = 0;
     menu_bar->m_y = 0;
     menu_bar->m_width = m_width;
     menu_bar->m_height = wxMENU_HEIGHT;

-    gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), menu_bar->m_widget, 0, 0 );
-    gtk_widget_set_usize( menu_bar->m_widget, m_width, wxMENU_HEIGHT );
+    gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), 
+                          menu_bar->m_widget, 
+                          0, 0, m_width, wxMENU_HEIGHT );

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


@@ -103,32 +165,69 @@ 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_page( notebook, g_list_length( notebook->children ) - 1 );
-       
-       m_justInserted = FALSE;
-       return;
+        gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 );
+
+        m_justInserted = FALSE;
+        return;

     }
     }

-       
+

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

-    
-    wxNode *node = m_clientWindow->m_children.First();
+    bool visible_child_menu = FALSE;
+
+    wxNode *node = m_clientWindow->GetChildren().First();

     while (node)
     {
         wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
     while (node)
     {
         wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();

-       if (child_frame->m_menuBar)
-       {
-           if (child_frame == active_child_frame)
-              gtk_widget_show( child_frame->m_menuBar->m_widget );
-           else
-              gtk_widget_hide( child_frame->m_menuBar->m_widget );
-       }
+       wxMenuBar *menu_bar = child_frame->m_menuBar;
+        if (child_frame->m_menuBar)
+        {
+            if (child_frame == active_child_frame)
+            {
+               if (menu_bar->Show(TRUE))
+               {
+                   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( child_frame );
+               }
+                visible_child_menu = TRUE;
+            }
+            else
+           {
+               if (menu_bar->Show(FALSE))
+               {
+                   menu_bar->UnsetInvokingWindow( child_frame );
+               }
+           }
+        }

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

-    
+

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

-    if (m_frameMenuBar) m_frameMenuBar->Show( (active_child_frame == NULL) );
+    if ((m_frameMenuBar) &&
+        (m_frameMenuBar->IsShown() == visible_child_menu))
+    {
+        if (visible_child_menu)
+       {
+            m_frameMenuBar->Show( FALSE );
+           m_frameMenuBar->UnsetInvokingWindow( this );
+       }
+       else
+       {
+            m_frameMenuBar->Show( TRUE );
+           m_frameMenuBar->SetInvokingWindow( this );
+           
+           m_frameMenuBar->m_width = m_width;
+           m_frameMenuBar->m_height = wxMENU_HEIGHT;
+            gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), 
+                                 m_frameMenuBar->m_widget, 
+                                 0, 0, m_width, wxMENU_HEIGHT );
+       }
+    }

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


@@ -139,17 +238,21 @@ void wxMDIParentFrame::GetClientSize(int *width, int *height ) const
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {
     if (!m_clientWindow) return (wxMDIChildFrame*) NULL;
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {
     if (!m_clientWindow) return (wxMDIChildFrame*) NULL;

-    
+

     GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
     if (!notebook) return (wxMDIChildFrame*) NULL;
     GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
     if (!notebook) return (wxMDIChildFrame*) NULL;

-    
+
+#if (GTK_MINOR_VERSION > 0)

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

+#else
+    gint i = gtk_notebook_current_page( notebook );
+#endif

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

-    
+

     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->m_children.First();
+
+    wxNode *node = m_clientWindow->GetChildren().First();

     while (node)
     {
         wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
     while (node)
     {
         wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();


@@ -157,7 +260,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
             return child_frame;
         node = node->Next();
     }
             return child_frame;
         node = node->Next();
     }

-    
+

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


@@ -239,51 +342,27 @@ void wxMDIChildFrame::GetClientSize( int *width, int *height ) const
     wxWindow::GetClientSize( width, height );
 }
 
     wxWindow::GetClientSize( width, height );
 }
 

-void wxMDIChildFrame::AddChild( wxWindow *child )
+void wxMDIChildFrame::AddChild( wxWindowBase *child )

 {
 {

-    wxWindow::AddChild( child );
-}
-
-static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
-{
-    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();
-    }
+    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") );
+

     m_menuBar = menu_bar;
 
     if (m_menuBar)
     {
     m_menuBar = menu_bar;
 
     if (m_menuBar)
     {

-        wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent;
-
-       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;
-        }
+        wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent();

 
 

-        /* the menu bar of the child window is shown in idle time as needed */
-       gtk_widget_hide( m_menuBar->m_widget );
+        m_menuBar->SetParent( mdi_frame );

 
         /* insert the invisible menu bar into the _parent_ mdi frame */
 
         /* insert the invisible menu bar into the _parent_ mdi frame */

-        gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_mainWidget), m_menuBar->m_widget, 0, 0 );
-        gtk_widget_set_usize( menu_bar->m_widget, mdi_frame->m_width, wxMENU_HEIGHT );
+        gtk_pizza_put( GTK_PIZZA(mdi_frame->m_mainWidget), 
+                         m_menuBar->m_widget, 
+                         0, 0,  mdi_frame->m_width, wxMENU_HEIGHT );

     }
 }
 
     }
 }
 


@@ -294,6 +373,17 @@ wxMenuBar *wxMDIChildFrame::GetMenuBar() const
 
 void wxMDIChildFrame::Activate()
 {
 
 void wxMDIChildFrame::Activate()
 {

+#if (GTK_MINOR_VERSION > 0)
+    wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
+    GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
+    gint pageno = gtk_notebook_page_num( notebook, m_page->child );
+    gtk_notebook_set_page( notebook, pageno );
+#else
+    // the only way I can see to do this under gtk+ 1.0.X would
+    // be to keep track of page numbers, start at first and 
+    // do "next" enough times to get to this page number - messy
+    // - J. Russell Smyth
+#endif

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


@@ -306,6 +396,8 @@ void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) )
 
 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 (g_isIdle) wxapp_install_idle_handler();
+

     if ((win->m_x == alloc->x) &&
         (win->m_y == alloc->y) &&
         (win->m_width == alloc->width) &&
     if ((win->m_x == alloc->x) &&
         (win->m_y == alloc->y) &&
         (win->m_width == alloc->width) &&


@@ -327,7 +419,7 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
     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 );
+    GtkWidget *label_widget = gtk_label_new( s.mbc_str() );

     gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
 
     gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
     gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
 
     gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",


@@ -338,8 +430,8 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
     gtk_notebook_append_page( notebook, child->m_widget, label_widget );
 
     child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
     gtk_notebook_append_page( notebook, child->m_widget, label_widget );
 
     child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);

-    
-    wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->m_parent;
+
+    wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->GetParent();

     parent_frame->m_justInserted = TRUE;
 }
 
     parent_frame->m_justInserted = TRUE;
 }
 


@@ -368,15 +460,21 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
 
 
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
 

-    PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" );
+    if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
+        !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
+    {
+        wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );
+       return FALSE;
+    }

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

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

 
 

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

 
 

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

 
     PostCreation();
 
 
     PostCreation();
 


@@ -385,5 +483,4 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
     return TRUE;
 }
 
     return TRUE;
 }
 

-
-
+#endif