X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2053b27b318fe81918a72c838944d1e8cd1524f..c19b738e74e01e7301aec7815b5bac9782b3c9db:/src/gtk/mdi.cpp?ds=sidebyside diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index a6e4317bcf..999be74c6e 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -12,13 +12,17 @@ #endif #include "wx/mdi.h" + +#if wxUSE_MDI_ARCHITECTURE + #include "wx/dialog.h" #include "wx/menu.h" -#include +#include "wx/intl.h" +#include "wx/gtk/private.h" -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include +#include #include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- @@ -41,38 +45,79 @@ extern bool g_isIdle; extern wxList wxPendingDelete; //----------------------------------------------------------------------------- -// wxMDIParentFrame +// "switch_page" //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame) +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(); -BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame) -END_EVENT_TABLE() + // send deactivate event to old child -wxMDIParentFrame::wxMDIParentFrame() -{ - m_justInserted = FALSE; - m_clientWindow = (wxMDIClientWindow *) NULL; + 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( wxWindow *parent, - wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name ) +//----------------------------------------------------------------------------- +// wxMDIParentFrame +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame) + +void wxMDIParentFrame::Init() { m_justInserted = FALSE; m_clientWindow = (wxMDIClientWindow *) NULL; - Create( parent, id, title, pos, size, style, name ); } wxMDIParentFrame::~wxMDIParentFrame() { } -bool wxMDIParentFrame::Create( wxWindow *parent, - wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name ) +bool wxMDIParentFrame::Create(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name ) { wxFrame::Create( parent, id, title, pos, size, style, name ); @@ -92,10 +137,12 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height ) if (!menu_bar) return; if (!menu_bar->m_widget) return; - menu_bar->InternalSetPosition(0, 0); - menu_bar->InternalSetSize(m_width, wxMENU_HEIGHT); - gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), - menu_bar->m_widget, + 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 ); } @@ -123,27 +170,65 @@ void wxMDIParentFrame::OnInternalIdle() wxNode *node = m_clientWindow->GetChildren().First(); while (node) { - wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data(); - if (child_frame->m_menuBar) + wxObject *child = node->Data(); + wxMDIChildFrame *child_frame = wxDynamicCast(child, wxMDIChildFrame); + if ( child_frame ) { - if (child_frame == active_child_frame) + wxMenuBar *menu_bar = child_frame->m_menuBar; + if ( menu_bar ) { - gtk_widget_show( child_frame->m_menuBar->m_widget ); - visible_child_menu = TRUE; + 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 ); + } + } } - else - gtk_widget_hide( child_frame->m_menuBar->m_widget ); } + node = node->Next(); } /* show/hide parent menu bar as required */ - if (m_frameMenuBar) m_frameMenuBar->Show( !visible_child_menu ); + 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::DoGetClientSize(int *width, int *height ) const { - wxFrame::GetClientSize( width, height ); + wxFrame::DoGetClientSize( width, height ); } wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const @@ -153,11 +238,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const 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 ); -#else - gint i = gtk_notebook_current_page( notebook ); -#endif if (i < 0) return (wxMDIChildFrame*) NULL; GtkNotebookPage* page = (GtkNotebookPage*) (g_list_nth(notebook->children,i)->data); @@ -198,14 +279,6 @@ void wxMDIParentFrame::ActivatePrevious() gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) ); } -void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) ) -{ -} - -void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(event) ) -{ -} - //----------------------------------------------------------------------------- // wxMDIChildFrame //----------------------------------------------------------------------------- @@ -214,6 +287,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxFrame) BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame) EVT_ACTIVATE(wxMDIChildFrame::OnActivate) + EVT_MENU_HIGHLIGHT_ALL(wxMDIChildFrame::OnMenuHighlight) END_EVENT_TABLE() wxMDIChildFrame::wxMDIChildFrame() @@ -248,56 +322,41 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent, return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name ); } -void wxMDIChildFrame::GetClientSize( int *width, int *height ) const +void wxMDIChildFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags ) { - wxWindow::GetClientSize( width, height ); + wxWindow::DoSetSize( x, y, width, height, sizeFlags ); } -void wxMDIChildFrame::AddChild( wxWindow *child ) +void wxMDIChildFrame::DoSetClientSize(int width, int height) { - wxWindow::AddChild( child ); + wxWindow::DoSetClientSize( width, height ); } -static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) +void wxMDIChildFrame::DoGetClientSize( int *width, int *height ) const { - 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::DoGetClientSize( width, height ); +} + +void wxMDIChildFrame::AddChild( wxWindowBase *child ) +{ + wxWindow::AddChild(child); } void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) { + wxASSERT_MSG( m_menuBar == NULL, wxT("Only one menubar allowed") ); + m_menuBar = menu_bar; if (m_menuBar) { wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent(); - if (m_menuBar->GetParent() != this) - { - wxNode *node = m_menuBar->GetMenus().First(); - while (node) - { - wxMenu *menu = (wxMenu*)node->Data(); - SetInvokingWindow( menu, this ); - node = node->Next(); - } - - m_menuBar->SetParent( mdi_frame ); - } - - /* 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 */ - gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_mainWidget), - m_menuBar->m_widget, + gtk_pizza_put( GTK_PIZZA(mdi_frame->m_mainWidget), + m_menuBar->m_widget, 0, 0, mdi_frame->m_width, wxMENU_HEIGHT ); } } @@ -309,10 +368,39 @@ wxMenuBar *wxMDIChildFrame::GetMenuBar() const 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 ); +} + +void wxMDIChildFrame::OnActivate( wxActivateEvent& WXUNUSED(event) ) +{ +} + +void wxMDIChildFrame::OnMenuHighlight( wxMenuEvent& event ) +{ +#if wxUSE_STATUSBAR + wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent(); + if ( !ShowMenuHelp(mdi_frame->GetStatusBar(), event.GetMenuId()) ) + { + // we don't have any help text for this item, but may be the MDI frame + // does? + mdi_frame->OnMenuHighlight(event); + } +#endif // wxUSE_STATUSBAR } -void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) ) +void wxMDIChildFrame::SetTitle( const wxString &title ) { + if ( title == m_title ) + return; + + m_title = title; + + wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent(); + GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget); + gtk_notebook_set_tab_label_text(notebook, m_widget, wxGTK_CONV( title ) ); } //----------------------------------------------------------------------------- @@ -385,10 +473,18 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) 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(); + gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", + GTK_SIGNAL_FUNC(gtk_mdi_page_change_callback), (gpointer)parent ); + gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); m_parent->DoAddChild( this ); @@ -400,3 +496,4 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) return TRUE; } +#endif