#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/menu.h"
- #include "wx/dialog.h"
#endif
-#include "wx/notebook.h"
#include "wx/gtk/private.h"
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include "wx/gtk/win_gtk.h"
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-const int wxMENU_HEIGHT = 27;
-
-//-----------------------------------------------------------------------------
-// globals
-//-----------------------------------------------------------------------------
-
//-----------------------------------------------------------------------------
// "switch_page"
//-----------------------------------------------------------------------------
gint WXUNUSED(page_num),
wxMDIParentFrame *parent )
{
- if (g_isIdle)
- wxapp_install_idle_handler();
-
// send deactivate event to old child
wxMDIChildFrame *child = parent->GetActiveChild();
{
wxActivateEvent event1( wxEVT_ACTIVATE, false, child->GetId() );
event1.SetEventObject( child);
- child->GetEventHandler()->ProcessEvent( event1 );
+ child->HandleWindowEvent( event1 );
}
// send activate event to new child
wxActivateEvent event2( wxEVT_ACTIVATE, true, child->GetId() );
event2.SetEventObject( child);
- child->GetEventHandler()->ProcessEvent( event2 );
+ child->HandleWindowEvent( event2 );
}
}
long style,
const wxString& name )
{
- wxFrame::Create( parent, id, title, pos, size, style, name );
-
- OnCreateClient();
+ if ( !wxFrame::Create( parent, id, title, pos, size, style, name ) )
+ return false;
- return true;
-}
+ m_clientWindow = OnCreateClient();
-void wxMDIParentFrame::GtkOnSize()
-{
- wxFrame::GtkOnSize();
-
- 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 );
+ return m_clientWindow != NULL;
}
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);
}
}
{
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;
{
m_frameMenuBar->Show( true );
m_frameMenuBar->SetInvokingWindow( this );
+ }
+ }
+}
+
+void wxMDIParentFrame::DoGetClientSize(int* width, int* height) const
+{
+ wxFrame::DoGetClientSize(width, height);
- 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 );
+ 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;
+ }
}
}
}
wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
{
- m_clientWindow = new wxMDIClientWindow( this );
- return m_clientWindow;
+ return new wxMDIClientWindow( this );
}
void wxMDIParentFrame::ActivateNext()
{
if (m_menuBar)
delete m_menuBar;
+
+ // wxMDIClientWindow does not get redrawn properly after last child is removed
+ if (m_parent && m_parent->GetChildren().size() <= 1)
+ gtk_widget_queue_draw(m_parent->m_widget);
}
bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
wxWindow::DoSetSize( x, y, width, height, sizeFlags );
}
-void wxMDIChildFrame::DoSetClientSize(int width, int height)
-{
- wxWindow::DoSetClientSize( width, height );
-}
-
-void wxMDIChildFrame::DoGetClientSize( int *width, int *height ) const
-{
- wxWindow::DoGetClientSize( width, height );
-}
-
void wxMDIChildFrame::AddChild( wxWindowBase *child )
{
wxWindow::AddChild(child);
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);
}
}
{
#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?
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->GetTitle();
+ 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 );
- g_signal_connect (child->m_widget, "size_allocate",
- G_CALLBACK (gtk_page_size_callback), 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;
}
bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
{
- m_needParent = true;
-
- m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
+ m_insertCallback = wxInsertChildInMDI;
if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
!CreateBase( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
return true;
}
-#endif
+#endif // wxUSE_MDI
projects / wxWidgets.git / blobdiff