X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3e65dac0c4e7ad19e3c270caa1e0eea138e5d8d..64a1451536e1917c240a8377c7672ea155e7681d:/src/gtk1/mdi.cpp diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp index 4428a9edad..4f71cc31cf 100644 --- a/src/gtk1/mdi.cpp +++ b/src/gtk1/mdi.cpp @@ -5,7 +5,7 @@ // Created: 01/02/97 // Id: // Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -14,7 +14,9 @@ #include "wx/mdi.h" #include "wx/dialog.h" +#include "wx/menu.h" #include "wx/gtk/win_gtk.h" +#include //----------------------------------------------------------------------------- @@ -25,7 +27,7 @@ extern wxList wxPendingDelete; //----------------------------------------------------------------------------- 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) && @@ -33,7 +35,7 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* { return; }; - + win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height ); }; @@ -93,22 +95,22 @@ bool wxMDIParentFrame::Create( wxWindow *parent, long style, const wxString& name ) { wxFrame::Create( parent, id, title, pos, size, style, name ); - + OnCreateClient(); - + 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, 26 ); + m_mdiMenuBar->SetSize( 1, 1, x-2, 26 ); } }; @@ -121,7 +123,7 @@ void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar ) int x = 0; int y = 0; GetClientSize( &x, &y ); - m_mdiMenuBar->SetSize( 1, 1, x-2, 26 ); + m_mdiMenuBar->SetSize( 1, 1, x-2, 26 ); m_mdiMenuBar->Show( TRUE ); } }; @@ -171,11 +173,10 @@ void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(eve // wxMDIChildFrame //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxPanel) +IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxFrame) -BEGIN_EVENT_TABLE(wxMDIChildFrame, wxPanel) - EVT_CLOSE(wxMDIChildFrame::OnCloseWindow) - EVT_SIZE(wxMDIChildFrame::OnSize) +BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame) + EVT_ACTIVATE(wxMDIChildFrame::OnActivate) END_EVENT_TABLE() wxMDIChildFrame::wxMDIChildFrame(void) @@ -214,54 +215,19 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent, long style, const wxString& name ) { m_title = title; - return wxPanel::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name ); -}; - -void wxMDIChildFrame::OnCloseWindow( wxCloseEvent &event ) -{ - if ( GetEventHandler()->OnClose() || event.GetForce()) - { - this->Destroy(); - } + return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name ); }; -void wxMDIChildFrame::OnSize( wxSizeEvent &WXUNUSED(event) ) +void wxMDIChildFrame::GetClientSize( int *width, int *height ) const { - if ( GetAutoLayout() ) - Layout(); - else { - // no child: go out ! - if (!GetChildren()->First()) - return; - - // do we have exactly one child? - wxWindow *child = NULL; - for(wxNode *node = GetChildren()->First(); node; node = node->Next()) - { - wxWindow *win = (wxWindow *)node->Data(); - if (!IS_KIND_OF(win,wxFrame) && !IS_KIND_OF(win,wxDialog)) - { - if ( child ) // it's the second one: do nothing - return; - - child = win; - }; - }; + wxWindow::GetClientSize( width, height ); +} - // yes: set it's size to fill all the frame - int client_x, client_y; - GetClientSize(&client_x, &client_y); - child->SetSize( 1, 1, client_x-2, client_y); - } -}; -bool wxMDIChildFrame::Destroy(void) +void wxMDIChildFrame::AddChild( wxWindow *child ) { - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); - - return TRUE; + wxWindow::AddChild( child ); } - + static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) { menu->SetInvokingWindow( win ); @@ -278,11 +244,11 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) { m_menuBar = menu_bar; - + if (m_menuBar) { wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent; - + if (m_menuBar->m_parent != this) { wxNode *node = m_menuBar->m_menus.First(); @@ -292,7 +258,7 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) SetInvokingWindow( menu, this ); node = node->Next(); }; - + m_menuBar->m_parent = mdi_frame; } mdi_frame->SetMDIMenuBar( m_menuBar ); @@ -302,10 +268,19 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) } }; +wxMenuBar *wxMDIChildFrame::GetMenuBar() +{ + return m_menuBar; +}; + void wxMDIChildFrame::Activate(void) { }; +void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) ) +{ +}; + //----------------------------------------------------------------------------- // wxMDIClientWindow //----------------------------------------------------------------------------- @@ -328,20 +303,20 @@ wxMDIClientWindow::~wxMDIClientWindow(void) bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) { m_needParent = TRUE; - + PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" ); m_widget = gtk_notebook_new(); - + gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", GTK_SIGNAL_FUNC(gtk_page_change_callback), (gpointer)this ); - + gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); - + PostCreation(); - + Show( TRUE ); - + return TRUE; }; @@ -352,26 +327,28 @@ void wxMDIClientWindow::AddChild( wxWindow *child ) wxFAIL_MSG("wxNotebook::AddChild: Child has to be wxMDIChildFrame"); return; }; - + m_children.Append( child ); - + wxString s; wxMDIChildFrame* mdi_child = (wxMDIChildFrame*) child; s = mdi_child->m_title; - if (s.IsNull()) s = "MDI child"; - + if (s.IsNull()) s = _("MDI child"); + GtkWidget *label_widget; label_widget = gtk_label_new( s ); 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 ); gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), child->m_widget, label_widget ); - + mdi_child->m_page = (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data); - + gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), m_children.Number()-1 ); + + gtk_page_change_callback( NULL, mdi_child->m_page, 0, this ); };