X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..7b4fde8255e2c5495b5c7c2b3234d19ac8c1e7cf:/src/gtk/frame.cpp diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 8773d721d2..d0ade77e6d 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -15,9 +15,10 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "frame.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#include "wx/defs.h" #include "wx/frame.h" #include "wx/dialog.h" @@ -33,8 +34,8 @@ #include "wx/dcclient.h" #include -#include -#include +#include "wx/gtk/private.h" + #include #include @@ -44,7 +45,6 @@ // constants // ---------------------------------------------------------------------------- -const int wxMENU_HEIGHT = 27; const int wxSTATUS_HEIGHT = 25; const int wxPLACE_HOLDER = 0; @@ -54,29 +54,12 @@ const int wxPLACE_HOLDER = 0; extern void wxapp_install_idle_handler(); extern bool g_isIdle; -extern int g_openDialogs; // ---------------------------------------------------------------------------- // event tables // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow) - -// ---------------------------------------------------------------------------- -// 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 @@ -86,108 +69,64 @@ extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar // GTK callbacks // ---------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -// "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, wxFrame *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), wxFrame *win ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - if ((g_openDialogs == 0) && (win->IsEnabled())) - win->Close(); - - return TRUE; -} +#if wxUSE_MENUS_NATIVE //----------------------------------------------------------------------------- // "child_attached" of menu bar //----------------------------------------------------------------------------- +extern "C" { static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { if (!win->m_hasVMT) return; - win->m_menuBarDetached = FALSE; + win->m_menuBarDetached = false; win->GtkUpdateSize(); } +} //----------------------------------------------------------------------------- // "child_detached" of menu bar //----------------------------------------------------------------------------- +extern "C" { static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { + if (g_isIdle) + wxapp_install_idle_handler(); + if (!win->m_hasVMT) return; - win->m_menuBarDetached = TRUE; + // Raise the client area area + gdk_window_raise( win->m_wxwindow->window ); + + win->m_menuBarDetached = true; win->GtkUpdateSize(); } +} + +#endif // wxUSE_MENUS_NATIVE #if wxUSE_TOOLBAR //----------------------------------------------------------------------------- // "child_attached" of tool bar //----------------------------------------------------------------------------- +extern "C" { static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { if (!win->m_hasVMT) return; - win->m_toolBarDetached = FALSE; - + win->m_toolBarDetached = false; win->GtkUpdateSize(); } +} //----------------------------------------------------------------------------- // "child_detached" of tool bar //----------------------------------------------------------------------------- +extern "C" { static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { if (g_isIdle) @@ -195,131 +134,15 @@ static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidge if (!win->m_hasVMT) return; - win->m_toolBarDetached = TRUE; + // Raise the client area area + gdk_window_raise( win->m_wxwindow->window ); + + 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), wxFrame *win ) -#else -gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *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; } +#endif // wxUSE_TOOLBAR -//----------------------------------------------------------------------------- -// "realize" from m_widget -//----------------------------------------------------------------------------- - -/* we cannot MWM hints and icons before the widget has been realized, - so we do this directly after realization */ - -static gint -gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), wxFrame *win ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - if ((win->m_miniEdge > 0) || (win->HasFlag(wxSIMPLE_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(); - } - - return FALSE; -} // ---------------------------------------------------------------------------- // wxFrame itself @@ -331,7 +154,7 @@ gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), wxFrame *win ) /* 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 + * virtual function here as wxWidgets requires different ways to insert * a child in container classes. */ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) @@ -340,7 +163,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) if (!parent->m_insertInClientArea) { - /* these are outside the client area */ + // These are outside the client area wxFrame* frame = (wxFrame*) parent; gtk_pizza_put( GTK_PIZZA(frame->m_mainWidget), GTK_WIDGET(child->m_widget), @@ -350,25 +173,26 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) child->m_height ); #if wxUSE_TOOLBAR_NATIVE - /* we connect to these events for recalculating the client area - space when the toolbar is floating */ + // 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 ); + g_signal_connect (toolBar->m_widget, "child_attached", + G_CALLBACK (gtk_toolbar_attached_callback), + parent); + g_signal_connect (toolBar->m_widget, "child_detached", + G_CALLBACK (gtk_toolbar_detached_callback), + parent); } } #endif // wxUSE_TOOLBAR } else { - /* these are inside the client area */ + // These are inside the client area gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow), GTK_WIDGET(child->m_widget), child->m_x, @@ -377,7 +201,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) child->m_height ); } - /* resize on OnInternalIdle */ + // Resize on OnInternalIdle parent->GtkUpdateSize(); } @@ -387,248 +211,64 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) void wxFrame::Init() { - m_sizeSet = FALSE; - m_miniEdge = 0; - m_miniTitle = 0; - m_mainWidget = (GtkWidget*) NULL; - m_menuBarDetached = FALSE; - m_toolBarDetached = FALSE; - m_insertInClientArea = TRUE; + m_menuBarDetached = false; + m_toolBarDetached = false; + m_menuBarHeight = 2; } bool wxFrame::Create( wxWindow *parent, wxWindowID id, - const wxString &title, - const wxPoint &pos, - const wxSize &size, + const wxString& title, + const wxPoint& pos, + const wxSize& sizeOrig, long style, const wxString &name ) { - wxTopLevelWindows.Append( this ); - - m_needParent = FALSE; - - if (!PreCreation( parent, pos, size ) || - !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) - { - wxFAIL_MSG( wxT("wxFrame creation failed") ); - return FALSE; - } - - m_title = title; - + bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig, + style, name); m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame; - GtkWindowType win_type = GTK_WINDOW_TOPLEVEL; - - 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("wxFrame::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 ); - -#ifdef __WXDEBUG__ - debug_focus_in( m_mainWidget, wxT("wxFrame::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("wxFrame::m_wxwindow"), name ); -#endif - - /* we donm't allow the frame to get the focus as otherwise - the frame will grabit at arbitrary fcous 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 ); - - /* disable native tab traversal */ - gtk_signal_connect( GTK_OBJECT(m_widget), "focus", - GTK_SIGNAL_FUNC(gtk_frame_focus_callback), (gpointer)this ); - - return TRUE; + return rt; } wxFrame::~wxFrame() { - m_isBeingDeleted = TRUE; - + m_isBeingDeleted = true; DeleteAllBars(); - - wxTopLevelWindows.DeleteObject( this ); - - if (wxTheApp->GetTopWindow() == this) - wxTheApp->SetTopWindow( (wxWindow*) NULL ); - - if ((wxTopLevelWindows.Number() == 0) && - (wxTheApp->GetExitOnFrameDelete())) - { - wxTheApp->ExitMainLoop(); - } } // ---------------------------------------------------------------------------- // overridden wxWindow methods // ---------------------------------------------------------------------------- -bool wxFrame::Show( bool show ) -{ - 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 wxFrame::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) ) -{ - wxFAIL_MSG( wxT("DoMoveWindow called for wxFrame") ); -} - -void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags ) -{ - wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - - /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */ - wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); - - /* avoid recursions */ - if (m_resizing) - return; - m_resizing = TRUE; - - 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 (width == -1) m_width = 80; - } - - if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_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_maxWidth; - if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight; - - 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 ((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; -} - void wxFrame::DoGetClientSize( int *width, int *height ) const { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - wxWindow::DoGetClientSize( width, height ); + wxTopLevelWindow::DoGetClientSize( width, height ); + if (height) { - /* menu bar */ +#if wxUSE_MENUS_NATIVE + // menu bar if (m_frameMenuBar) { if (!m_menuBarDetached) - (*height) -= wxMENU_HEIGHT; + (*height) -= m_menuBarHeight; else (*height) -= wxPLACE_HOLDER; } +#endif // wxUSE_MENUS_NATIVE #if wxUSE_STATUSBAR - /* status bar */ - if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT; + // status bar + if (m_frameStatusBar && m_frameStatusBar->IsShown()) + (*height) -= wxSTATUS_HEIGHT; #endif // wxUSE_STATUSBAR #if wxUSE_TOOLBAR - /* tool bar */ - if (m_frameToolBar) + // tool bar + if (m_frameToolBar && m_frameToolBar->IsShown()) { if (m_toolBarDetached) { @@ -649,13 +289,6 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const } } #endif // wxUSE_TOOLBAR - - /* mini edge */ - *height -= m_miniEdge*2 + m_miniTitle; - } - if (width) - { - *width -= m_miniEdge*2; } } @@ -663,23 +296,25 @@ void wxFrame::DoSetClientSize( int width, int height ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - /* menu bar */ +#if wxUSE_MENUS_NATIVE + // menu bar if (m_frameMenuBar) { if (!m_menuBarDetached) - height += wxMENU_HEIGHT; + height += m_menuBarHeight; else height += wxPLACE_HOLDER; } +#endif // wxUSE_MENUS_NATIVE #if wxUSE_STATUSBAR - /* status bar */ - if (m_frameStatusBar) height += wxSTATUS_HEIGHT; + // status bar + if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT; #endif #if wxUSE_TOOLBAR - /* tool bar */ - if (m_frameToolBar) + // tool bar + if (m_frameToolBar && m_frameToolBar->IsShown()) { if (m_toolBarDetached) { @@ -701,7 +336,7 @@ void wxFrame::DoSetClientSize( int width, int height ) } #endif - DoSetSize( -1, -1, width + m_miniEdge*2, height + m_miniEdge*2 + m_miniTitle, 0 ); + wxTopLevelWindow::DoSetClientSize( width, height ); } void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), @@ -711,17 +346,17 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), // m_x = x; // m_y = y; - /* avoid recursions */ + // avoid recursions if (m_resizing) return; - m_resizing = TRUE; + m_resizing = true; - /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */ + // 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; - /* space occupied by m_frameToolBar and m_frameMenuBar */ + // space occupied by m_frameToolBar and m_frameMenuBar int client_area_x_offset = 0, client_area_y_offset = 0; @@ -732,39 +367,45 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), skip the part which handles m_frameMenuBar, m_frameToolBar and (most importantly) m_mainWidget */ - 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; + int minWidth = GetMinWidth(), + minHeight = GetMinHeight(), + maxWidth = GetMaxWidth(), + maxHeight = GetMaxHeight(); + + 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_mainWidget) { - /* set size hints */ + // 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; + 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 = m_minWidth; - geom.min_height = m_minHeight; - geom.max_width = m_maxWidth; - geom.max_height = m_maxHeight; + 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. */ + // 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. +#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 = wxMENU_HEIGHT; + int hh = m_menuBarHeight; if (m_menuBarDetached) hh = wxPLACE_HOLDER; m_frameMenuBar->m_x = xx; m_frameMenuBar->m_y = yy; @@ -775,25 +416,28 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), xx, yy, ww, hh ); client_area_y_offset += hh; } +#endif // wxUSE_MENUS_NATIVE #if wxUSE_TOOLBAR - if ((m_frameToolBar) && + 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 += wxMENU_HEIGHT; + 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 */ + // don't change the toolbar's reported height/width int ww, hh; if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL ) { @@ -828,12 +472,12 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), } 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 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) + if (m_frameStatusBar && m_frameStatusBar->IsShown()) { int xx = 0 + m_miniEdge; int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset; @@ -846,17 +490,23 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), 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 ); + if (GTK_WIDGET_DRAWABLE (m_frameStatusBar->m_widget)) + { + gtk_widget_queue_draw (m_frameStatusBar->m_widget); + // FIXME: Do we really want to force an immediate redraw? + gdk_window_process_updates (m_frameStatusBar->m_widget->window, TRUE); + } } -#endif +#endif // wxUSE_STATUSBAR - m_sizeSet = TRUE; + 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) { @@ -864,72 +514,76 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), event2.SetEventObject( m_frameStatusBar ); m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 ); } +#endif // wxUSE_STATUSBAR - m_resizing = FALSE; -} - -void wxFrame::MakeModal( bool modal ) -{ - if (modal) - gtk_grab_add( m_widget ); - else - gtk_grab_remove( m_widget ); + m_resizing = false; } void wxFrame::OnInternalIdle() { - if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow)) - { - GtkOnSize( m_x, m_y, m_width, m_height ); - - // we'll come back later - if (g_isIdle) - wxapp_install_idle_handler(); - return; - } + wxFrameBase::OnInternalIdle(); +#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 + 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 // ---------------------------------------------------------------------------- -void wxFrame::SetMenuBar( wxMenuBar *menuBar ) +#if wxUSE_MENUS_NATIVE + +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 ) { 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 ); + g_signal_handlers_disconnect_by_func (m_frameMenuBar->m_widget, + (gpointer) gtk_menu_attached_callback, + this); - gtk_signal_disconnect_by_func( GTK_OBJECT(m_frameMenuBar->m_widget), - GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this ); + g_signal_handlers_disconnect_by_func (m_frameMenuBar->m_widget, + (gpointer) gtk_menu_detached_callback, + this); } - 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 ); + + gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget ); } - m_frameMenuBar = menuBar; + wxFrameBase::DetachMenuBar(); +} + +void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) +{ + wxFrameBase::AttachMenuBar(menuBar); if (m_frameMenuBar) { @@ -945,43 +599,72 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar ) 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 ); + g_signal_connect (menuBar->m_widget, "child_attached", + G_CALLBACK (gtk_menu_attached_callback), + this); + g_signal_connect (menuBar->m_widget, "child_detached", + G_CALLBACK (gtk_menu_detached_callback), + this); } - m_frameMenuBar->Show( TRUE ); + gtk_widget_show( m_frameMenuBar->m_widget ); + + UpdateMenuBarSize(); } + else + { + m_menuBarHeight = 2; + GtkUpdateSize(); // resize window in OnInternalIdle + } +} - /* resize window in OnInternalIdle */ - m_sizeSet = FALSE; +void wxFrame::UpdateMenuBarSize() +{ + GtkRequisition req; + + req.width = 2; + req.height = 2; + + // this is called after Remove with a NULL m_frameMenuBar + if ( m_frameMenuBar ) + (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_frameMenuBar->m_widget) )->size_request ) + (m_frameMenuBar->m_widget, &req ); + + m_menuBarHeight = req.height; + + // resize window in OnInternalIdle + + GtkUpdateSize(); } +#endif // wxUSE_MENUS_NATIVE + #if wxUSE_TOOLBAR + wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& name ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - m_insertInClientArea = FALSE; + m_insertInClientArea = false; m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name ); - m_insertInClientArea = TRUE; + m_insertInClientArea = true; - m_sizeSet = FALSE; + GtkUpdateSize(); return m_frameToolBar; } void wxFrame::SetToolBar(wxToolBar *toolbar) { + bool hadTbar = m_frameToolBar != NULL; + wxFrameBase::SetToolBar(toolbar); - if (m_frameToolBar) + if ( m_frameToolBar ) { - /* insert into toolbar area if not already there */ + // insert into toolbar area if not already there if ((m_frameToolBar->m_widget->parent) && (m_frameToolBar->m_widget->parent != m_mainWidget)) { @@ -991,6 +674,14 @@ void wxFrame::SetToolBar(wxToolBar *toolbar) GtkUpdateSize(); } } + else // toolbar unset + { + // still need to update size if it had been there before + if ( hadTbar ) + { + GtkUpdateSize(); + } + } } #endif // wxUSE_TOOLBAR @@ -1005,79 +696,26 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); // because it will change when toolbar is added - m_sizeSet = FALSE; + GtkUpdateSize(); return wxFrameBase::CreateStatusBar( number, style, id, name ); } -void wxFrame::PositionStatusBar() +void wxFrame::SetStatusBar(wxStatusBar *statbar) { - if ( !m_frameStatusBar ) - return; + bool hadStatBar = m_frameStatusBar != NULL; - m_sizeSet = FALSE; -} -#endif // wxUSE_STATUSBAR + wxFrameBase::SetStatusBar(statbar); -// ---------------------------------------------------------------------------- -// frame title/icon -// ---------------------------------------------------------------------------- - -void wxFrame::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() ); + if (hadStatBar && !m_frameStatusBar) + GtkUpdateSize(); } -void wxFrame::SetIcon( const wxIcon &icon ) +void wxFrame::PositionStatusBar() { - wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - - wxFrameBase::SetIcon(icon); - - if ( !m_icon.Ok() ) - return; - - if (!m_widget->window) + if ( !m_frameStatusBar ) 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 (TODO) -// ---------------------------------------------------------------------------- - -void wxFrame::Maximize(bool WXUNUSED(maximize)) -{ -} - -bool wxFrame::IsMaximized() const -{ - return FALSE; -} - -void wxFrame::Restore() -{ -} - -void wxFrame::Iconize( bool iconize ) -{ - if (iconize) - { - XIconifyWindow( GDK_WINDOW_XDISPLAY( m_widget->window ), - GDK_WINDOW_XWINDOW( m_widget->window ), - DefaultScreen( GDK_DISPLAY() ) ); - } -} - -bool wxFrame::IsIconized() const -{ - return FALSE; + GtkUpdateSize(); } +#endif // wxUSE_STATUSBAR