X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af6c0f1de7b05cc9f85038939efbd79fcd5dc14e..6908078e2759d5036152e763337fe12acb2e9b89:/src/gtk/mdi.cpp diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index a15c6a7500..fb0e1b7079 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -10,18 +10,19 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_MDI + #include "wx/mdi.h" -#include "wx/notebook.h" -#if wxUSE_MDI +#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/gtk/private.h" -#include -#include #include #include "wx/gtk/win_gtk.h" @@ -35,8 +36,6 @@ const int wxMENU_HEIGHT = 27; // globals //----------------------------------------------------------------------------- -extern wxList wxPendingDelete; - //----------------------------------------------------------------------------- // "switch_page" //----------------------------------------------------------------------------- @@ -48,9 +47,6 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget), gint WXUNUSED(page_num), wxMDIParentFrame *parent ) { - if (g_isIdle) - wxapp_install_idle_handler(); - // send deactivate event to old child wxMDIChildFrame *child = parent->GetActiveChild(); @@ -125,9 +121,9 @@ bool wxMDIParentFrame::Create(wxWindow *parent, 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; @@ -138,11 +134,11 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height ) menu_bar->m_x = 0; menu_bar->m_y = 0; - menu_bar->m_width = m_width; + GTKDoGetSize(&menu_bar->m_width, NULL); menu_bar->m_height = wxMENU_HEIGHT; gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), menu_bar->m_widget, - 0, 0, m_width, wxMENU_HEIGHT ); + 0, 0, menu_bar->m_width, menu_bar->m_height); } void wxMDIParentFrame::OnInternalIdle() @@ -164,11 +160,11 @@ void wxMDIParentFrame::OnInternalIdle() wxMenuBar *menu_bar = active_child_frame->m_menuBar; if (menu_bar) { - menu_bar->m_width = m_width; + GTKDoGetSize(&menu_bar->m_width, NULL); menu_bar->m_height = wxMENU_HEIGHT; gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), menu_bar->m_widget, - 0, 0, m_width, wxMENU_HEIGHT ); + 0, 0, menu_bar->m_width, menu_bar->m_height); menu_bar->SetInvokingWindow(active_child_frame); } } @@ -195,11 +191,11 @@ void wxMDIParentFrame::OnInternalIdle() { if (menu_bar->Show(true)) { - menu_bar->m_width = m_width; + GTKDoGetSize(&menu_bar->m_width, NULL); menu_bar->m_height = wxMENU_HEIGHT; gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), menu_bar->m_widget, - 0, 0, m_width, wxMENU_HEIGHT ); + 0, 0, menu_bar->m_width, menu_bar->m_height); menu_bar->SetInvokingWindow( child_frame ); } visible_child_menu = true; @@ -231,20 +227,15 @@ void wxMDIParentFrame::OnInternalIdle() m_frameMenuBar->Show( true ); m_frameMenuBar->SetInvokingWindow( this ); - m_frameMenuBar->m_width = m_width; + GTKDoGetSize(&m_frameMenuBar->m_width, NULL); m_frameMenuBar->m_height = wxMENU_HEIGHT; gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), m_frameMenuBar->m_widget, - 0, 0, m_width, wxMENU_HEIGHT ); + 0, 0, m_frameMenuBar->m_width, m_frameMenuBar->m_height); } } } -void wxMDIParentFrame::DoGetClientSize(int *width, int *height ) const -{ - wxFrame::DoGetClientSize( width, height ); -} - wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const { if (!m_clientWindow) return (wxMDIChildFrame*) NULL; @@ -261,12 +252,17 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const 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 ); - 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; + node = node->GetNext(); } @@ -296,6 +292,18 @@ void wxMDIParentFrame::ActivatePrevious() 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 //----------------------------------------------------------------------------- @@ -339,19 +347,22 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent, 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 ) @@ -372,9 +383,11 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) m_menuBar->SetParent( mdi_frame ); /* insert the invisible menu bar into the _parent_ mdi frame */ + int w; + mdi_frame->GTKDoGetSize(&w, NULL); gtk_pizza_put( GTK_PIZZA(mdi_frame->m_mainWidget), m_menuBar->m_widget, - 0, 0, mdi_frame->m_width, wxMENU_HEIGHT ); + 0, 0, w, wxMENU_HEIGHT); } } @@ -399,7 +412,7 @@ void wxMDIChildFrame::OnMenuHighlight( wxMenuEvent& event ) { #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? @@ -425,10 +438,8 @@ void wxMDIChildFrame::SetTitle( const wxString &title ) //----------------------------------------------------------------------------- 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) && @@ -446,9 +457,10 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* // 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() ); @@ -461,9 +473,9 @@ 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); + 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; } @@ -489,9 +501,7 @@ wxMDIClientWindow::~wxMDIClientWindow() 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") )) @@ -516,4 +526,4 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) return true; } -#endif +#endif // wxUSE_MDI