X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab46dc18ab5cee150a1cc7a52dae21a9bcae4043..bb69661b050ad2c774985e225cce0e497a875143:/src/gtk1/frame.cpp diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 987b75e89e..61259fad4b 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -16,14 +16,19 @@ #include "wx/control.h" #include "wx/app.h" #include "wx/menu.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 "wx/gtk/win_gtk.h" +#include "gdk/gdkkeysyms.h" //----------------------------------------------------------------------------- // constants @@ -62,23 +67,17 @@ extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win ) { - if (g_isIdle) wxapp_install_idle_handler(); - - if (!win->HasVMT()) return; + if (g_isIdle) + wxapp_install_idle_handler(); -/* - printf( "OnFrameResize from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( ".\n" ); -*/ + if (!win->m_hasVMT) return; - 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; - } + if ((win->m_width != alloc->width) || (win->m_height != alloc->height)) + { + win->m_width = alloc->width; + win->m_height = alloc->height; + win->UpdateSize(); + } } //----------------------------------------------------------------------------- @@ -87,14 +86,8 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win ) { - if (g_isIdle) wxapp_install_idle_handler(); - -/* - printf( "OnDelete from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( ".\n" ); -*/ + if (g_isIdle) + wxapp_install_idle_handler(); win->Close(); @@ -107,12 +100,10 @@ static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WX static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { - if (g_isIdle) wxapp_install_idle_handler(); + if (!win->m_hasVMT) return; - if (!win->HasVMT()) return; - win->m_menuBarDetached = FALSE; - win->m_sizeSet = FALSE; + win->UpdateSize(); } //----------------------------------------------------------------------------- @@ -121,26 +112,24 @@ static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget * 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; - if (!win->HasVMT()) return; - win->m_menuBarDetached = TRUE; - win->m_sizeSet = FALSE; + win->UpdateSize(); } +#if wxUSE_TOOLBAR //----------------------------------------------------------------------------- // "child_attached" of tool bar //----------------------------------------------------------------------------- static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { - if (g_isIdle) wxapp_install_idle_handler(); + if (!win->m_hasVMT) return; - if (!win->HasVMT()) return; - win->m_toolBarDetached = FALSE; - win->m_sizeSet = FALSE; + + win->UpdateSize(); } //----------------------------------------------------------------------------- @@ -149,26 +138,42 @@ static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidge static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSED(child), wxFrame *win ) { - if (g_isIdle) wxapp_install_idle_handler(); + if (g_isIdle) + wxapp_install_idle_handler(); + + if (!win->m_hasVMT) return; - if (!win->HasVMT()) return; - win->m_toolBarDetached = TRUE; - win->m_sizeSet = FALSE; + win->UpdateSize(); } +#endif // wxUSE_TOOLBAR //----------------------------------------------------------------------------- // "configure_event" //----------------------------------------------------------------------------- -static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win ) +static gint +#if (GTK_MINOR_VERSON > 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 (g_isIdle) + wxapp_install_idle_handler(); - if (!win->HasVMT()) return FALSE; + if (!win->m_hasVMT) return FALSE; +#if (GTK_MINOR_VERSON > 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 ); @@ -181,69 +186,79 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC // "realize" from m_widget //----------------------------------------------------------------------------- -/* we cannot MWM hints and icons before the widget has been realized, +/* we cannot MWM hints and icons before the widget has been realized, so we do this directly after realization */ -static gint +static gint gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) { - if (g_isIdle) wxapp_install_idle_handler(); + if (g_isIdle) + wxapp_install_idle_handler(); /* 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_ALL; - long func = (long) GDK_FUNC_ALL; - - if ((win->m_windowStyle & wxCAPTION) == 0) - decor |= GDK_DECOR_TITLE; -/* if ((win->m_windowStyle & wxMINIMIZE) == 0) - func |= GDK_FUNC_MINIMIZE; - if ((win->m_windowStyle & wxMAXIMIZE) == 0) - func |= GDK_FUNC_MAXIMIZE; */ - if ((win->m_windowStyle & wxSYSTEM_MENU) == 0) - decor |= GDK_DECOR_MENU; - if ((win->m_windowStyle & wxMINIMIZE_BOX) == 0) - decor |= GDK_DECOR_MINIMIZE; - if ((win->m_windowStyle & wxMAXIMIZE_BOX) == 0) - decor |= GDK_DECOR_MAXIMIZE; - if ((win->m_windowStyle & wxRESIZE_BORDER) == 0) - func |= GDK_FUNC_RESIZE; - + 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->m_windowStyle & wxRESIZE_BORDER) == 0) + 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 */ if (win->m_icon != wxNullIcon) { wxIcon icon( win->m_icon ); win->m_icon = wxNullIcon; - win->SetIcon( icon ); + 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? */ - wxNode *node = win->m_children.First(); + wxWindowList::Node *node = win->GetChildren().GetFirst(); while (node) { - wxWindow *child = (wxWindow*) node->Data(); - if (child->AcceptsFocus()) - { - child->SetFocus(); - break; - } - - node = node->Next(); + wxWindow *child = node->GetData(); + if (child->AcceptsFocus()) + { + child->SetFocus(); + break; + } + + node = node->GetNext(); } - + return FALSE; } - + //----------------------------------------------------------------------------- // InsertChild for wxFrame //----------------------------------------------------------------------------- @@ -253,34 +268,35 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) * virtual function here as wxWindows requires different ways to insert * a child in container classes. */ -static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child ) +static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) { - if (wxIS_KIND_OF(child,wxToolBar) || wxIS_KIND_OF(child,wxMenuBar)) + if (!parent->m_insertInClientArea) { - /* actually, menubars are never inserted here, but this - may change one day */ - /* these are outside the client area */ - wxFrame* frame = (wxFrame*) parent; + wxFrame* frame = (wxFrame*) parent; gtk_myfixed_put( GTK_MYFIXED(frame->m_mainWidget), GTK_WIDGET(child->m_widget), child->m_x, - child->m_y ); - - /* 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->m_windowStyle & wxTB_DOCKABLE) - { + child->m_y, + child->m_width, + child->m_height ); + +#if wxUSE_TOOLBAR + /* 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 { @@ -288,15 +304,13 @@ static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child ) gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow), GTK_WIDGET(child->m_widget), child->m_x, - child->m_y ); + child->m_y, + child->m_width, + child->m_height ); } - gtk_widget_set_usize( GTK_WIDGET(child->m_widget), - child->m_width, - child->m_height ); - /* resize on OnInternalIdle */ - parent->m_sizeSet = FALSE; + parent->UpdateSize(); } //----------------------------------------------------------------------------- @@ -311,34 +325,30 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow) -wxFrame::wxFrame() +void wxFrame::Init() { m_frameMenuBar = (wxMenuBar *) NULL; +#if wxUSE_STATUSBAR m_frameStatusBar = (wxStatusBar *) NULL; +#endif // wxUSE_STATUSBAR +#if wxUSE_TOOLBAR m_frameToolBar = (wxToolBar *) NULL; +#endif // wxUSE_TOOLBAR m_sizeSet = FALSE; m_miniEdge = 0; m_miniTitle = 0; m_mainWidget = (GtkWidget*) NULL; m_menuBarDetached = FALSE; m_toolBarDetached = FALSE; - m_insertCallback = wxInsertChildInFrame; + m_insertInClientArea = TRUE; } 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; - m_mainWidget = (GtkWidget*) NULL; - m_menuBarDetached = FALSE; - m_toolBarDetached = FALSE; - m_insertCallback = wxInsertChildInFrame; + Init(); + Create( parent, id, title, pos, size, style, name ); } @@ -353,14 +363,17 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, PreCreation( parent, id, pos, size, style, name ); m_title = title; - - m_insertCallback = wxInsertChildInFrame; + + m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame; GtkWindowType win_type = GTK_WINDOW_TOPLEVEL; if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP; m_widget = gtk_window_new( win_type ); + if (!name.IsEmpty()) + gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() ); + #ifdef __WXDEBUG__ debug_focus_in( m_widget, _T("wxFrame::m_widget"), name ); #endif @@ -376,7 +389,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, 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, _T("wxFrame::m_mainWidget"), name ); #endif @@ -385,7 +398,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, m_wxwindow = gtk_myfixed_new(); gtk_widget_show( m_wxwindow ); gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow ); - + #ifdef __WXDEBUG__ debug_focus_in( m_wxwindow, _T("wxFrame::m_wxwindow"), name ); #endif @@ -401,8 +414,8 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, /* 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 ); - + GTK_SIGNAL_FUNC(gtk_frame_realized_callback), (gpointer) 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 ); @@ -416,14 +429,20 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, wxFrame::~wxFrame() { + m_isBeingDeleted = TRUE; + if (m_frameMenuBar) delete m_frameMenuBar; m_frameMenuBar = (wxMenuBar *) NULL; - + +#if wxUSE_STATUSBAR if (m_frameStatusBar) delete m_frameStatusBar; m_frameStatusBar = (wxStatusBar *) NULL; - +#endif // wxUSE_STATUSBAR + +#if wxUSE_TOOLBAR if (m_frameToolBar) delete m_frameToolBar; m_frameToolBar = (wxToolBar *) NULL; +#endif // wxUSE_TOOLBAR wxTopLevelWindows.DeleteObject( this ); @@ -466,9 +485,9 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags ) /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */ wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid frame") ); - + /* avoid recursions */ - if (m_resizing) return; + if (m_resizing) return; m_resizing = TRUE; int old_x = m_x; @@ -476,7 +495,7 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags ) int old_width = m_width; int old_height = m_height; - if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING) + if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0) { if (x != -1) m_x = x; if (y != -1) m_y = y; @@ -510,16 +529,15 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags ) { if ((m_x != old_x) || (m_y != old_y)) { - /* we set the size here and in gtk_frame_map_callback */ - gtk_widget_set_uposition( m_widget, m_x, m_y ); + gtk_widget_set_uposition( m_widget, m_x, m_y ); } } if ((m_width != old_width) || (m_height != old_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. */ + 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; } @@ -539,39 +557,43 @@ void wxFrame::Centre( int direction ) Move( x, y ); } -void wxFrame::GetClientSize( int *width, int *height ) const +void wxFrame::DoGetClientSize( int *width, int *height ) const { wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); - wxWindow::GetClientSize( width, height ); + wxWindow::DoGetClientSize( width, height ); if (height) { /* menu bar */ if (m_frameMenuBar) - { - if (!m_menuBarDetached) - (*height) -= wxMENU_HEIGHT; - else - (*height) -= wxPLACE_HOLDER; - } - - /* status bar */ + { + if (!m_menuBarDetached) + (*height) -= wxMENU_HEIGHT; + else + (*height) -= wxPLACE_HOLDER; + } + +#if wxUSE_STATUSBAR + /* status bar */ if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT; - - /* tool bar */ +#endif + +#if wxUSE_TOOLBAR + /* tool bar */ if (m_frameToolBar) { - if (!m_toolBarDetached) - { + if (!m_toolBarDetached) + { int y = 0; m_frameToolBar->GetSize( (int *) NULL, &y ); (*height) -= y; - } - else + } + else (*height) -= wxPLACE_HOLDER; } - - /* mini edge */ +#endif + + /* mini edge */ (*height) -= m_miniEdge*2 + m_miniTitle; } if (width) @@ -586,29 +608,33 @@ void wxFrame::DoSetClientSize( int width, int height ) /* menu bar */ if (m_frameMenuBar) - { - if (!m_menuBarDetached) - height += wxMENU_HEIGHT; - else - height += wxPLACE_HOLDER; - } - - /* status bar */ + { + if (!m_menuBarDetached) + height += wxMENU_HEIGHT; + else + height += wxPLACE_HOLDER; + } + +#if wxUSE_STATUSBAR + /* status bar */ if (m_frameStatusBar) height += wxSTATUS_HEIGHT; - - /* tool bar */ +#endif + +#if wxUSE_TOOLBAR + /* tool bar */ if (m_frameToolBar) { - if (!m_toolBarDetached) - { + if (!m_toolBarDetached) + { int y = 0; m_frameToolBar->GetSize( (int *) NULL, &y ); height += y; - } - else + } + else height += wxPLACE_HOLDER; } - +#endif + wxWindow::DoSetClientSize( width + m_miniEdge*2, height + m_miniEdge*2 + m_miniTitle ); } @@ -624,12 +650,12 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */ wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid frame") ); - + m_width = width; m_height = height; /* space occupied by m_frameToolBar and m_frameMenuBar */ - int client_area_y_offset = 0; + int client_area_y_offset = 0; /* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses wxWindow::Create to create it's GTK equivalent. m_mainWidget is only @@ -637,7 +663,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height 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 */ - + if (m_mainWidget) { /* check if size is in legal range */ @@ -651,79 +677,80 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height * 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 (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; + 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_myfixed_move( GTK_MYFIXED(m_mainWidget), m_frameMenuBar->m_widget, xx, yy ); - gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh ); - - client_area_y_offset += hh; + gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), + m_frameMenuBar->m_widget, + xx, yy, ww, hh ); + client_area_y_offset += hh; } - + +#if wxUSE_TOOLBAR if (m_frameToolBar) { int xx = m_miniEdge; int yy = m_miniEdge + m_miniTitle; if (m_frameMenuBar) - { - if (!m_menuBarDetached) - yy += wxMENU_HEIGHT; - else - yy += wxPLACE_HOLDER; - } + { + if (!m_menuBarDetached) + yy += wxMENU_HEIGHT; + else + yy += wxPLACE_HOLDER; + } int ww = m_width - 2*m_miniEdge; int hh = m_frameToolBar->m_height; - if (m_toolBarDetached) hh = wxPLACE_HOLDER; + if (m_toolBarDetached) hh = wxPLACE_HOLDER; m_frameToolBar->m_x = xx; m_frameToolBar->m_y = yy; /* m_frameToolBar->m_height = hh; don't change the toolbar's height */ m_frameToolBar->m_width = ww; - - gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_frameToolBar->m_widget, xx, yy ); - gtk_widget_set_usize( m_frameToolBar->m_widget, ww, hh ); - - client_area_y_offset += hh; + gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), + m_frameToolBar->m_widget, + xx, yy, ww, hh ); + client_area_y_offset += hh; } - - int client_x = m_miniEdge; - int client_y = client_area_y_offset + m_miniEdge + m_miniTitle; - gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_wxwindow, client_x, client_y ); +#endif + int client_x = m_miniEdge; + int client_y = client_area_y_offset + m_miniEdge + m_miniTitle; int client_w = m_width - 2*m_miniEdge; - int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle; - gtk_widget_set_usize( m_wxwindow, client_w, client_h ); + int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle; + gtk_myfixed_set_size( GTK_MYFIXED(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. */ + is no need to set the size or position of m_wxwindow. */ } - + +#if wxUSE_STATUSBAR if (m_frameStatusBar) { 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_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, xx, yy ); - gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh ); + gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow), + m_frameStatusBar->m_widget, + xx, yy, ww, hh ); } +#endif /* we actually set the size of a frame here and no-where else */ gtk_widget_set_usize( m_widget, m_width, m_height ); @@ -746,15 +773,31 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height m_resizing = FALSE; } +void wxFrame::MakeModal( bool modal ) +{ + if (modal) + gtk_grab_add( m_widget ); + else + gtk_grab_remove( m_widget ); +} + void wxFrame::OnInternalIdle() { if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow)) GtkOnSize( m_x, m_y, m_width, m_height ); DoMenuUpdates(); + + if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle(); +#if wxUSE_TOOLBAR + if (m_frameToolBar) m_frameToolBar->OnInternalIdle(); +#endif +#if wxUSE_STATUSBAR + if (m_frameStatusBar) m_frameStatusBar->OnInternalIdle(); +#endif } -void wxFrame::OnCloseWindow( wxCloseEvent& event ) +void wxFrame::OnCloseWindow( wxCloseEvent& WXUNUSED(event) ) { Destroy(); } @@ -763,11 +806,13 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) ) { wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); +#if wxUSE_CONSTRAINTS if (GetAutoLayout()) { Layout(); } else +#endif // wxUSE_CONSTRAINTS { /* do we have exactly one child? */ wxWindow *child = (wxWindow *)NULL; @@ -791,31 +836,12 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) ) { /* yes: set it's size to fill all the frame */ int client_x, client_y; - GetClientSize( &client_x, &client_y ); + DoGetClientSize( &client_x, &client_y ); child->SetSize( 1, 1, client_x-2, client_y-2 ); } } } -static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) -{ - menu->SetInvokingWindow( win ); - -#if (GTK_MINOR_VERSION > 0) - /* support for native hot keys */ - gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(win->m_widget)); -#endif - - wxNode *node = menu->GetItems().First(); - while (node) - { - wxMenuItem *menuitem = (wxMenuItem*)node->Data(); - if (menuitem->IsSubMenu()) - SetInvokingWindow( menuitem->GetSubMenu(), win ); - node = node->Next(); - } -} - void wxFrame::SetMenuBar( wxMenuBar *menuBar ) { wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); @@ -825,33 +851,28 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar ) if (m_frameMenuBar) { -#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) - /* support for native key accelerators indicated by underscroes */ - gtk_accel_group_attach( m_frameMenuBar->m_accel, GTK_OBJECT(m_widget)); -#endif + m_frameMenuBar->SetInvokingWindow( this ); - wxNode *node = m_frameMenuBar->GetMenus().First(); - while (node) + if (m_frameMenuBar->GetParent() != this) { - wxMenu *menu = (wxMenu*)node->Data(); - SetInvokingWindow( menu, this ); - node = node->Next(); - } - - if (m_frameMenuBar->m_parent != this) - { - m_frameMenuBar->m_parent = this; + m_frameMenuBar->SetParent(this); gtk_myfixed_put( GTK_MYFIXED(m_mainWidget), - m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y ); - - if (menuBar->m_windowStyle & wxMB_DOCKABLE) - { + 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 ); } } @@ -866,6 +887,7 @@ wxMenuBar *wxFrame::GetMenuBar() const void wxFrame::OnMenuHighlight(wxMenuEvent& event) { +#if wxUSE_STATUSBAR if (GetStatusBar()) { // if no help string found, we will clear the status bar text @@ -883,17 +905,23 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event) SetStatusText(helpString); } +#endif // wxUSE_STATUSBAR } -wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) +#if wxUSE_TOOLBAR +wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& name ) { wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); wxCHECK_MSG( m_frameToolBar == NULL, FALSE, _T("recreating toolbar in wxFrame") ); + m_insertInClientArea = FALSE; + m_frameToolBar = OnCreateToolBar( style, id, name ); - GetChildren().DeleteObject( m_frameToolBar ); + if (m_frameToolBar) GetChildren().DeleteObject( m_frameToolBar ); + + m_insertInClientArea = TRUE; m_sizeSet = FALSE; @@ -909,7 +937,9 @@ wxToolBar *wxFrame::GetToolBar() const { return m_frameToolBar; } +#endif // wxUSE_TOOLBAR +#if wxUSE_STATUSBAR wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name ) { wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); @@ -944,24 +974,9 @@ wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id, return statusBar; } -void wxFrame::Command( int id ) +wxStatusBar *wxFrame::GetStatusBar() const { - wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id); - commandEvent.SetInt( id ); - commandEvent.SetEventObject( this ); - - wxMenuBar *bar = GetMenuBar(); - if (!bar) return; - - wxMenuItem *item = bar->FindItemForId(id) ; - if (item && item->IsCheckable()) - { - bar->Check(id,!bar->Checked(id)) ; - } - - wxEvtHandler* evtHandler = GetEventHandler(); - - evtHandler->ProcessEvent(commandEvent); + return m_frameStatusBar; } void wxFrame::SetStatusText(const wxString& text, int number) @@ -981,10 +996,26 @@ void wxFrame::SetStatusWidths(int n, const int widths_field[] ) m_frameStatusBar->SetStatusWidths(n, widths_field); } +#endif // wxUSE_STATUSBAR -wxStatusBar *wxFrame::GetStatusBar() const +void wxFrame::Command( int id ) { - return m_frameStatusBar; + wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id); + commandEvent.SetInt( id ); + commandEvent.SetEventObject( this ); + + wxMenuBar *bar = GetMenuBar(); + if (!bar) return; + + wxMenuItem *item = bar->FindItemForId(id) ; + if (item && item->IsCheckable()) + { + bar->Check(id,!bar->Checked(id)) ; + } + + wxEvtHandler* evtHandler = GetEventHandler(); + + evtHandler->ProcessEvent(commandEvent); } void wxFrame::SetTitle( const wxString &title )