X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9390a202a8b9d67d393faf3e1323885e6a27c127..55e18dbe2faca047b2008734782d52a6eb140115:/src/gtk/frame.cpp diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index e47d0a2613..7e1ed2b2ba 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -7,650 +7,677 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ -#pragma implementation "frame.h" + #pragma implementation "frame.h" #endif -#include "wx/frame.h" +#include "wx/defs.h" + #include "wx/dialog.h" #include "wx/control.h" #include "wx/app.h" #include "wx/menu.h" -#include "wx/toolbar.h" -#include "wx/statusbr.h" +#if wxUSE_TOOLBAR + #include "wx/toolbar.h" +#endif +#if wxUSE_STATUSBAR + #include "wx/statusbr.h" +#endif #include "wx/dcclient.h" -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include "wx/gtk/private.h" + +#include +#include + #include "wx/gtk/win_gtk.h" -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // constants -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- -const int wxMENU_HEIGHT = 27; const int wxSTATUS_HEIGHT = 25; +const int wxPLACE_HOLDER = 0; -//----------------------------------------------------------------------------- -// data -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// idle system +// ---------------------------------------------------------------------------- -extern wxList wxTopLevelWindows; -extern wxList wxPendingDelete; - -//----------------------------------------------------------------------------- -// "size_allocate" -//----------------------------------------------------------------------------- +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; +extern int g_openDialogs; -static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win ) -{ - if (!win->HasVMT()) return; - -/* - printf( "OnFrameResize from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( ".\n" ); -*/ - - if ((win->m_width != alloc->width) || (win->m_height != alloc->height)) - { - win->m_sizeSet = FALSE; - win->m_width = alloc->width; - win->m_height = alloc->height; - } -} +// ---------------------------------------------------------------------------- +// event tables +// ---------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -// "delete_event" -//----------------------------------------------------------------------------- +IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) -static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win ) -{ -/* - printf( "OnDelete from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( ".\n" ); -*/ +// ============================================================================ +// implementation +// ============================================================================ - win->Close(); +// ---------------------------------------------------------------------------- +// GTK callbacks +// ---------------------------------------------------------------------------- - return TRUE; -} +#if wxUSE_MENUS_NATIVE //----------------------------------------------------------------------------- -// "configure_event" +// "child_attached" of menu bar //----------------------------------------------------------------------------- -static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win ) +static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { - if (!win->HasVMT()) return FALSE; - - win->m_x = event->x; - win->m_y = event->y; + if (!win->m_hasVMT) return; - return FALSE; + win->m_menuBarDetached = FALSE; + win->GtkUpdateSize(); } //----------------------------------------------------------------------------- -// wxFrame +// "child_detached" of menu bar //----------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxFrame, wxWindow) - EVT_SIZE(wxFrame::OnSize) - EVT_CLOSE(wxFrame::OnCloseWindow) -END_EVENT_TABLE() - -IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow) - -wxFrame::wxFrame() +static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { - m_frameMenuBar = (wxMenuBar *) NULL; - m_frameStatusBar = (wxStatusBar *) NULL; - m_frameToolBar = (wxToolBar *) NULL; - m_sizeSet = FALSE; - m_miniEdge = 0; - m_miniTitle = 0; -} + if (g_isIdle) + wxapp_install_idle_handler(); -wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, - const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) -{ - m_frameMenuBar = (wxMenuBar *) NULL; - m_frameStatusBar = (wxStatusBar *) NULL; - m_frameToolBar = (wxToolBar *) NULL; - m_sizeSet = FALSE; - m_miniEdge = 0; - m_miniTitle = 0; - Create( parent, id, title, pos, size, style, name ); -} - -bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, - const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) -{ - wxTopLevelWindows.Append( this ); + if (!win->m_hasVMT) return; - m_needParent = FALSE; + // Raise the client area area + gdk_window_raise( win->m_wxwindow->window ); - PreCreation( parent, id, pos, size, style, name ); - - m_title = title; - - GtkWindowType win_type = GTK_WINDOW_TOPLEVEL; - if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP; + win->m_menuBarDetached = TRUE; + win->GtkUpdateSize(); +} - m_widget = gtk_window_new( win_type ); +#endif // wxUSE_MENUS_NATIVE -#ifdef __WXDEBUG__ - debug_focus_in( m_widget, "wxFrame::m_widget", name ); -#endif - - if ((size.x != -1) && (size.y != -1)) - gtk_widget_set_usize( m_widget, m_width, m_height ); - if ((pos.x != -1) && (pos.y != -1)) - gtk_widget_set_uposition( m_widget, m_x, m_y ); +#if wxUSE_TOOLBAR +//----------------------------------------------------------------------------- +// "child_attached" of tool bar +//----------------------------------------------------------------------------- - gtk_window_set_title( GTK_WINDOW(m_widget), title ); - GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); +static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) +{ + if (!win->m_hasVMT) return; - gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL ); + win->m_toolBarDetached = FALSE; + win->GtkUpdateSize(); +} - gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", - GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this ); +//----------------------------------------------------------------------------- +// "child_detached" of tool bar +//----------------------------------------------------------------------------- - m_wxwindow = gtk_myfixed_new(); - gtk_widget_show( m_wxwindow ); - GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); +static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) +{ + if (g_isIdle) + wxapp_install_idle_handler(); -#ifdef __WXDEBUG__ - debug_focus_in( m_wxwindow, "wxFrame::m_wxwindow", name ); -#endif + if (!win->m_hasVMT) return; - gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow ); + // Raise the client area area + gdk_window_raise( win->m_wxwindow->window ); - gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", - GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this ); + win->m_toolBarDetached = TRUE; + win->GtkUpdateSize(); +} +#endif // wxUSE_TOOLBAR - gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event", - GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this ); - if (m_parent) m_parent->AddChild( this ); +// ---------------------------------------------------------------------------- +// wxFrame itself +// ---------------------------------------------------------------------------- - PostCreation(); +//----------------------------------------------------------------------------- +// InsertChild for wxFrame +//----------------------------------------------------------------------------- - return TRUE; -} +/* Callback for wxFrame. This very strange beast has to be used because + * C++ has no virtual methods in a constructor. We have to emulate a + * virtual function here as wxWindows requires different ways to insert + * a child in container classes. */ -wxFrame::~wxFrame() +static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) { - if (m_frameMenuBar) delete m_frameMenuBar; - if (m_frameStatusBar) delete m_frameStatusBar; - if (m_frameToolBar) delete m_frameToolBar; + wxASSERT( GTK_IS_WIDGET(child->m_widget) ); - wxTopLevelWindows.DeleteObject( this ); - - if (wxTheApp->GetTopWindow() == this) + if (!parent->m_insertInClientArea) { - wxTheApp->SetTopWindow( (wxWindow*) NULL ); - } - - if (wxTopLevelWindows.Number() == 0) - { - wxTheApp->ExitMainLoop(); - } -} - -bool wxFrame::Show( bool show ) -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + // These are outside the client area + wxFrame* frame = (wxFrame*) parent; + gtk_pizza_put( GTK_PIZZA(frame->m_mainWidget), + GTK_WIDGET(child->m_widget), + child->m_x, + child->m_y, + child->m_width, + child->m_height ); + +#if wxUSE_TOOLBAR_NATIVE + // We connect to these events for recalculating the client area + // space when the toolbar is floating + if (wxIS_KIND_OF(child,wxToolBar)) + { + wxToolBar *toolBar = (wxToolBar*) child; + if (toolBar->GetWindowStyle() & wxTB_DOCKABLE) + { + gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_attached", + GTK_SIGNAL_FUNC(gtk_toolbar_attached_callback), (gpointer)parent ); - if (show && !m_sizeSet) + gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_detached", + GTK_SIGNAL_FUNC(gtk_toolbar_detached_callback), (gpointer)parent ); + } + } +#endif // wxUSE_TOOLBAR + } + else { - // by calling GtkOnSize here, we don't have to call - // either after showing the frame, which would entail - // much ugly flicker nor from within the size_allocate - // handler, because GTK 1.1.X forbids that. - - GtkOnSize( m_x, m_y, m_width, m_height ); + // These are inside the client area + gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow), + GTK_WIDGET(child->m_widget), + child->m_x, + child->m_y, + child->m_width, + child->m_height ); } - - return wxWindow::Show( show ); + + // Resize on OnInternalIdle + parent->GtkUpdateSize(); } -void wxFrame::OnCloseWindow( wxCloseEvent &event ) -{ - if (GetEventHandler()->OnClose() || event.GetForce()) this->Destroy(); -} +// ---------------------------------------------------------------------------- +// wxFrame creation +// ---------------------------------------------------------------------------- -bool wxFrame::Destroy() +void wxFrame::Init() { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); - - return TRUE; + m_menuBarDetached = FALSE; + m_toolBarDetached = FALSE; + m_menuBarHeight = 2; } -wxPoint wxFrame::GetClientAreaOrigin() const +bool wxFrame::Create( wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& sizeOrig, + long style, + const wxString &name ) { - wxPoint pt( m_miniEdge, m_miniEdge + m_miniTitle ); - if (m_frameMenuBar) - { - int h = 0; - m_frameMenuBar->GetSize( (int*)NULL, &h ); - pt.y += h; - } - if (m_frameToolBar) - { - int h = 0; - m_frameToolBar->GetSize( (int*)NULL, &h ); - pt.y += h; - } - return pt; + bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig, + style, name); + m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame; + + return rt; } -void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags ) +wxFrame::~wxFrame() { - wxASSERT_MSG( (m_widget != NULL), "invalid window" ); - - // Don't do anything for children of wxMDIChildFrame - if (!m_wxwindow) return; + m_isBeingDeleted = TRUE; + DeleteAllBars(); +} - if (m_resizing) return; // I don't like recursions - m_resizing = TRUE; +// ---------------------------------------------------------------------------- +// overridden wxWindow methods +// ---------------------------------------------------------------------------- - int old_x = m_x; - int old_y = m_y; - int old_width = m_width; - int old_height = m_height; +void wxFrame::DoGetClientSize( int *width, int *height ) const +{ + wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING) - { - if (x != -1) m_x = x; - if (y != -1) m_y = y; - if (width != -1) m_width = width; - if (height != -1) m_height = height; - } - else - { - m_x = x; - m_y = y; - m_width = width; - m_height = height; - } + wxTopLevelWindow::DoGetClientSize( width, height ); - if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH) - { - if (width == -1) m_width = 80; - } - - if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT) + if (height) { - if (height == -1) m_height = 26; - } - - if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth; - if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight; - if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth; - if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight; +#if wxUSE_MENUS_NATIVE + // menu bar + if (m_frameMenuBar) + { + if (!m_menuBarDetached) + (*height) -= m_menuBarHeight; + else + (*height) -= wxPLACE_HOLDER; + } +#endif // wxUSE_MENUS_NATIVE - if ((m_x != -1) || (m_y != -1)) - { - if ((m_x != old_x) || (m_y != old_y)) - gtk_widget_set_uposition( m_widget, m_x, m_y ); - } +#if wxUSE_STATUSBAR + // status bar + if (m_frameStatusBar && m_frameStatusBar->IsShown()) + (*height) -= wxSTATUS_HEIGHT; +#endif // wxUSE_STATUSBAR - if ((m_width != old_width) || (m_height != old_height)) - { - gtk_widget_set_usize( m_widget, m_width, m_height ); +#if wxUSE_TOOLBAR + // tool bar + if (m_frameToolBar && m_frameToolBar->IsShown()) + { + if (m_toolBarDetached) + { + *height -= wxPLACE_HOLDER; + } + else + { + int x, y; + m_frameToolBar->GetSize( &x, &y ); + if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL ) + { + *width -= x; + } + else + { + *height -= y; + } + } + } +#endif // wxUSE_TOOLBAR } - - wxSizeEvent event( wxSize(m_width,m_height), GetId() ); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); - - m_resizing = FALSE; -} - -void wxFrame::SetSize( int width, int height ) -{ - SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING ); } -void wxFrame::Centre( int direction ) +void wxFrame::DoSetClientSize( int width, int height ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - int x = 0; - int y = 0; - - if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2; - if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2; + wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - Move( x, y ); -} +#if wxUSE_MENUS_NATIVE + // menu bar + if (m_frameMenuBar) + { + if (!m_menuBarDetached) + height += m_menuBarHeight; + else + height += wxPLACE_HOLDER; + } +#endif // wxUSE_MENUS_NATIVE -void wxFrame::GetClientSize( int *width, int *height ) const -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); +#if wxUSE_STATUSBAR + // status bar + if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT; +#endif - wxWindow::GetClientSize( width, height ); - if (height) - { - if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT; - if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT; - if (m_frameToolBar) +#if wxUSE_TOOLBAR + // tool bar + if (m_frameToolBar && m_frameToolBar->IsShown()) { - int y = 0; - m_frameToolBar->GetSize( (int *) NULL, &y ); - (*height) -= y; + if (m_toolBarDetached) + { + height += wxPLACE_HOLDER; + } + else + { + int x, y; + m_frameToolBar->GetSize( &x, &y ); + if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL ) + { + width += x; + } + else + { + height += y; + } + } } - (*height) -= m_miniEdge*2 + m_miniTitle; - } - if (width) - { - (*width) -= m_miniEdge*2; - } -} - -void wxFrame::SetClientSize( int const width, int const height ) -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); +#endif - int h = height; - if (m_frameMenuBar) h += wxMENU_HEIGHT; - if (m_frameStatusBar) h += wxSTATUS_HEIGHT; - if (m_frameToolBar) - { - int y = 0; - m_frameToolBar->GetSize( (int *) NULL, &y ); - h += y; - } - wxWindow::SetClientSize( width + m_miniEdge*2, h + m_miniEdge*2 + m_miniTitle ); + wxTopLevelWindow::DoSetClientSize( width, height ); } -void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height ) +void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), + int width, int height ) { // due to a bug in gtk, x,y are always 0 // m_x = x; // m_y = y; + // avoid recursions if (m_resizing) return; m_resizing = TRUE; - if (!m_wxwindow) return; + // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow + wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); m_width = width; m_height = height; - if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth; - if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight; - if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth; - if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight; + // space occupied by m_frameToolBar and m_frameMenuBar + int client_area_x_offset = 0, + client_area_y_offset = 0; - gtk_widget_set_usize( m_widget, m_width, m_height ); + /* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses + wxWindow::Create to create it's GTK equivalent. m_mainWidget is only + set in wxFrame::Create so it is used to check what kind of frame we + have here. if m_mainWidget is NULL it is a wxMDIChildFrame and so we + skip the part which handles m_frameMenuBar, m_frameToolBar and (most + importantly) m_mainWidget */ - // this emulates the new wxMSW behaviour of placing all - // frame-subwindows (menu, toolbar..) on one native window - // OK, this hurts in the eye, but I don't want to call SetSize() - // because I don't want to call any non-native functions here. + int minWidth = GetMinWidth(), + minHeight = GetMinHeight(), + maxWidth = GetMaxWidth(), + maxHeight = GetMaxHeight(); - if (m_frameMenuBar) - { - int xx = m_miniEdge; - int yy = m_miniEdge + m_miniTitle; - int ww = m_width - 2*m_miniEdge; - int hh = wxMENU_HEIGHT; - m_frameMenuBar->m_x = xx; - m_frameMenuBar->m_y = yy; - m_frameMenuBar->m_width = ww; - m_frameMenuBar->m_height = hh; - - gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameMenuBar->m_widget, xx, yy ); - gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh ); - } + if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth; + if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight; + if ((maxWidth != -1) && (m_width > maxWidth)) m_width = maxWidth; + if ((maxHeight != -1) && (m_height > maxHeight)) m_height = maxHeight; - if (m_frameToolBar) + if (m_mainWidget) { - int xx = m_miniEdge; - int yy = m_miniEdge + m_miniTitle; - if (m_frameMenuBar) yy += wxMENU_HEIGHT; - int ww = m_width - 2*m_miniEdge; - int hh = m_frameToolBar->m_height; + // set size hints + gint flag = 0; // GDK_HINT_POS; + if ((minWidth != -1) || (minHeight != -1)) flag |= GDK_HINT_MIN_SIZE; + if ((maxWidth != -1) || (maxHeight != -1)) flag |= GDK_HINT_MAX_SIZE; + GdkGeometry geom; + geom.min_width = minWidth; + geom.min_height = minHeight; + geom.max_width = maxWidth; + geom.max_height = maxHeight; + gtk_window_set_geometry_hints( GTK_WINDOW(m_widget), + (GtkWidget*) NULL, + &geom, + (GdkWindowHints) flag ); + + // I revert back to wxGTK's original behaviour. m_mainWidget holds + // the menubar, the toolbar and the client area, which is represented + // by m_wxwindow. + // This hurts in the eye, but I don't want to call SetSize() + // because I don't want to call any non-native functions here. - m_frameToolBar->m_x = xx; - m_frameToolBar->m_y = yy; - m_frameToolBar->m_height = hh; - m_frameToolBar->m_width = ww; +#if wxUSE_MENUS_NATIVE + if (m_frameMenuBar) + { + int xx = m_miniEdge; + int yy = m_miniEdge + m_miniTitle; + int ww = m_width - 2*m_miniEdge; + int hh = m_menuBarHeight; + if (m_menuBarDetached) hh = wxPLACE_HOLDER; + m_frameMenuBar->m_x = xx; + m_frameMenuBar->m_y = yy; + m_frameMenuBar->m_width = ww; + m_frameMenuBar->m_height = hh; + gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), + m_frameMenuBar->m_widget, + xx, yy, ww, hh ); + client_area_y_offset += hh; + } +#endif // wxUSE_MENUS_NATIVE - gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameToolBar->m_widget, xx, yy ); - gtk_widget_set_usize( m_frameToolBar->m_widget, ww, hh ); +#if wxUSE_TOOLBAR + if ((m_frameToolBar) && m_frameToolBar->IsShown() && + (m_frameToolBar->m_widget->parent == m_mainWidget)) + { + int xx = m_miniEdge; + int yy = m_miniEdge + m_miniTitle; +#if wxUSE_MENUS_NATIVE + if (m_frameMenuBar) + { + if (!m_menuBarDetached) + yy += m_menuBarHeight; + else + yy += wxPLACE_HOLDER; + } +#endif // wxUSE_MENUS_NATIVE + + m_frameToolBar->m_x = xx; + m_frameToolBar->m_y = yy; + + // don't change the toolbar's reported height/width + int ww, hh; + if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL ) + { + ww = m_toolBarDetached ? wxPLACE_HOLDER + : m_frameToolBar->m_width; + hh = m_height - 2*m_miniEdge; + + client_area_x_offset += ww; + } + else + { + ww = m_width - 2*m_miniEdge; + hh = m_toolBarDetached ? wxPLACE_HOLDER + : m_frameToolBar->m_height; + + client_area_y_offset += hh; + } + + gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), + m_frameToolBar->m_widget, + xx, yy, ww, hh ); + } +#endif // wxUSE_TOOLBAR + + int client_x = client_area_x_offset + m_miniEdge; + int client_y = client_area_y_offset + m_miniEdge + m_miniTitle; + int client_w = m_width - client_area_x_offset - 2*m_miniEdge; + int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle; + gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), + m_wxwindow, + client_x, client_y, client_w, client_h ); + } + else + { + // If there is no m_mainWidget between m_widget and m_wxwindow there + // is no need to set the size or position of m_wxwindow. } - if (m_frameStatusBar) +#if wxUSE_STATUSBAR + if (m_frameStatusBar && m_frameStatusBar->IsShown()) { int xx = 0 + m_miniEdge; - int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge; + int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset; int ww = m_width - 2*m_miniEdge; int hh = wxSTATUS_HEIGHT; - m_frameStatusBar->m_x = xx; m_frameStatusBar->m_y = yy; m_frameStatusBar->m_width = ww; m_frameStatusBar->m_height = hh; - - gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, xx, yy ); - gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh ); + gtk_pizza_set_size( GTK_PIZZA(m_wxwindow), + m_frameStatusBar->m_widget, + xx, yy, ww, hh ); + gtk_widget_draw( m_frameStatusBar->m_widget, (GdkRectangle*) NULL ); } +#endif // wxUSE_STATUSBAR m_sizeSet = TRUE; + // send size event to frame wxSizeEvent event( wxSize(m_width,m_height), GetId() ); event.SetEventObject( this ); GetEventHandler()->ProcessEvent( event ); +#if wxUSE_STATUSBAR + // send size event to status bar + if (m_frameStatusBar) + { + wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() ); + event2.SetEventObject( m_frameStatusBar ); + m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 ); + } +#endif // wxUSE_STATUSBAR + m_resizing = FALSE; } void wxFrame::OnInternalIdle() { - if (!m_sizeSet) - GtkOnSize( m_x, m_y, m_width, m_height ); + wxTopLevelWindow::OnInternalIdle(); - DoMenuUpdates(); +#if wxUSE_MENUS_NATIVE + if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle(); +#endif // wxUSE_MENUS_NATIVE +#if wxUSE_TOOLBAR + if (m_frameToolBar) m_frameToolBar->OnInternalIdle(); +#endif +#if wxUSE_STATUSBAR + if (m_frameStatusBar) m_frameStatusBar->OnInternalIdle(); +#endif } -void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) ) +// ---------------------------------------------------------------------------- +// menu/tool/status bar stuff +// ---------------------------------------------------------------------------- + +#if wxUSE_MENUS_NATIVE + +void wxFrame::DetachMenuBar() { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); + wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); - if (GetAutoLayout()) + if ( m_frameMenuBar ) { - Layout(); - } - else - { - // no child: go out ! - if (!GetChildren().First()) return; + m_frameMenuBar->UnsetInvokingWindow( this ); - // do we have exactly one child? - wxWindow *child = (wxWindow *) NULL; - for(wxNode *node = GetChildren().First(); node; node = node->Next()) + if (m_frameMenuBar->GetWindowStyle() & wxMB_DOCKABLE) { - wxWindow *win = (wxWindow *)node->Data(); - if (!wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog) -#if 0 // not in m_children anyway ? - && (win != m_frameMenuBar) && - (win != m_frameToolBar) && - (win != m_frameStatusBar) -#endif - ) - { - // it's the second one: do nothing - if (child) return; - child = win; - } + gtk_signal_disconnect_by_func( GTK_OBJECT(m_frameMenuBar->m_widget), + GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this ); + + gtk_signal_disconnect_by_func( GTK_OBJECT(m_frameMenuBar->m_widget), + GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this ); } - // 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-2 ); - } -} + gtk_widget_ref( m_frameMenuBar->m_widget ); -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(); + gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget ); } + + wxFrameBase::DetachMenuBar(); } -void wxFrame::SetMenuBar( wxMenuBar *menuBar ) +void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" ); - - m_frameMenuBar = menuBar; + wxFrameBase::AttachMenuBar(menuBar); if (m_frameMenuBar) { - wxNode *node = m_frameMenuBar->m_menus.First(); - while (node) - { - wxMenu *menu = (wxMenu*)node->Data(); - SetInvokingWindow( menu, this ); - node = node->Next(); - } + m_frameMenuBar->SetInvokingWindow( this ); + + m_frameMenuBar->SetParent(this); + gtk_pizza_put( GTK_PIZZA(m_mainWidget), + m_frameMenuBar->m_widget, + m_frameMenuBar->m_x, + m_frameMenuBar->m_y, + m_frameMenuBar->m_width, + m_frameMenuBar->m_height ); - if (m_frameMenuBar->m_parent != this) + if (menuBar->GetWindowStyle() & wxMB_DOCKABLE) { - m_frameMenuBar->m_parent = this; - gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), - m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y ); + gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_attached", + GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this ); + + gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached", + GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this ); } - } + + m_frameMenuBar->Show( TRUE ); - m_sizeSet = FALSE; + UpdateMenuBarSize(); + } + else + { + m_menuBarHeight = 2; + GtkUpdateSize(); // resize window in OnInternalIdle + } } -wxMenuBar *wxFrame::GetMenuBar() const +void wxFrame::UpdateMenuBarSize() { - return m_frameMenuBar; -} + wxASSERT_MSG( m_frameMenuBar, _T("Updating non existant menubar?") ); -wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + GtkRequisition req; - wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" ); + req.width = 2; + req.height = 2; - m_frameToolBar = OnCreateToolBar( style, id, name ); + (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_frameMenuBar->m_widget) )->size_request ) + (m_frameMenuBar->m_widget, &req ); - GetChildren().DeleteObject( m_frameToolBar ); + m_menuBarHeight = req.height; - m_sizeSet = FALSE; + // resize window in OnInternalIdle - return m_frameToolBar; + GtkUpdateSize(); } -wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString& name ) -{ - return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name ); -} +#endif // wxUSE_MENUS_NATIVE -wxToolBar *wxFrame::GetToolBar() const -{ - return m_frameToolBar; -} - -wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name ) -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" ); - - m_frameStatusBar = OnCreateStatusBar( number, style, id, name ); - - m_sizeSet = FALSE; +#if wxUSE_TOOLBAR - return m_frameStatusBar; -} - -wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id, const wxString& name ) +wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& name ) { - wxStatusBar *statusBar = (wxStatusBar *) NULL; + wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20), style, name); + m_insertInClientArea = FALSE; - // Set the height according to the font and the border size - wxClientDC dc(statusBar); - dc.SetFont( statusBar->GetFont() ); + m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name ); - long x, y; - dc.GetTextExtent( "X", &x, &y ); + m_insertInClientArea = TRUE; - int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY()); + GtkUpdateSize(); - statusBar->SetSize( -1, -1, 100, height ); - - statusBar->SetFieldsCount( number ); - return statusBar; + return m_frameToolBar; } -void wxFrame::SetStatusText(const wxString& text, int number) +void wxFrame::SetToolBar(wxToolBar *toolbar) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + bool hadTbar = m_frameToolBar != NULL; - wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" ); + wxFrameBase::SetToolBar(toolbar); - m_frameStatusBar->SetStatusText(text, number); -} + if ( m_frameToolBar ) + { + // insert into toolbar area if not already there + if ((m_frameToolBar->m_widget->parent) && + (m_frameToolBar->m_widget->parent != m_mainWidget)) + { + GetChildren().DeleteObject( m_frameToolBar ); -void wxFrame::SetStatusWidths(int n, const int widths_field[] ) -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + gtk_widget_reparent( m_frameToolBar->m_widget, m_mainWidget ); + GtkUpdateSize(); + } + } + else // toolbar unset + { + // still need to update size if it had been there before + if ( hadTbar ) + { + GtkUpdateSize(); + } + } +} - wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" ); +#endif // wxUSE_TOOLBAR - m_frameStatusBar->SetStatusWidths(n, widths_field); -} +#if wxUSE_STATUSBAR -wxStatusBar *wxFrame::GetStatusBar() const +wxStatusBar* wxFrame::CreateStatusBar(int number, + long style, + wxWindowID id, + const wxString& name) { - return m_frameStatusBar; -} + wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); -void wxFrame::SetTitle( const wxString &title ) -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + // because it will change when toolbar is added + GtkUpdateSize(); - m_title = title; - if (m_title.IsNull()) m_title = ""; - gtk_window_set_title( GTK_WINDOW(m_widget), title ); + return wxFrameBase::CreateStatusBar( number, style, id, name ); } -void wxFrame::SetIcon( const wxIcon &icon ) +void wxFrame::PositionStatusBar() { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - m_icon = icon; - if (!icon.Ok()) return; - - wxMask *mask = icon.GetMask(); - GdkBitmap *bm = (GdkBitmap *) NULL; - if (mask) bm = mask->GetBitmap(); + if ( !m_frameStatusBar ) + return; - gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm ); + GtkUpdateSize(); } +#endif // wxUSE_STATUSBAR