Made wxDataViewCtrl sample use a real, expandabl data tree

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

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 33378f778501e3788703216a6f6ccaa3d3071002..7c384c2d54e10cbaeead5e0915181e5aed89f1ae 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -23,8 +23,6 @@
 #include "wx/notebook.h"
 #include "wx/gtk/private.h"
 
 #include "wx/notebook.h"
 #include "wx/gtk/private.h"
 

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

 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 
 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 


@@ -49,9 +47,6 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
                               gint WXUNUSED(page_num),
                               wxMDIParentFrame *parent )
 {
                               gint WXUNUSED(page_num),
                               wxMDIParentFrame *parent )
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     // send deactivate event to old child
 
     wxMDIChildFrame *child = parent->GetActiveChild();
     // send deactivate event to old child
 
     wxMDIChildFrame *child = parent->GetActiveChild();


@@ -126,9 +121,9 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

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

 {
 {

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

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


@@ -241,11 +236,6 @@ void wxMDIParentFrame::OnInternalIdle()
     }
 }
 
     }
 }
 

-void wxMDIParentFrame::DoGetClientSize(int *width, int *height ) const
-{
-    wxFrame::DoGetClientSize( width, height );
-}
-

 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {
     if (!m_clientWindow) return (wxMDIChildFrame*) NULL;
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {
     if (!m_clientWindow) return (wxMDIChildFrame*) NULL;


@@ -262,12 +252,17 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
     wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();
     while (node)
     {
     wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();
     while (node)
     {

+        if ( wxPendingDelete.Member(node->GetData()) )
+            return (wxMDIChildFrame*) NULL;
+

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

-        wxASSERT_MSG( child_frame, _T("child is not a wxMDIChildFrame") );
+        if (!child_frame)
+            return (wxMDIChildFrame*) NULL;

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

+

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


@@ -297,6 +292,18 @@ void wxMDIParentFrame::ActivatePrevious()
       gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
 }
 
       gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
 }
 

+bool wxMDIParentFrame::HasVisibleMenubar() const
+{
+    if (wxFrame::HasVisibleMenubar())
+        return true;
+
+    wxMDIChildFrame* active_child_frame = GetActiveChild();
+    wxMenuBar* menubar = NULL;
+    if (active_child_frame)
+        menubar = active_child_frame->m_menuBar;
+    return menubar && menubar->IsShown();
+}
+

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


@@ -340,19 +347,22 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
     return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
 }
 
     return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
 }
 

-void wxMDIChildFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
+bool wxMDIChildFrame::Destroy()

 {
 {

-    wxWindow::DoSetSize( x, y, width, height, sizeFlags );
-}
+    // 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);

 
 

-void wxMDIChildFrame::DoSetClientSize(int width, int height)
-{
-    wxWindow::DoSetClientSize( width, height );
+    return true;

 }
 
 }
 

-void wxMDIChildFrame::DoGetClientSize( int *width, int *height ) const
+void wxMDIChildFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )

 {
 {

-    wxWindow::DoGetClientSize( width, height );
+    wxWindow::DoSetSize( x, y, width, height, sizeFlags );

 }
 
 void wxMDIChildFrame::AddChild( wxWindowBase *child )
 }
 
 void wxMDIChildFrame::AddChild( wxWindowBase *child )


@@ -400,7 +410,7 @@ void wxMDIChildFrame::OnMenuHighlight( wxMenuEvent& event )
 {
 #if wxUSE_STATUSBAR
     wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent();
 {
 #if wxUSE_STATUSBAR
     wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent();

-    if ( !ShowMenuHelp(mdi_frame->GetStatusBar(), event.GetMenuId()) )
+    if ( !ShowMenuHelp(event.GetMenuId()) )

     {
         // we don't have any help text for this item, but may be the MDI frame
         // does?
     {
         // we don't have any help text for this item, but may be the MDI frame
         // does?


@@ -426,10 +436,8 @@ void wxMDIChildFrame::SetTitle( const wxString &title )
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
+static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxMDIChildFrame *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) &&


@@ -447,9 +455,10 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 // InsertChild callback for wxMDIClientWindow
 //-----------------------------------------------------------------------------
 
 // InsertChild callback for wxMDIClientWindow
 //-----------------------------------------------------------------------------
 

-static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child )
+static void wxInsertChildInMDI(wxWindow* parent, wxWindow* child)

 {
 {

-    wxString s = child->GetTitle();
+    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() );
     if (s.IsNull()) s = _("MDI child");
 
     GtkWidget *label_widget = gtk_label_new( s.mbc_str() );


@@ -462,9 +471,9 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
 
     gtk_notebook_append_page( notebook, child->m_widget, label_widget );
 
 
     gtk_notebook_append_page( notebook, child->m_widget, label_widget );
 

-    child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
+    child_frame->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);

 
 

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

     parent_frame->m_justInserted = true;
 }
 
     parent_frame->m_justInserted = true;
 }
 


@@ -490,9 +499,7 @@ wxMDIClientWindow::~wxMDIClientWindow()
 
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {
 
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {

-    m_needParent = true;
-
-    m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
+    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, wxT("wxMDIClientWindow") ))


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

-#endif
+#endif // wxUSE_MDI