// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "mdi.h"
#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#include "wx/mdi.h"
+#include "wx/notebook.h"
-#if wxUSE_MDI_ARCHITECTURE
+#if wxUSE_MDI
#include "wx/dialog.h"
#include "wx/menu.h"
#include "wx/intl.h"
+#include "wx/gtk/private.h"
#include <glib.h>
#include <gdk/gdk.h>
// "switch_page"
//-----------------------------------------------------------------------------
+extern "C" {
static void
gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
GtkNotebookPage *page,
wxMDIChildFrame *child = parent->GetActiveChild();
if (child)
{
- wxActivateEvent event1( wxEVT_ACTIVATE, FALSE, child->GetId() );
+ wxActivateEvent event1( wxEVT_ACTIVATE, false, child->GetId() );
event1.SetEventObject( child);
child->GetEventHandler()->ProcessEvent( event1 );
}
child = (wxMDIChildFrame*) NULL;
- wxNode *node = client_window->GetChildren().First();
+ wxWindowList::compatibility_iterator node = client_window->GetChildren().GetFirst();
while (node)
{
- wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
+ wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
+ // CE: we come here in the destructor with a null child_frame - I think because
+ // gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", (see below)
+ // isn't deleted early enough
+ if (!child_frame)
+ return ;
+
if (child_frame->m_page == page)
{
child = child_frame;
break;
}
- node = node->Next();
+ node = node->GetNext();
}
if (!child)
return;
- wxActivateEvent event2( wxEVT_ACTIVATE, TRUE, child->GetId() );
+ wxActivateEvent event2( wxEVT_ACTIVATE, true, child->GetId() );
event2.SetEventObject( child);
child->GetEventHandler()->ProcessEvent( event2 );
}
+}
//-----------------------------------------------------------------------------
// wxMDIParentFrame
void wxMDIParentFrame::Init()
{
- m_justInserted = FALSE;
+ m_justInserted = false;
m_clientWindow = (wxMDIClientWindow *) NULL;
}
OnCreateClient();
- return TRUE;
+ return true;
}
void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 );
- m_justInserted = FALSE;
+ /* need to set the menubar of the child */
+ wxMDIChildFrame *active_child_frame = GetActiveChild();
+ if (active_child_frame != NULL)
+ {
+ 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);
+ }
+ }
+ m_justInserted = false;
return;
}
wxFrame::OnInternalIdle();
wxMDIChildFrame *active_child_frame = GetActiveChild();
- bool visible_child_menu = FALSE;
+ bool visible_child_menu = false;
- wxNode *node = m_clientWindow->GetChildren().First();
+ wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();
while (node)
{
- wxObject *child = node->Data();
- wxMDIChildFrame *child_frame = wxDynamicCast(child, wxMDIChildFrame);
+ wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
+
if ( child_frame )
{
wxMenuBar *menu_bar = child_frame->m_menuBar;
{
if (child_frame == active_child_frame)
{
- if (menu_bar->Show(TRUE))
+ if (menu_bar->Show(true))
{
menu_bar->m_width = m_width;
menu_bar->m_height = wxMENU_HEIGHT;
0, 0, m_width, wxMENU_HEIGHT );
menu_bar->SetInvokingWindow( child_frame );
}
- visible_child_menu = TRUE;
+ visible_child_menu = true;
}
else
{
- if (menu_bar->Show(FALSE))
+ if (menu_bar->Show(false))
{
menu_bar->UnsetInvokingWindow( child_frame );
}
}
}
- node = node->Next();
+ node = node->GetNext();
}
/* show/hide parent menu bar as required */
{
if (visible_child_menu)
{
- m_frameMenuBar->Show( FALSE );
+ m_frameMenuBar->Show( false );
m_frameMenuBar->UnsetInvokingWindow( this );
}
else
{
- m_frameMenuBar->Show( TRUE );
+ m_frameMenuBar->Show( true );
m_frameMenuBar->SetInvokingWindow( this );
m_frameMenuBar->m_width = m_width;
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->GetChildren().First();
+ wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();
while (node)
{
- wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
+ wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
+
+ wxASSERT_MSG( child_frame, _T("child is not a wxMDIChildFrame") );
+
if (child_frame->m_page == page)
return child_frame;
- node = node->Next();
+ node = node->GetNext();
}
return (wxMDIChildFrame*) NULL;
{
m_menuBar = (wxMenuBar *) NULL;
m_page = (GtkNotebookPage *) NULL;
- m_isFrame = FALSE;
}
wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
{
m_menuBar = (wxMenuBar *) NULL;
m_page = (GtkNotebookPage *) NULL;
- m_isFrame = FALSE;
Create( parent, id, title, wxDefaultPosition, size, style, name );
}
{
if (m_menuBar)
delete m_menuBar;
-}
+}
bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
wxWindowID id, const wxString& title,
return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
}
+void wxMDIChildFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
+{
+ 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::Activate()
{
-#if defined(__WXGTK20__) || (GTK_MINOR_VERSION > 0)
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 );
-#else // GTK+ 1.0
- // 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) )
wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
- gtk_notebook_set_tab_label_text(notebook, m_widget, title.mbc_str());
+ 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();
win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
}
+}
//-----------------------------------------------------------------------------
// InsertChild callback for wxMDIClientWindow
child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->GetParent();
- parent_frame->m_justInserted = TRUE;
+ parent_frame->m_justInserted = true;
}
//-----------------------------------------------------------------------------
wxMDIClientWindow::~wxMDIClientWindow()
{
+
}
bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
{
- m_needParent = TRUE;
+ m_needParent = true;
m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
{
wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );
- return FALSE;
+ return false;
}
m_widget = gtk_notebook_new();
PostCreation();
- Show( TRUE );
+ Show( true );
- return TRUE;
+ return true;
}
#endif
projects / wxWidgets.git / blobdiff