X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/865bb3251ecf83ddac350b734f4fed1d258e250b..16487a6fde0a205051f4a8a573ef5da2158f4d83:/src/gtk/mdi.cpp diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index ddd65e82be..ef4c027e25 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: mdi.cpp +// Name: src/gtk/mdi.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,46 +7,19 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "mdi.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/mdi.h" -#include "wx/notebook.h" - #if wxUSE_MDI -#include "wx/dialog.h" -#include "wx/menu.h" -#include "wx/intl.h" -#include "wx/gtk/private.h" - -#include -#include -#include -#include "wx/gtk/win_gtk.h" - -//----------------------------------------------------------------------------- -// constants -//----------------------------------------------------------------------------- - -const int wxMENU_HEIGHT = 27; - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#include "wx/mdi.h" -//----------------------------------------------------------------------------- -// globals -//----------------------------------------------------------------------------- +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/menu.h" +#endif -extern wxList wxPendingDelete; +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // "switch_page" @@ -59,9 +32,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(); @@ -69,7 +39,7 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget), { wxActivateEvent event1( wxEVT_ACTIVATE, false, child->GetId() ); event1.SetEventObject( child); - child->GetEventHandler()->ProcessEvent( event1 ); + child->HandleWindowEvent( event1 ); } // send activate event to new child @@ -81,16 +51,14 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget), child = (wxMDIChildFrame*) NULL; wxWindowList::compatibility_iterator node = client_window->GetChildren().GetFirst(); - while (node) + while ( node ) { 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_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 ) { child = child_frame; break; @@ -103,7 +71,7 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget), wxActivateEvent event2( wxEVT_ACTIVATE, true, child->GetId() ); event2.SetEventObject( child); - child->GetEventHandler()->ProcessEvent( event2 ); + child->HandleWindowEvent( event2 ); } } @@ -138,26 +106,6 @@ bool wxMDIParentFrame::Create(wxWindow *parent, return true; } -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; - - 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; - gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), - menu_bar->m_widget, - 0, 0, m_width, wxMENU_HEIGHT ); -} - void wxMDIParentFrame::OnInternalIdle() { /* if a an MDI child window has just been inserted @@ -168,7 +116,7 @@ void wxMDIParentFrame::OnInternalIdle() if (m_justInserted) { GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget); - gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 ); + gtk_notebook_set_current_page( notebook, g_list_length( notebook->children ) - 1 ); /* need to set the menubar of the child */ wxMDIChildFrame *active_child_frame = GetActiveChild(); @@ -177,11 +125,6 @@ void wxMDIParentFrame::OnInternalIdle() 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); } } @@ -208,11 +151,6 @@ void wxMDIParentFrame::OnInternalIdle() { 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; @@ -243,19 +181,29 @@ void wxMDIParentFrame::OnInternalIdle() { 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::DoGetClientSize(int *width, int *height ) const +void wxMDIParentFrame::DoGetClientSize(int* width, int* height) const { - wxFrame::DoGetClientSize( width, height ); + wxFrame::DoGetClientSize(width, height); + + if (height) + { + wxMDIChildFrame* active_child_frame = GetActiveChild(); + if (active_child_frame) + { + wxMenuBar* menubar = active_child_frame->m_menuBar; + if (menubar && menubar->IsShown()) + { + GtkRequisition req; + gtk_widget_size_request(menubar->m_widget, &req); + *height -= req.height; + if (*height < 0) *height = 0; + } + } + } } wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const @@ -274,12 +222,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(); } @@ -340,7 +293,7 @@ wxMDIChildFrame::~wxMDIChildFrame() { if (m_menuBar) delete m_menuBar; -} +} bool wxMDIChildFrame::Create( wxMDIParentFrame *parent, wxWindowID id, const wxString& title, @@ -352,19 +305,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 ) @@ -385,9 +341,18 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) m_menuBar->SetParent( mdi_frame ); /* insert the invisible menu bar into the _parent_ mdi frame */ - gtk_pizza_put( GTK_PIZZA(mdi_frame->m_mainWidget), - m_menuBar->m_widget, - 0, 0, mdi_frame->m_width, wxMENU_HEIGHT ); + m_menuBar->Show(false); + gtk_box_pack_start(GTK_BOX(mdi_frame->m_mainWidget), m_menuBar->m_widget, false, false, 0); + gtk_box_reorder_child(GTK_BOX(mdi_frame->m_mainWidget), m_menuBar->m_widget, 0); + + gulong handler_id = g_signal_handler_find( + m_menuBar->m_widget, + GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA), + g_signal_lookup("size_request", GTK_TYPE_WIDGET), + 0, NULL, NULL, m_menuBar); + if (handler_id != 0) + g_signal_handler_disconnect(m_menuBar->m_widget, handler_id); + gtk_widget_set_size_request(m_menuBar->m_widget, -1, -1); } } @@ -401,7 +366,7 @@ void wxMDIChildFrame::Activate() wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent(); GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget); gint pageno = gtk_notebook_page_num( notebook, m_widget ); - gtk_notebook_set_page( notebook, pageno ); + gtk_notebook_set_current_page( notebook, pageno ); } void wxMDIChildFrame::OnActivate( wxActivateEvent& WXUNUSED(event) ) @@ -412,7 +377,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? @@ -433,50 +398,26 @@ void wxMDIChildFrame::SetTitle( const wxString &title ) gtk_notebook_set_tab_label_text(notebook, m_widget, wxGTK_CONV( title ) ); } -//----------------------------------------------------------------------------- -// "size_allocate" -//----------------------------------------------------------------------------- - -extern "C" { -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) && - (win->m_height == alloc->height) && - (win->m_sizeSet)) - { - return; - } - - win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height ); -} -} - //----------------------------------------------------------------------------- // InsertChild callback for wxMDIClientWindow //----------------------------------------------------------------------------- -static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child ) +static void wxInsertChildInMDI(wxWindow* parent, wxWindow* child) { - wxString s = child->m_title; + 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 ); - gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate", - GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child ); - GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_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; } @@ -502,12 +443,10 @@ 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, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") )) + !CreateBase( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") )) { wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") ); return false; @@ -515,8 +454,8 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) m_widget = gtk_notebook_new(); - gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", - GTK_SIGNAL_FUNC(gtk_mdi_page_change_callback), (gpointer)parent ); + g_signal_connect (m_widget, "switch_page", + G_CALLBACK (gtk_mdi_page_change_callback), parent); gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); @@ -529,4 +468,4 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) return true; } -#endif +#endif // wxUSE_MDI