wxMenuBar *menu_bar = child_frame->m_menuBar;
if (!menu_bar) return;
- if (!menu_bar->GetHandle()) return;
+ if (!menu_bar->m_widget) return;
- menu_bar->InternalSetPosition(0, 0);
- menu_bar->InternalSetSize(m_width, wxMENU_HEIGHT);
+ menu_bar->m_x = 0;
+ menu_bar->m_y = 0;
+ menu_bar->m_width = m_width;
+ menu_bar->m_height = wxMENU_HEIGHT;
gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
- menu_bar->GetHandle(),
+ menu_bar->m_widget,
0, 0, m_width, wxMENU_HEIGHT );
}
if (m_justInserted)
{
- GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->GetHandle());
+ GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 );
m_justInserted = FALSE;
while (node)
{
wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
+ wxMenuBar *menu_bar = child_frame->m_menuBar;
if (child_frame->m_menuBar)
{
if (child_frame == active_child_frame)
{
- gtk_widget_show( child_frame->m_menuBar->GetHandle() );
- visible_child_menu = TRUE;
+ if (menu_bar->Show(TRUE))
+ {
+ menu_bar->m_width = m_width;
+ menu_bar->m_height = wxMENU_HEIGHT;
+ gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+ menu_bar->m_widget,
+ 0, 0, m_width, wxMENU_HEIGHT );
+ menu_bar->SetInvokingWindow( child_frame );
+ }
+ visible_child_menu = TRUE;
}
else
- gtk_widget_hide( child_frame->m_menuBar->GetHandle() );
+ {
+ if (menu_bar->Show(FALSE))
+ {
+ menu_bar->UnsetInvokingWindow( child_frame );
+ }
+ }
}
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_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+ m_frameMenuBar->m_widget,
+ 0, 0, m_width, wxMENU_HEIGHT );
+ }
+ }
}
void wxMDIParentFrame::GetClientSize(int *width, int *height ) const
{
if (!m_clientWindow) return (wxMDIChildFrame*) NULL;
- GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->GetHandle());
+ GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
if (!notebook) return (wxMDIChildFrame*) NULL;
#if (GTK_MINOR_VERSION > 0)
void wxMDIParentFrame::ActivateNext()
{
if (m_clientWindow)
- gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->GetHandle()) );
+ gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
}
void wxMDIParentFrame::ActivatePrevious()
{
if (m_clientWindow)
- gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->GetHandle()) );
+ gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
}
void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )
wxWindow::AddChild( child );
}
-static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
-{
- 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 )
{
+ wxASSERT_MSG( m_menuBar == NULL, _T("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->GetHandle() );
+ 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->GetHandle(),
- 0, 0, mdi_frame->GetWidth(), wxMENU_HEIGHT );
+ m_menuBar->m_widget,
+ 0, 0, mdi_frame->m_width, wxMENU_HEIGHT );
}
}
void wxMDIChildFrame::Activate()
{
+#if (GTK_MINOR_VERSION > 0)
+ wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
+ GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
+ gint pageno = gtk_notebook_page_num( notebook, m_page->child );
+ gtk_notebook_set_page( notebook, pageno );
+#else
+ // the only way I can see to do this under gtk+ 1.0.X would
+ // be to keep track of page numbers, start at first and
+ // do "next" enough times to get to this page number - messy
+ // - J. Russell Smyth
+#endif
}
void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) )
{
if (g_isIdle) wxapp_install_idle_handler();
- if ((win->GetX() == alloc->x) &&
- (win->GetY() == alloc->y) &&
- (win->GetWidth() == alloc->width) &&
- (win->GetHeight() == alloc->height) &&
- (win->IsSizeSet()))
+ 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;
}
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->GetHandle()), "size_allocate",
+ gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
- GtkNotebook *notebook = GTK_NOTEBOOK(parent->GetHandle());
+ GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);
- gtk_notebook_append_page( notebook, child->GetHandle(), label_widget );
+ gtk_notebook_append_page( notebook, child->m_widget, label_widget );
child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
projects / wxWidgets.git / blobdiff