X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..845a6bbf743a33a1975827f517fbd667c13ef6ac:/src/gtk/frame.cpp diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 18d58ae61e..bcb72003fe 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: frame.cpp +// Name: src/gtk/frame.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,459 +7,47 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#ifdef __GNUG__ - #pragma implementation "frame.h" -#endif - -#ifdef __VMS -#define XIconifyWindow XICONIFYWINDOW -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/frame.h" -#include "wx/dialog.h" -#include "wx/control.h" -#include "wx/app.h" -#include "wx/menu.h" -#if wxUSE_TOOLBAR + +#ifndef WX_PRECOMP + #include "wx/menu.h" #include "wx/toolbar.h" -#endif -#if wxUSE_STATUSBAR #include "wx/statusbr.h" -#endif -#include "wx/dcclient.h" +#endif // WX_PRECOMP -#include -#include #include -#include -#include -#include "wx/gtk/win_gtk.h" +#if wxUSE_LIBHILDON + #include +#endif // wxUSE_LIBHILDON -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -const int wxMENU_HEIGHT = 27; -const int wxSTATUS_HEIGHT = 25; -const int wxPLACE_HOLDER = 0; - -// ---------------------------------------------------------------------------- -// idle system -// ---------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; -extern int g_openDialogs; +#if wxUSE_LIBHILDON2 + #include +#endif // wxUSE_LIBHILDON2 // ---------------------------------------------------------------------------- // event tables // ---------------------------------------------------------------------------- -#ifdef __WXUNIVERSAL__ - IMPLEMENT_DYNAMIC_CLASS(wxFrameGTK, wxWindow) -#else - IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) -#endif - -// ---------------------------------------------------------------------------- -// data -// ---------------------------------------------------------------------------- - -extern wxList wxPendingDelete; - -// ---------------------------------------------------------------------------- -// debug -// ---------------------------------------------------------------------------- - -#ifdef __WXDEBUG__ - -extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window ); - -#endif +IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) // ============================================================================ // implementation // ============================================================================ // ---------------------------------------------------------------------------- -// GTK callbacks +// wxFrame creation // ---------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -// "focus" from m_window -//----------------------------------------------------------------------------- - -static gint gtk_frame_focus_callback( GtkWidget *widget, GtkDirectionType WXUNUSED(d), wxWindow *WXUNUSED(win) ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - // This disables GTK's tab traversal - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus" ); - return TRUE; -} - -//----------------------------------------------------------------------------- -// "size_allocate" -//----------------------------------------------------------------------------- - -static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrameGTK *win ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - if (!win->m_hasVMT) - return; - - if ((win->m_width != alloc->width) || (win->m_height != alloc->height)) - { -/* - wxPrintf( "OnSize from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - wxPrintf( win->GetClassInfo()->GetClassName() ); - wxPrintf( " %d %d %d %d\n", (int)alloc->x, - (int)alloc->y, - (int)alloc->width, - (int)alloc->height ); -*/ - - win->m_width = alloc->width; - win->m_height = alloc->height; - win->m_queuedFullRedraw = TRUE; - win->GtkUpdateSize(); - } -} - -//----------------------------------------------------------------------------- -// "delete_event" -//----------------------------------------------------------------------------- - -static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrameGTK *win ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - if ((g_openDialogs == 0) && (win->IsEnabled())) - win->Close(); - - return TRUE; -} - -#if wxUSE_MENUS -//----------------------------------------------------------------------------- -// "child_attached" of menu bar -//----------------------------------------------------------------------------- - -static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrameGTK *win ) +void wxFrame::Init() { - if (!win->m_hasVMT) return; - - win->m_menuBarDetached = FALSE; - win->GtkUpdateSize(); + m_fsSaveFlag = 0; } -//----------------------------------------------------------------------------- -// "child_detached" of menu bar -//----------------------------------------------------------------------------- - -static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrameGTK *win ) -{ - if (!win->m_hasVMT) return; - - win->m_menuBarDetached = TRUE; - win->GtkUpdateSize(); -} -#endif // wxUSE_MENUS - -#if wxUSE_TOOLBAR -//----------------------------------------------------------------------------- -// "child_attached" of tool bar -//----------------------------------------------------------------------------- - -static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrameGTK *win ) -{ - if (!win->m_hasVMT) return; - - win->m_toolBarDetached = FALSE; - - win->GtkUpdateSize(); -} - -//----------------------------------------------------------------------------- -// "child_detached" of tool bar -//----------------------------------------------------------------------------- - -static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrameGTK *win ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - if (!win->m_hasVMT) return; - - win->m_toolBarDetached = TRUE; - win->GtkUpdateSize(); -} -#endif // wxUSE_TOOLBAR - -//----------------------------------------------------------------------------- -// "configure_event" -//----------------------------------------------------------------------------- - -static gint -#if (GTK_MINOR_VERSION > 0) -gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxFrameGTK *win ) -#else -gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrameGTK *win ) -#endif -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - if (!win->m_hasVMT) - return FALSE; - -#if (GTK_MINOR_VERSION > 0) - int x = 0; - int y = 0; - gdk_window_get_root_origin( win->m_widget->window, &x, &y ); - win->m_x = x; - win->m_y = y; -#else - win->m_x = event->x; - win->m_y = event->y; -#endif - - wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() ); - mevent.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( mevent ); - - return FALSE; -} - -//----------------------------------------------------------------------------- -// "realize" from m_widget -//----------------------------------------------------------------------------- - -/* we cannot MWM hints and icons before the widget has been realized, - so we do this directly after realization */ - -static void -gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), wxFrameGTK *win ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - if ((win->m_miniEdge > 0) || (win->HasFlag(wxSIMPLE_BORDER)) || (win->HasFlag(wxNO_BORDER))) - { - /* This is a mini-frame or a borderless frame. */ - gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)0 ); - gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)0 ); - } - else - { - /* All this is for Motif Window Manager "hints" and is supposed to be - recognized by other WM as well. Not tested. */ - long decor = (long) GDK_DECOR_BORDER; - long func = (long) GDK_FUNC_MOVE; - - if ((win->GetWindowStyle() & wxCAPTION) != 0) - decor |= GDK_DECOR_TITLE; - if ((win->GetWindowStyle() & wxSYSTEM_MENU) != 0) - { - decor |= GDK_DECOR_MENU; - func |= GDK_FUNC_CLOSE; - } - if ((win->GetWindowStyle() & wxMINIMIZE_BOX) != 0) - { - func |= GDK_FUNC_MINIMIZE; - decor |= GDK_DECOR_MINIMIZE; - } - if ((win->GetWindowStyle() & wxMAXIMIZE_BOX) != 0) - { - func |= GDK_FUNC_MAXIMIZE; - decor |= GDK_DECOR_MAXIMIZE; - } - if ((win->GetWindowStyle() & wxRESIZE_BORDER) != 0) - { - func |= GDK_FUNC_RESIZE; - decor |= GDK_DECOR_RESIZEH; - } - - gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor); - gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func); - } - - /* GTK's shrinking/growing policy */ - if ((win->GetWindowStyle() & wxRESIZE_BORDER) == 0) - gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1); - else - gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1); - - /* reset the icon */ - wxIcon iconOld = win->GetIcon(); - if ( iconOld != wxNullIcon ) - { - wxIcon icon( iconOld ); - win->SetIcon( wxNullIcon ); - win->SetIcon( icon ); - } - - /* we set the focus to the child that accepts the focus. this - doesn't really have to be done in "realize" but why not? */ - wxWindowList::Node *node = win->GetChildren().GetFirst(); - while (node) - { - wxWindow *child = node->GetData(); - if (child->AcceptsFocus()) - { - child->SetFocus(); - break; - } - - node = node->GetNext(); - } -} - -//----------------------------------------------------------------------------- -// "map_event" from m_widget -//----------------------------------------------------------------------------- - -static void -gtk_frame_map_callback( GtkWidget * WXUNUSED(widget), - GdkEvent * WXUNUSED(event), - wxFrame *win ) -{ - win->SetIconizeState(FALSE); -} - -//----------------------------------------------------------------------------- -// "unmap_event" from m_widget -//----------------------------------------------------------------------------- - -static void -gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget), - GdkEvent * WXUNUSED(event), - wxFrame *win ) -{ - win->SetIconizeState(TRUE); -} - -//----------------------------------------------------------------------------- -// "expose_event" of m_client -//----------------------------------------------------------------------------- - -static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindow *win ) -{ - GtkPizza *pizza = GTK_PIZZA(widget); - - gtk_paint_flat_box (win->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL, - GTK_SHADOW_NONE, &gdk_event->area, win->m_widget, "base", 0, 0, -1, -1); - - return TRUE; -} - -//----------------------------------------------------------------------------- -// "draw" of m_client -//----------------------------------------------------------------------------- - - -static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxWindow *win ) -{ - GtkPizza *pizza = GTK_PIZZA(widget); - - gtk_paint_flat_box (win->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL, - GTK_SHADOW_NONE, rect, win->m_widget, "base", 0, 0, -1, -1); -} - -// ---------------------------------------------------------------------------- -// wxFrameGTK itself -// ---------------------------------------------------------------------------- - -//----------------------------------------------------------------------------- -// InsertChild for wxFrameGTK -//----------------------------------------------------------------------------- - -/* Callback for wxFrameGTK. 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. */ - -static void wxInsertChildInFrame( wxFrameGTK* parent, wxWindow* child ) -{ - wxASSERT( GTK_IS_WIDGET(child->m_widget) ); - - if (!parent->m_insertInClientArea) - { - /* these are outside the client area */ - wxFrameGTK* frame = (wxFrameGTK*) 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 ); - - gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_detached", - GTK_SIGNAL_FUNC(gtk_toolbar_detached_callback), (gpointer)parent ); - } - } -#endif // wxUSE_TOOLBAR - } - else - { - /* 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 ); - } - - /* resize on OnInternalIdle */ - parent->GtkUpdateSize(); -} - -// ---------------------------------------------------------------------------- -// wxFrameGTK creation -// ---------------------------------------------------------------------------- - -void wxFrameGTK::Init() -{ - m_sizeSet = FALSE; - m_miniEdge = 0; - m_miniTitle = 0; - m_mainWidget = (GtkWidget*) NULL; - m_menuBarDetached = FALSE; - m_toolBarDetached = FALSE; - m_insertInClientArea = TRUE; - m_isFrame = TRUE; - m_isIconized = FALSE; - m_fsIsShowing = FALSE; - m_themeEnabled = TRUE; -} - -bool wxFrameGTK::Create( wxWindow *parent, +bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos, @@ -467,795 +55,364 @@ bool wxFrameGTK::Create( wxWindow *parent, long style, const wxString &name ) { - // always create a frame of some reasonable, even if arbitrary, size (at - // least for MSW compatibility) - wxSize size = sizeOrig; - if ( size.x == -1 || size.y == -1 ) - { - wxSize sizeDpy = wxGetDisplaySize(); - if ( size.x == -1 ) - size.x = sizeDpy.x / 3; - if ( size.y == -1 ) - size.y = sizeDpy.y / 5; - } - - wxTopLevelWindows.Append( this ); - - m_needParent = FALSE; - - if (!PreCreation( parent, pos, size ) || - !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) - { - wxFAIL_MSG( wxT("wxFrameGTK creation failed") ); - return FALSE; - } - - m_title = title; - - m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame; - - GtkWindowType win_type = GTK_WINDOW_TOPLEVEL; - - if (style & wxFRAME_TOOL_WINDOW) - win_type = GTK_WINDOW_POPUP; - - m_widget = gtk_window_new( win_type ); - - if ((m_parent) && (HasFlag(wxFRAME_FLOAT_ON_PARENT)) && (GTK_IS_WINDOW(m_parent->m_widget))) - gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) ); - - if (!name.IsEmpty()) - gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() ); - -#ifdef __WXDEBUG__ - debug_focus_in( m_widget, wxT("wxFrameGTK::m_widget"), name ); -#endif - - gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() ); - GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); - - gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", - GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this ); - - /* m_mainWidget holds the toolbar, the menubar and the client area */ - m_mainWidget = gtk_pizza_new(); - gtk_widget_show( m_mainWidget ); - GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS ); - gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget ); - - /* for m_mainWidget themes */ - gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event", - GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this ); - gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw", - GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this ); - -#ifdef __WXDEBUG__ - debug_focus_in( m_mainWidget, wxT("wxFrameGTK::m_mainWidget"), name ); -#endif - - /* m_wxwindow only represents the client area without toolbar and menubar */ - m_wxwindow = gtk_pizza_new(); - gtk_widget_show( m_wxwindow ); - gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow ); - -#ifdef __WXDEBUG__ - debug_focus_in( m_wxwindow, wxT("wxFrameGTK::m_wxwindow"), name ); -#endif - - /* we donm't allow the frame to get the focus as otherwise - the frame will grab it at arbitrary focus changes. */ - GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); - - if (m_parent) m_parent->AddChild( this ); - - /* the user resized the frame by dragging etc. */ - gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", - GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this ); - - PostCreation(); - - if ((m_x != -1) || (m_y != -1)) - gtk_widget_set_uposition( m_widget, m_x, m_y ); - gtk_widget_set_usize( m_widget, m_width, m_height ); - - /* we cannot set MWM hints and icons before the widget has - been realized, so we do this directly after realization */ - gtk_signal_connect( GTK_OBJECT(m_widget), "realize", - GTK_SIGNAL_FUNC(gtk_frame_realized_callback), (gpointer) this ); - - /* the only way to get the window size is to connect to this event */ - gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event", - GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this ); - - /* map and unmap for iconized state */ - gtk_signal_connect( GTK_OBJECT(m_widget), "map_event", - GTK_SIGNAL_FUNC(gtk_frame_map_callback), (gpointer)this ); - gtk_signal_connect( GTK_OBJECT(m_widget), "unmap_event", - GTK_SIGNAL_FUNC(gtk_frame_unmap_callback), (gpointer)this ); - - /* the only way to get the window size is to connect to this event */ - gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event", - GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this ); - - /* disable native tab traversal */ - gtk_signal_connect( GTK_OBJECT(m_widget), "focus", - GTK_SIGNAL_FUNC(gtk_frame_focus_callback), (gpointer)this ); - - return TRUE; + return wxFrameBase::Create(parent, id, title, pos, sizeOrig, style, name); } -wxFrameGTK::~wxFrameGTK() +wxFrame::~wxFrame() { - m_isBeingDeleted = TRUE; + SendDestroyEvent(); DeleteAllBars(); - - wxTopLevelWindows.DeleteObject( this ); - - if (wxTheApp->GetTopWindow() == this) - wxTheApp->SetTopWindow( (wxWindow*) NULL ); - - if ((wxTopLevelWindows.Number() == 0) && - (wxTheApp->GetExitOnFrameDelete())) - { - wxTheApp->ExitMainLoop(); - } -} - -bool wxFrame::ShowFullScreen(bool show, long style ) -{ - if (show == m_fsIsShowing) return FALSE; // return what? - - m_fsIsShowing = show; - - if (show) - { - m_fsSaveStyle = m_windowStyle; - m_fsSaveFlag = style; - GetPosition( &m_fsSaveFrame.x, &m_fsSaveFrame.y ); - GetSize( &m_fsSaveFrame.width, &m_fsSaveFrame.height ); - - gtk_widget_hide( m_widget ); - gtk_widget_unrealize( m_widget ); - - m_windowStyle = wxSIMPLE_BORDER; - - int x; - int y; - wxDisplaySize( &x, &y ); - SetSize( 0, 0, x, y ); - - gtk_widget_realize( m_widget ); - gtk_widget_show( m_widget ); - } - else - { - gtk_widget_hide( m_widget ); - gtk_widget_unrealize( m_widget ); - - m_windowStyle = m_fsSaveStyle; - - SetSize( m_fsSaveFrame.x, m_fsSaveFrame.y, m_fsSaveFrame.width, m_fsSaveFrame.height ); - - gtk_widget_realize( m_widget ); - gtk_widget_show( m_widget ); - } - - return TRUE; } // ---------------------------------------------------------------------------- // overridden wxWindow methods // ---------------------------------------------------------------------------- -bool wxFrameGTK::Show( bool show ) +void wxFrame::DoGetClientSize( int *width, int *height ) const { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - if (show && !m_sizeSet) - { - /* by calling GtkOnSize here, we don't have to call - either after showing the frame, which would entail - much ugly flicker or from within the size_allocate - handler, because GTK 1.1.X forbids that. */ - - GtkOnSize( m_x, m_y, m_width, m_height ); - } - - return wxWindow::Show( show ); -} - -void wxFrameGTK::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) ) -{ - wxFAIL_MSG( wxT("DoMoveWindow called for wxFrameGTK") ); -} - -void wxFrameGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags ) -{ - wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - - /* this shouldn't happen: wxFrameGTK, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */ - wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); - - /* avoid recursions */ - if (m_resizing) - return; - m_resizing = TRUE; + wxFrameBase::DoGetClientSize(width, height); - int old_x = m_x; - int old_y = m_y; - - int old_width = m_width; - int old_height = m_height; - - if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0) - { - 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; - } - -/* - if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH) + if (height) { - if (width == -1) m_width = 80; - } +#if wxUSE_MENUS_NATIVE + // menu bar + if (m_frameMenuBar && m_frameMenuBar->IsShown()) + { + GtkRequisition req; + gtk_widget_size_request(m_frameMenuBar->m_widget, &req); +#if !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 + *height -= req.height; +#endif + } +#endif // wxUSE_MENUS_NATIVE - if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT) - { - if (height == -1) m_height = 26; +#if wxUSE_STATUSBAR + // status bar + if (m_frameStatusBar && m_frameStatusBar->IsShown()) + *height -= m_frameStatusBar->m_height; +#endif // wxUSE_STATUSBAR } -*/ - - 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_maxWidth; - if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight; - if ((m_x != -1) || (m_y != -1)) +#if wxUSE_TOOLBAR + // tool bar + if (m_frameToolBar && m_frameToolBar->IsShown()) { - if ((m_x != old_x) || (m_y != old_y)) + GtkRequisition req; + gtk_widget_size_request(m_frameToolBar->m_widget, &req); + if (m_frameToolBar->IsVertical()) { - gtk_widget_set_uposition( m_widget, m_x, m_y ); + if (width) + *width -= req.width; + } + else + { + if (height) + *height -= req.height; } } +#endif // wxUSE_TOOLBAR - if ((m_width != old_width) || (m_height != old_height)) - { - gtk_widget_set_usize( m_widget, m_width, m_height ); - - /* we set the size in GtkOnSize, i.e. mostly the actual resizing is - done either directly before the frame is shown or in idle time - so that different calls to SetSize() don't lead to flicker. */ - m_sizeSet = FALSE; - } - - m_resizing = FALSE; + if (width != NULL && *width < 0) + *width = 0; + if (height != NULL && *height < 0) + *height = 0; } -void wxFrameGTK::DoGetClientSize( int *width, int *height ) const +#if wxUSE_MENUS && wxUSE_ACCEL +// Helper for wxCreateAcceleratorTableForMenuBar +static void wxAddAccelerators(wxList& accelEntries, wxMenu* menu) { - wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - - wxWindow::DoGetClientSize( width, height ); - if (height) + size_t i; + for (i = 0; i < menu->GetMenuItems().GetCount(); i++) { -#if wxUSE_MENUS - /* menu bar */ - if (m_frameMenuBar) + wxMenuItem* item = (wxMenuItem*) menu->GetMenuItems().Item(i)->GetData(); + if (item->GetSubMenu()) { - if (!m_menuBarDetached) - (*height) -= wxMENU_HEIGHT; - else - (*height) -= wxPLACE_HOLDER; + wxAddAccelerators(accelEntries, item->GetSubMenu()); } -#endif // wxUSE_MENUS - -#if wxUSE_STATUSBAR - /* status bar */ - if (m_frameStatusBar && m_frameStatusBar->IsShown()) (*height) -= wxSTATUS_HEIGHT; -#endif // wxUSE_STATUSBAR - -#if wxUSE_TOOLBAR - /* tool bar */ - if (m_frameToolBar && m_frameToolBar->IsShown()) + else if (!item->GetItemLabel().IsEmpty()) { - if (m_toolBarDetached) - { - *height -= wxPLACE_HOLDER; - } - else + wxAcceleratorEntry* entry = wxAcceleratorEntry::Create(item->GetItemLabel()); + if (entry) { - int x, y; - m_frameToolBar->GetSize( &x, &y ); - if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL ) - { - *width -= x; - } - else - { - *height -= y; - } + entry->Set(entry->GetFlags(), entry->GetKeyCode(), item->GetId()); + accelEntries.Append((wxObject*) entry); } } -#endif // wxUSE_TOOLBAR - - /* mini edge */ - *height -= m_miniEdge*2 + m_miniTitle; - } - if (width) - { - *width -= m_miniEdge*2; } } -void wxFrameGTK::DoSetClientSize( int width, int height ) +// Create an accelerator table consisting of all the accelerators +// from the menubar in the given menus +static wxAcceleratorTable wxCreateAcceleratorTableForMenuBar(wxMenuBar* menuBar) { - wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - -#if wxUSE_MENUS - /* menu bar */ - if (m_frameMenuBar) - { - if (!m_menuBarDetached) - height += wxMENU_HEIGHT; - else - height += wxPLACE_HOLDER; - } -#endif // wxUSE_MENUS + wxList accelEntries; -#if wxUSE_STATUSBAR - /* status bar */ - if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT; -#endif - -#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 + size_t i; + for (i = 0; i < menuBar->GetMenuCount(); i++) + { + wxAddAccelerators(accelEntries, menuBar->GetMenu(i)); + } - DoSetSize( -1, -1, width + m_miniEdge*2, height + m_miniEdge*2 + m_miniTitle, 0 ); -} + size_t n = accelEntries.GetCount(); -void wxFrameGTK::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; + if (n == 0) + return wxAcceleratorTable(); - /* avoid recursions */ - if (m_resizing) return; - m_resizing = TRUE; + wxAcceleratorEntry* entries = new wxAcceleratorEntry[n]; - /* this shouldn't happen: wxFrameGTK, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */ - wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); + for (i = 0; i < accelEntries.GetCount(); i++) + { + wxAcceleratorEntry* entry = (wxAcceleratorEntry*) accelEntries.Item(i)->GetData(); + entries[i] = (*entry); + delete entry; - m_width = width; - m_height = height; + } - /* space occupied by m_frameToolBar and m_frameMenuBar */ - int client_area_x_offset = 0, - client_area_y_offset = 0; + wxAcceleratorTable table(n, entries); + delete[] entries; - /* wxMDIChildFrame derives from wxFrameGTK but it _is_ a wxWindow as it uses - wxWindow::Create to create it's GTK equivalent. m_mainWidget is only - set in wxFrameGTK::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 */ + return table; +} +#endif // wxUSE_MENUS && wxUSE_ACCEL - 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_maxWidth; - if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight; +bool wxFrame::ShowFullScreen(bool show, long style) +{ + if (!wxFrameBase::ShowFullScreen(show, style)) + return false; - if (m_mainWidget) +#if wxUSE_MENUS && wxUSE_ACCEL + if (show && GetMenuBar()) { - /* set size hints */ - gint flag = 0; // GDK_HINT_POS; - if ((m_minWidth != -1) || (m_minHeight != -1)) flag |= GDK_HINT_MIN_SIZE; - if ((m_maxWidth != -1) || (m_maxHeight != -1)) flag |= GDK_HINT_MAX_SIZE; - GdkGeometry geom; - geom.min_width = m_minWidth; - geom.min_height = m_minHeight; - geom.max_width = m_maxWidth; - geom.max_height = m_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. */ + wxAcceleratorTable table(wxCreateAcceleratorTableForMenuBar(GetMenuBar())); + if (table.IsOk()) + SetAcceleratorTable(table); + } +#endif // wxUSE_MENUS && wxUSE_ACCEL + wxWindow* const bar[] = { #if wxUSE_MENUS - if (m_frameMenuBar) - { - int xx = m_miniEdge; - int yy = m_miniEdge + m_miniTitle; - int ww = m_width - 2*m_miniEdge; - int hh = wxMENU_HEIGHT; - 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 - + m_frameMenuBar, +#else + NULL, +#endif #if wxUSE_TOOLBAR - if ((m_frameToolBar) && m_frameToolBar->IsShown() && - (m_frameToolBar->m_widget->parent == m_mainWidget)) + m_frameToolBar, +#else + NULL, +#endif +#if wxUSE_STATUSBAR + m_frameStatusBar, +#else + NULL, +#endif + }; + const long fsNoBar[] = { + wxFULLSCREEN_NOMENUBAR, wxFULLSCREEN_NOTOOLBAR, wxFULLSCREEN_NOSTATUSBAR + }; + for (int i = 0; i < 3; i++) + { + if (show) { - int xx = m_miniEdge; - int yy = m_miniEdge + m_miniTitle; -#if wxUSE_MENUS - if (m_frameMenuBar) + if (bar[i] && (style & fsNoBar[i])) { - if (!m_menuBarDetached) - yy += wxMENU_HEIGHT; + if (bar[i]->IsShown()) + bar[i]->Show(false); else - yy += wxPLACE_HOLDER; - } -#endif // wxUSE_MENUS - - 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; + style &= ~fsNoBar[i]; } - 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 wxUSE_STATUSBAR - if (m_frameStatusBar && m_frameStatusBar->IsShown()) - { - int xx = 0 + 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_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 ); + else + { + if (bar[i] && (m_fsSaveFlag & fsNoBar[i])) + bar[i]->Show(true); + } } -#endif // wxUSE_STATUSBAR - - m_resizing = FALSE; -} + if (show) + m_fsSaveFlag = style; -void wxFrameGTK::MakeModal( bool modal ) -{ - if (modal) - gtk_grab_add( m_widget ); - else - gtk_grab_remove( m_widget ); + return true; } -void wxFrameGTK::OnInternalIdle() +void wxFrame::OnInternalIdle() { - if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow)) - { - GtkOnSize( m_x, m_y, m_width, m_height ); + wxFrameBase::OnInternalIdle(); - // we'll come back later - if (g_isIdle) - wxapp_install_idle_handler(); - return; - } - -#if wxUSE_MENUS +#if wxUSE_MENUS_NATIVE if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle(); -#endif // wxUSE_MENUS +#endif // wxUSE_MENUS_NATIVE #if wxUSE_TOOLBAR if (m_frameToolBar) m_frameToolBar->OnInternalIdle(); #endif #if wxUSE_STATUSBAR - if (m_frameStatusBar) m_frameStatusBar->OnInternalIdle(); -#endif + if (m_frameStatusBar) + { + m_frameStatusBar->OnInternalIdle(); - wxWindow::OnInternalIdle(); + // There may be controls in the status bar that + // need to be updated + for ( wxWindowList::compatibility_iterator node = m_frameStatusBar->GetChildren().GetFirst(); + node; + node = node->GetNext() ) + { + wxWindow *child = node->GetData(); + child->OnInternalIdle(); + } + } +#endif } // ---------------------------------------------------------------------------- // menu/tool/status bar stuff // ---------------------------------------------------------------------------- -#if wxUSE_MENUS +#if wxUSE_MENUS_NATIVE -void wxFrameGTK::SetMenuBar( wxMenuBar *menuBar ) +void wxFrame::DetachMenuBar() { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); - if (menuBar == m_frameMenuBar) - return; - - if (m_frameMenuBar) + if ( m_frameMenuBar ) { +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 + hildon_window_set_menu(HILDON_WINDOW(m_widget), NULL); +#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 m_frameMenuBar->UnsetInvokingWindow( this ); - if (m_frameMenuBar->GetWindowStyle() & wxMB_DOCKABLE) - { - 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 ); - } + gtk_widget_ref( m_frameMenuBar->m_widget ); gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget ); - gtk_widget_ref( m_frameMenuBar->m_widget ); - gtk_widget_unparent( m_frameMenuBar->m_widget ); +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 } - m_frameMenuBar = menuBar; + wxFrameBase::DetachMenuBar(); + + // make sure next size_allocate causes a wxSizeEvent + m_oldClientWidth = 0; +} + +void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) +{ + wxFrameBase::AttachMenuBar(menuBar); if (m_frameMenuBar) { +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 + hildon_window_set_menu(HILDON_WINDOW(m_widget), + GTK_MENU(m_frameMenuBar->m_menubar)); +#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 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 (menuBar->GetWindowStyle() & wxMB_DOCKABLE) - { - 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 ); + // menubar goes into top of vbox (m_mainWidget) + gtk_box_pack_start( + GTK_BOX(m_mainWidget), menuBar->m_widget, false, false, 0); + gtk_box_reorder_child(GTK_BOX(m_mainWidget), menuBar->m_widget, 0); + + // disconnect wxWindowGTK "size_request" handler, + // it interferes with sizing of detached GtkHandleBox + gulong handler_id = g_signal_handler_find( + menuBar->m_widget, + GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA), + g_signal_lookup("size_request", GTK_TYPE_WIDGET), + 0, NULL, NULL, menuBar); + if (handler_id != 0) + g_signal_handler_disconnect(menuBar->m_widget, handler_id); + + // reset size request to allow native sizing to work + gtk_widget_set_size_request(menuBar->m_widget, -1, -1); + + gtk_widget_show( m_frameMenuBar->m_widget ); +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 } - - /* resize window in OnInternalIdle */ - m_sizeSet = FALSE; + // make sure next size_allocate causes a wxSizeEvent + m_oldClientWidth = 0; } - -#endif // wxUSE_MENUS +#endif // wxUSE_MENUS_NATIVE #if wxUSE_TOOLBAR -wxToolBar* wxFrameGTK::CreateToolBar( long style, wxWindowID id, const wxString& name ) -{ - wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - - m_insertInClientArea = FALSE; - - m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name ); - - m_insertInClientArea = TRUE; - - m_sizeSet = FALSE; - - return m_frameToolBar; -} - -void wxFrameGTK::SetToolBar(wxToolBar *toolbar) +void wxFrame::SetToolBar(wxToolBar *toolbar) { - wxFrameBase::SetToolBar(toolbar); - - if (m_frameToolBar) + m_frameToolBar = toolbar; + if (toolbar) { - /* insert into toolbar area if not already there */ - if ((m_frameToolBar->m_widget->parent) && - (m_frameToolBar->m_widget->parent != m_mainWidget)) + if (toolbar->IsVertical()) + { + // Vertical toolbar and m_wxwindow go into an hbox, inside the + // vbox (m_mainWidget). hbox is created on demand. + GtkWidget* hbox = m_wxwindow->parent; + if (!GTK_IS_HBOX(hbox)) + { + hbox = gtk_hbox_new(false, 0); + gtk_widget_show(hbox); + gtk_container_add(GTK_CONTAINER(m_mainWidget), hbox); + gtk_widget_reparent(m_wxwindow, hbox); + } + gtk_widget_reparent(toolbar->m_widget, hbox); + gtk_box_set_child_packing(GTK_BOX(hbox), + toolbar->m_widget, false, false, 0, GTK_PACK_START); + + int pos = 0; // left + if (toolbar->HasFlag(wxTB_RIGHT)) + pos = 1; // right + gtk_box_reorder_child(GTK_BOX(hbox), toolbar->m_widget, pos); + } + else { - GetChildren().DeleteObject( m_frameToolBar ); + // Horizontal toolbar goes into vbox (m_mainWidget) + gtk_widget_reparent(toolbar->m_widget, m_mainWidget); + gtk_box_set_child_packing(GTK_BOX(m_mainWidget), + toolbar->m_widget, false, false, 0, GTK_PACK_START); - gtk_widget_reparent( m_frameToolBar->m_widget, m_mainWidget ); - GtkUpdateSize(); + int pos = 0; // top + if (m_frameMenuBar) + pos = 1; // below menubar + if (toolbar->HasFlag(wxTB_BOTTOM)) + pos += 2; // below client area (m_wxwindow) + gtk_box_reorder_child( + GTK_BOX(m_mainWidget), toolbar->m_widget, pos); } + + // disconnect wxWindowGTK "size_request" handler, + // it interferes with sizing of detached GtkHandleBox + gulong handler_id = g_signal_handler_find( + toolbar->m_widget, + GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA), + g_signal_lookup("size_request", GTK_TYPE_WIDGET), + 0, NULL, NULL, toolbar); + if (handler_id != 0) + g_signal_handler_disconnect(toolbar->m_widget, handler_id); + + // reset size request to allow native sizing to work + gtk_widget_set_size_request(toolbar->m_widget, -1, -1); } + // make sure next size_allocate causes a wxSizeEvent + m_oldClientWidth = 0; } #endif // wxUSE_TOOLBAR #if wxUSE_STATUSBAR -wxStatusBar* wxFrameGTK::CreateStatusBar(int number, - long style, - wxWindowID id, - const wxString& name) -{ - wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - - // because it will change when toolbar is added - m_sizeSet = FALSE; - - return wxFrameBase::CreateStatusBar( number, style, id, name ); -} - -void wxFrameGTK::PositionStatusBar() -{ - if ( !m_frameStatusBar ) - return; - - m_sizeSet = FALSE; -} -#endif // wxUSE_STATUSBAR - -// ---------------------------------------------------------------------------- -// frame title/icon -// ---------------------------------------------------------------------------- - -void wxFrameGTK::SetTitle( const wxString &title ) -{ - wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - - m_title = title; - gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() ); -} - -void wxFrameGTK::SetIcon( const wxIcon &icon ) -{ - wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - - wxFrameBase::SetIcon(icon); - - if ( !m_icon.Ok() ) - return; - - if (!m_widget->window) - return; - - wxMask *mask = icon.GetMask(); - GdkBitmap *bm = (GdkBitmap *) NULL; - if (mask) bm = mask->GetBitmap(); - - gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm ); -} - -// ---------------------------------------------------------------------------- -// frame state: maximized/iconized/normal -// ---------------------------------------------------------------------------- - -void wxFrameGTK::Maximize(bool WXUNUSED(maximize)) -{ - wxFAIL_MSG( _T("not implemented") ); -} - -bool wxFrameGTK::IsMaximized() const -{ - // wxFAIL_MSG( _T("not implemented") ); - - // This is an approximation - return FALSE; -} - -void wxFrameGTK::Restore() -{ - wxFAIL_MSG( _T("not implemented") ); -} - -void wxFrameGTK::Iconize( bool iconize ) -{ - if (iconize) - { - XIconifyWindow( GDK_WINDOW_XDISPLAY( m_widget->window ), - GDK_WINDOW_XWINDOW( m_widget->window ), - DefaultScreen( GDK_DISPLAY() ) ); - } -} - -bool wxFrameGTK::IsIconized() const +void wxFrame::SetStatusBar(wxStatusBar *statbar) { - return m_isIconized; -} - -void wxFrame::SetIconizeState(bool iconize) -{ - if ( iconize != m_isIconized ) + m_frameStatusBar = statbar; + if (statbar) { - m_isIconized = iconize; - (void)SendIconizeEvent(iconize); - } - else - { - // this is not supposed to happen if we're called only from - // gtk_frame_(un)map_callback! - - // RR: I don't understand this test. Upon startup, the frame is - // not iconized by default, it has just not been created - // yet. - ///wxFAIL_MSG( _T("unexpected call to SendIconizeEvent ignored") ); + // statusbar goes into bottom of vbox (m_mainWidget) + gtk_widget_reparent(statbar->m_widget, m_mainWidget); + gtk_box_set_child_packing(GTK_BOX(m_mainWidget), + statbar->m_widget, false, false, 0, GTK_PACK_END); + // make sure next size_allocate on statusbar causes a size event + statbar->m_oldClientWidth = 0; } + // make sure next size_allocate causes a wxSizeEvent + m_oldClientWidth = 0; } - +#endif // wxUSE_STATUSBAR