X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ca41e57f48db4c1a2de7ae67c7e4b655d9809af..d38ceae8b9d776425a058e9b652ca143cd049a2f:/src/gtk1/mdi.cpp diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp index 8b5f30689b..064376b54c 100644 --- a/src/gtk1/mdi.cpp +++ b/src/gtk1/mdi.cpp @@ -14,61 +14,31 @@ #include "wx/mdi.h" #include "wx/dialog.h" #include "wx/menu.h" -#include "wx/gtk/win_gtk.h" #include -//----------------------------------------------------------------------------- -// constants -//----------------------------------------------------------------------------- - -const int wxMENU_HEIGHT = 30; +#include "glib.h" +#include "gdk/gdk.h" +#include "gtk/gtk.h" +#include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- -// globals +// constants //----------------------------------------------------------------------------- -extern wxList wxPendingDelete; +const int wxMENU_HEIGHT = 27; //----------------------------------------------------------------------------- -// "size_allocate" +// idle system //----------------------------------------------------------------------------- -static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) -{ - if ((win->m_x == alloc->x) && - (win->m_y == alloc->y) && - (win->m_width == alloc->width) && - (win->m_height == alloc->height)) - { - return; - } - - win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height ); -} +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; //----------------------------------------------------------------------------- -// page change callback +// globals //----------------------------------------------------------------------------- -static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget), - GtkNotebookPage *page, - gint WXUNUSED(nPage), - wxMDIClientWindow *client_win ) -{ - wxNode *node = client_win->m_children.First(); - while (node) - { - wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data(); - if (child_frame->m_page == page) - { - wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)client_win->m_parent; - mdi_frame->m_currentChild = child_frame; - mdi_frame->SetMDIMenuBar( child_frame->m_menuBar ); - return; - } - node = node->Next(); - } -} +extern wxList wxPendingDelete; //----------------------------------------------------------------------------- // wxMDIParentFrame @@ -79,11 +49,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame) BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame) END_EVENT_TABLE() -wxMDIParentFrame::wxMDIParentFrame(void) +wxMDIParentFrame::wxMDIParentFrame() { - m_clientWindow = (wxMDIClientWindow *) NULL; - m_currentChild = (wxMDIChildFrame *) NULL; - m_parentFrameActive = TRUE; + m_justInserted = FALSE; + m_clientWindow = (wxMDIClientWindow *) NULL; } wxMDIParentFrame::wxMDIParentFrame( wxWindow *parent, @@ -91,13 +60,12 @@ wxMDIParentFrame::wxMDIParentFrame( wxWindow *parent, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) { - m_clientWindow = (wxMDIClientWindow *) NULL; - m_currentChild = (wxMDIChildFrame *) NULL; - m_parentFrameActive = TRUE; - Create( parent, id, title, pos, size, style, name ); + m_justInserted = FALSE; + m_clientWindow = (wxMDIClientWindow *) NULL; + Create( parent, id, title, pos, size, style, name ); } -wxMDIParentFrame::~wxMDIParentFrame(void) +wxMDIParentFrame::~wxMDIParentFrame() { } @@ -106,71 +74,129 @@ bool wxMDIParentFrame::Create( wxWindow *parent, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) { - wxFrame::Create( parent, id, title, pos, size, style, name ); + wxFrame::Create( parent, id, title, pos, size, style, name ); - OnCreateClient(); + OnCreateClient(); - return TRUE; + return TRUE; } void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height ) { - wxFrame::GtkOnSize( x, y, width, height ); - - if (m_mdiMenuBar) - { - int x = 0; - int y = 0; - GetClientSize( &x, &y ); - m_mdiMenuBar->SetSize( 1, 1, x-2, wxMENU_HEIGHT-2, wxSIZE_NO_ADJUSTMENTS ); - } + 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_myfixed_move( GTK_MYFIXED(m_mainWidget), menu_bar->m_widget, 0, 0 ); + gtk_widget_set_usize( menu_bar->m_widget, m_width, wxMENU_HEIGHT ); } -void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar ) +void wxMDIParentFrame::OnInternalIdle() { - if (m_mdiMenuBar) m_mdiMenuBar->Show( FALSE ); - m_mdiMenuBar = menu_bar; - if (m_mdiMenuBar) - { - int x = 0; - int y = 0; - GetClientSize( &x, &y ); - m_mdiMenuBar->SetSize( 1, 1, x-2, wxMENU_HEIGHT-2, wxSIZE_NO_ADJUSTMENTS ); - m_mdiMenuBar->Show( TRUE ); - } + /* if a an MDI child window has just been inserted + it has to be brought to the top in idle time. we + simply set the last notebook page active as new + pages can only be appended at the end */ + + 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; + } + + wxFrame::OnInternalIdle(); + + wxMDIChildFrame *active_child_frame = GetActiveChild(); + bool visible_child_menu = FALSE; + + wxNode *node = m_clientWindow->m_children.First(); + 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 ); + visible_child_menu = TRUE; + } + 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 ); } void wxMDIParentFrame::GetClientSize(int *width, int *height ) const { - wxFrame::GetClientSize( width, height ); + wxFrame::GetClientSize( width, height ); } -wxMDIChildFrame *wxMDIParentFrame::GetActiveChild(void) const +wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const { - return m_currentChild; + if (!m_clientWindow) 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 ); +#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); + if (!page) return (wxMDIChildFrame*) NULL; + + wxNode *node = m_clientWindow->m_children.First(); + while (node) + { + wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data(); + if (child_frame->m_page == page) + return child_frame; + node = node->Next(); + } + + return (wxMDIChildFrame*) NULL; } -wxMDIClientWindow *wxMDIParentFrame::GetClientWindow(void) const +wxMDIClientWindow *wxMDIParentFrame::GetClientWindow() const { - return m_clientWindow; + return m_clientWindow; } -wxMDIClientWindow *wxMDIParentFrame::OnCreateClient(void) +wxMDIClientWindow *wxMDIParentFrame::OnCreateClient() { - m_clientWindow = new wxMDIClientWindow( this ); - return m_clientWindow; + m_clientWindow = new wxMDIClientWindow( this ); + return m_clientWindow; } -void wxMDIParentFrame::ActivateNext(void) +void wxMDIParentFrame::ActivateNext() { - if (m_clientWindow) - gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->m_widget) ); + if (m_clientWindow) + gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->m_widget) ); } -void wxMDIParentFrame::ActivatePrevious(void) +void wxMDIParentFrame::ActivatePrevious() { - if (m_clientWindow) - gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) ); + if (m_clientWindow) + gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) ); } void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) ) @@ -186,15 +212,15 @@ void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(eve //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxFrame) - + BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame) - EVT_ACTIVATE(wxMDIChildFrame::OnActivate) + EVT_ACTIVATE(wxMDIChildFrame::OnActivate) END_EVENT_TABLE() -wxMDIChildFrame::wxMDIChildFrame(void) +wxMDIChildFrame::wxMDIChildFrame() { - m_menuBar = (wxMenuBar *) NULL; - m_page = (GtkNotebookPage *) NULL; + m_menuBar = (wxMenuBar *) NULL; + m_page = (GtkNotebookPage *) NULL; } wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent, @@ -202,23 +228,15 @@ wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent, const wxPoint& WXUNUSED(pos), const wxSize& size, long style, const wxString& name ) { - m_menuBar = (wxMenuBar *) NULL; - m_page = (GtkNotebookPage *) NULL; - Create( parent, id, title, wxDefaultPosition, size, style, name ); + m_menuBar = (wxMenuBar *) NULL; + m_page = (GtkNotebookPage *) NULL; + Create( parent, id, title, wxDefaultPosition, size, style, name ); } -wxMDIChildFrame::~wxMDIChildFrame(void) +wxMDIChildFrame::~wxMDIChildFrame() { - if (m_menuBar) - { - wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent; - if (mdi_frame->m_currentChild == this) - { - mdi_frame->SetMDIMenuBar( (wxMenuBar *) NULL ); - mdi_frame->m_currentChild = (wxMDIChildFrame *) NULL; - } - delete m_menuBar; - } + if (m_menuBar) + delete m_menuBar; } bool wxMDIChildFrame::Create( wxMDIParentFrame *parent, @@ -226,67 +244,70 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent, const wxPoint& WXUNUSED(pos), const wxSize& size, long style, const wxString& name ) { - m_title = title; - - return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name ); + m_title = title; + + return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name ); } void wxMDIChildFrame::GetClientSize( int *width, int *height ) const { - wxWindow::GetClientSize( width, height ); + wxWindow::GetClientSize( width, height ); } void wxMDIChildFrame::AddChild( wxWindow *child ) { - wxWindow::AddChild( child ); + wxWindow::AddChild( child ); } - + static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) { - menu->SetInvokingWindow( win ); - wxNode *node = menu->m_items.First(); - while (node) - { - wxMenuItem *menuitem = (wxMenuItem*)node->Data(); - if (menuitem->IsSubMenu()) - SetInvokingWindow( menuitem->GetSubMenu(), win ); - node = node->Next(); - } + 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(); + } } void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) { - m_menuBar = menu_bar; - - if (m_menuBar) - { - wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent; + m_menuBar = menu_bar; - if (m_menuBar->m_parent != this) + if (m_menuBar) { - wxNode *node = m_menuBar->m_menus.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->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; + } + + /* the menu bar of the child window is shown in idle time as needed */ + gtk_widget_hide( m_menuBar->m_widget ); + + /* 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 ); } - mdi_frame->SetMDIMenuBar( m_menuBar ); - - gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_wxwindow), - m_menuBar->m_widget, m_menuBar->m_x, m_menuBar->m_y ); - } } -wxMenuBar *wxMDIChildFrame::GetMenuBar() +wxMenuBar *wxMDIChildFrame::GetMenuBar() const { - return m_menuBar; + return m_menuBar; } -void wxMDIChildFrame::Activate(void) +void wxMDIChildFrame::Activate() { } @@ -294,30 +315,49 @@ void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) ) { } +//----------------------------------------------------------------------------- +// "size_allocate" +//----------------------------------------------------------------------------- + +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 ) { - 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 ); - gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 ); + 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 ); + gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate", + GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child ); - child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data); + GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget); - gtk_notebook_set_page( notebook, parent->m_children.Number()-1 ); - - gtk_page_change_callback( (GtkNotebook *) NULL, child->m_page, 0, parent ); + 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; + parent_frame->m_justInserted = TRUE; } //----------------------------------------------------------------------------- @@ -326,41 +366,40 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow,wxWindow) -wxMDIClientWindow::wxMDIClientWindow(void) +wxMDIClientWindow::wxMDIClientWindow() { } wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style ) { - CreateClient( parent, style ); + CreateClient( parent, style ); } -wxMDIClientWindow::~wxMDIClientWindow(void) +wxMDIClientWindow::~wxMDIClientWindow() { } bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) { - m_needParent = TRUE; - - m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI; + m_needParent = TRUE; + + m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI; + + PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" ); - PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" ); + 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_page_change_callback), (gpointer)this ); + m_parent->AddChild( this ); - gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); + (m_parent->m_insertCallback)( m_parent, this ); - gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x, m_y ); - - PostCreation(); + PostCreation(); - Show( TRUE ); + Show( TRUE ); - return TRUE; + return TRUE; }