X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5aa5e35adec2ddcb4b77489bb2c6ce98dea872b5..bbf7db28cbab49712d486679e4614479c04d0fbd:/src/gtk/frame.cpp diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index d809e69266..0e181020ff 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -8,7 +8,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "frame.h" + #pragma implementation "frame.h" #endif #include "wx/frame.h" @@ -31,20 +31,39 @@ 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; //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- -extern wxList wxTopLevelWindows; extern wxList wxPendingDelete; +//----------------------------------------------------------------------------- +// debug +//----------------------------------------------------------------------------- + +#ifdef __WXDEBUG__ + +extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window ); + +#endif + //----------------------------------------------------------------------------- // "size_allocate" //----------------------------------------------------------------------------- static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win ) { + if (g_isIdle) wxapp_install_idle_handler(); + if (!win->HasVMT()) return; /* @@ -68,6 +87,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()) @@ -80,12 +101,70 @@ static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WX return TRUE; } +//----------------------------------------------------------------------------- +// "child_attached" of menu bar +//----------------------------------------------------------------------------- + +static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) +{ + if (g_isIdle) wxapp_install_idle_handler(); + + if (!win->HasVMT()) return; + + win->m_menuBarDetached = FALSE; + win->m_sizeSet = FALSE; +} + +//----------------------------------------------------------------------------- +// "child_detached" of menu bar +//----------------------------------------------------------------------------- + +static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) +{ + if (g_isIdle) wxapp_install_idle_handler(); + + if (!win->HasVMT()) return; + + win->m_menuBarDetached = TRUE; + win->m_sizeSet = FALSE; +} + +//----------------------------------------------------------------------------- +// "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->HasVMT()) return; + + win->m_toolBarDetached = FALSE; + win->m_sizeSet = FALSE; +} + +//----------------------------------------------------------------------------- +// "child_detached" of tool bar +//----------------------------------------------------------------------------- + +static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSED(child), wxFrame *win ) +{ + if (g_isIdle) wxapp_install_idle_handler(); + + if (!win->HasVMT()) return; + + win->m_toolBarDetached = TRUE; + win->m_sizeSet = FALSE; +} + //----------------------------------------------------------------------------- // "configure_event" //----------------------------------------------------------------------------- static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win ) { + if (g_isIdle) wxapp_install_idle_handler(); + if (!win->HasVMT()) return FALSE; win->m_x = event->x; @@ -98,6 +177,130 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC 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 gint +gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) +{ + 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 & wxSYSTEM_MENU) == 0) + decor |= GDK_DECOR_MENU; + if ((win->m_windowStyle & wxMINIMIZE_BOX) == 0) + { + func |= GDK_FUNC_MINIMIZE; + decor |= GDK_DECOR_MINIMIZE; + } + if ((win->m_windowStyle & wxMAXIMIZE_BOX) == 0) + { + func |= GDK_FUNC_MAXIMIZE; + decor |= GDK_DECOR_MAXIMIZE; + } + if ((win->m_windowStyle & wxRESIZE_BORDER) == 0) + func |= GDK_FUNC_RESIZE; + + 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) + 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 ); + } + + /* 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(); + while (node) + { + wxWindow *child = (wxWindow*) node->Data(); + if (child->AcceptsFocus()) + { + child->SetFocus(); + break; + } + + node = node->Next(); + } + + return FALSE; +} + +//----------------------------------------------------------------------------- +// InsertChild for wxFrame +//----------------------------------------------------------------------------- + +/* Callback for wxFrame. This very strange beast has to be used because + * C++ has no virtual methods in a constructor. We have to emulate a + * virtual function here as wxWindows requires different ways to insert + * a child in container classes. */ + +static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child ) +{ + if (wxIS_KIND_OF(child,wxToolBar) || wxIS_KIND_OF(child,wxMenuBar)) + { + /* actually, menubars are never inserted here, but this + may change one day */ + + /* these are outside the client area */ + 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) + { + 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 ); + } + } + } + else + { + /* these are inside the client area */ + gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow), + GTK_WIDGET(child->m_widget), + child->m_x, + child->m_y ); + } + + gtk_widget_set_usize( GTK_WIDGET(child->m_widget), + child->m_width, + child->m_height ); + + /* resize on OnInternalIdle */ + parent->m_sizeSet = FALSE; +} + //----------------------------------------------------------------------------- // wxFrame //----------------------------------------------------------------------------- @@ -105,6 +308,7 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC BEGIN_EVENT_TABLE(wxFrame, wxWindow) EVT_SIZE(wxFrame::OnSize) EVT_CLOSE(wxFrame::OnCloseWindow) + EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow) @@ -117,6 +321,10 @@ wxFrame::wxFrame() m_sizeSet = FALSE; m_miniEdge = 0; m_miniTitle = 0; + m_mainWidget = (GtkWidget*) NULL; + m_menuBarDetached = FALSE; + m_toolBarDetached = FALSE; + m_insertCallback = wxInsertChildInFrame; } wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, @@ -129,6 +337,10 @@ wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, m_sizeSet = FALSE; m_miniEdge = 0; m_miniTitle = 0; + m_mainWidget = (GtkWidget*) NULL; + m_menuBarDetached = FALSE; + m_toolBarDetached = FALSE; + m_insertCallback = wxInsertChildInFrame; Create( parent, id, title, pos, size, style, name ); } @@ -143,6 +355,8 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, PreCreation( parent, id, pos, size, style, name ); m_title = title; + + m_insertCallback = wxInsertChildInFrame; GtkWindowType win_type = GTK_WINDOW_TOPLEVEL; if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP; @@ -150,74 +364,88 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, m_widget = gtk_window_new( win_type ); #ifdef __WXDEBUG__ - debug_focus_in( m_widget, "wxFrame::m_widget", name ); + debug_focus_in( m_widget, _T("wxFrame::m_widget"), name ); #endif - if ((size.x != -1) && (size.y != -1)) - gtk_widget_set_usize( m_widget, m_width, m_height ); - if ((pos.x != -1) && (pos.y != -1)) - gtk_widget_set_uposition( m_widget, m_x, m_y ); - - gtk_window_set_title( GTK_WINDOW(m_widget), title ); + gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() ); GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); - gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL ); - 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_myfixed_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, _T("wxFrame::m_mainWidget"), name ); +#endif + + /* m_wxwindow only represents the client area without toolbar and menubar */ m_wxwindow = gtk_myfixed_new(); gtk_widget_show( m_wxwindow ); - GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); - + gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow ); + #ifdef __WXDEBUG__ - debug_focus_in( m_wxwindow, "wxFrame::m_wxwindow", name ); + debug_focus_in( m_wxwindow, _T("wxFrame::m_wxwindow"), name ); #endif - gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow ); + /* 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 ); + + PostCreation(); + + /* 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 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 ); + /* 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 ); - if (m_parent) m_parent->AddChild( this ); - - PostCreation(); - return TRUE; } wxFrame::~wxFrame() { if (m_frameMenuBar) delete m_frameMenuBar; + m_frameMenuBar = (wxMenuBar *) NULL; + if (m_frameStatusBar) delete m_frameStatusBar; + m_frameStatusBar = (wxStatusBar *) NULL; + if (m_frameToolBar) delete m_frameToolBar; + m_frameToolBar = (wxToolBar *) NULL; wxTopLevelWindows.DeleteObject( this ); - + if (wxTheApp->GetTopWindow() == this) - { wxTheApp->SetTopWindow( (wxWindow*) NULL ); - } - + if (wxTopLevelWindows.Number() == 0) - { wxTheApp->ExitMainLoop(); - } } bool wxFrame::Show( bool show ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxASSERT_MSG( (m_widget != NULL), _T("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 nor from within the size_allocate - // handler, because GTK 1.1.X forbids that. + /* 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 ); } @@ -225,46 +453,24 @@ bool wxFrame::Show( bool show ) return wxWindow::Show( show ); } -void wxFrame::OnCloseWindow( wxCloseEvent &event ) -{ - if (GetEventHandler()->OnClose() || event.GetForce()) this->Destroy(); -} - bool wxFrame::Destroy() { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); return TRUE; } -wxPoint wxFrame::GetClientAreaOrigin() const +void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags ) { - wxPoint pt( m_miniEdge, m_miniEdge + m_miniTitle ); - if (m_frameMenuBar) - { - int h = 0; - m_frameMenuBar->GetSize( (int*)NULL, &h ); - pt.y += h; - } - if (m_frameToolBar) - { - int h = 0; - m_frameToolBar->GetSize( (int*)NULL, &h ); - pt.y += h; - } - return pt; -} - -void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags ) -{ - wxASSERT_MSG( (m_widget != NULL), "invalid window" ); - - // Don't do anything for children of wxMDIChildFrame - if (!m_wxwindow) return; + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); - if (m_resizing) return; // I don't like recursions + /* 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; m_resizing = TRUE; int old_x = m_x; @@ -305,54 +511,69 @@ void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags ) 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 ); + { + /* we set the size here and in gtk_frame_map_callback */ + 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; } - wxSizeEvent event( wxSize(m_width,m_height), GetId() ); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); - m_resizing = FALSE; } -void wxFrame::SetSize( int width, int height ) -{ - SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING ); -} - void wxFrame::Centre( int direction ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); int x = 0; int y = 0; - if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2; - if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2; + if ((direction & wxHORIZONTAL) == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2; + if ((direction & wxVERTICAL) == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2; Move( x, y ); } void wxFrame::GetClientSize( int *width, int *height ) const { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); wxWindow::GetClientSize( width, height ); if (height) { - if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT; + /* menu bar */ + if (m_frameMenuBar) + { + if (!m_menuBarDetached) + (*height) -= wxMENU_HEIGHT; + else + (*height) -= wxPLACE_HOLDER; + } + + /* status bar */ if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT; + + /* tool bar */ if (m_frameToolBar) { - int y = 0; - m_frameToolBar->GetSize( (int *) NULL, &y ); - (*height) -= y; + if (!m_toolBarDetached) + { + int y = 0; + m_frameToolBar->GetSize( (int *) NULL, &y ); + (*height) -= y; + } + else + (*height) -= wxPLACE_HOLDER; } + + /* mini edge */ (*height) -= m_miniEdge*2 + m_miniTitle; } if (width) @@ -361,20 +582,36 @@ void wxFrame::GetClientSize( int *width, int *height ) const } } -void wxFrame::SetClientSize( int const width, int const height ) +void wxFrame::DoSetClientSize( int width, int height ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); - int h = height; - if (m_frameMenuBar) h += wxMENU_HEIGHT; - if (m_frameStatusBar) h += wxSTATUS_HEIGHT; - if (m_frameToolBar) - { - int y = 0; - m_frameToolBar->GetSize( (int *) NULL, &y ); - h += y; - } - wxWindow::SetClientSize( width + m_miniEdge*2, h + m_miniEdge*2 + m_miniTitle ); + /* menu bar */ + if (m_frameMenuBar) + { + if (!m_menuBarDetached) + height += wxMENU_HEIGHT; + else + height += wxPLACE_HOLDER; + } + + /* status bar */ + if (m_frameStatusBar) height += wxSTATUS_HEIGHT; + + /* tool bar */ + if (m_frameToolBar) + { + if (!m_toolBarDetached) + { + int y = 0; + m_frameToolBar->GetSize( (int *) NULL, &y ); + height += y; + } + else + height += wxPLACE_HOLDER; + } + + wxWindow::DoSetClientSize( width + m_miniEdge*2, height + m_miniEdge*2 + m_miniTitle ); } void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height ) @@ -383,62 +620,105 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height // m_x = x; // m_y = y; + /* avoid recursions */ if (m_resizing) return; m_resizing = TRUE; - if (!m_wxwindow) return; - + /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */ + wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid frame") ); + m_width = width; m_height = height; - if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth; - if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight; - if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth; - if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight; - - gtk_widget_set_usize( m_widget, m_width, m_height ); - - // this emulates the new wxMSW behaviour of placing all - // frame-subwindows (menu, toolbar..) on one native window - // OK, this hurts in the eye, but I don't want to call SetSize() - // because I don't want to call any non-native functions here. - - if (m_frameMenuBar) + /* space occupied by m_frameToolBar and m_frameMenuBar */ + 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 + set in wxFrame::Create so it is used to check what kind of frame we + have here. if m_mainWidget is NULL it is a wxMDIChildFrame and so we + skip the part which handles m_frameMenuBar, m_frameToolBar and (most + importantly) m_mainWidget */ + + if (m_mainWidget) { - int xx = m_miniEdge; - int yy = m_miniEdge + m_miniTitle; - int ww = m_width - 2*m_miniEdge; - int hh = wxMENU_HEIGHT; - m_frameMenuBar->m_x = xx; - m_frameMenuBar->m_y = yy; - m_frameMenuBar->m_width = ww; - m_frameMenuBar->m_height = hh; - - gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameMenuBar->m_widget, xx, yy ); - gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh ); - } + /* check if size is in legal range */ + 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; + + /* 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 (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_myfixed_move( GTK_MYFIXED(m_mainWidget), m_frameMenuBar->m_widget, xx, yy ); + +// m_frameMenuBar->m_widget->requisition.width = ww; +// m_frameMenuBar->m_widget->requisition.height = hh; + gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh ); + + client_area_y_offset += hh; + } + + 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; + } + int ww = m_width - 2*m_miniEdge; + int hh = m_frameToolBar->m_height; + 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; + } + + 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 ); - if (m_frameToolBar) + 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 ); + } + else { - int xx = m_miniEdge; - int yy = m_miniEdge + m_miniTitle; - if (m_frameMenuBar) yy += wxMENU_HEIGHT; - int ww = m_width - 2*m_miniEdge; - int hh = m_frameToolBar->m_height; - - m_frameToolBar->m_x = xx; - m_frameToolBar->m_y = yy; - m_frameToolBar->m_height = hh; - m_frameToolBar->m_width = ww; - - gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameToolBar->m_widget, xx, yy ); - gtk_widget_set_usize( m_frameToolBar->m_widget, ww, hh ); + /* if there is no m_mainWidget between m_widget and m_wxwindow there + is no need to set the size or position of m_wxwindow. */ } - + if (m_frameStatusBar) { int xx = 0 + m_miniEdge; - int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge; + int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset; int ww = m_width - 2*m_miniEdge; int hh = wxSTATUS_HEIGHT; @@ -448,19 +728,23 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height m_frameStatusBar->m_height = hh; gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, xx, yy ); + +// m_frameStatusBar->m_widget->requisition.width = ww; +// m_frameStatusBar->m_widget->requisition.height = hh; gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh ); } + /* we actually set the size of a frame here and no-where else */ + gtk_widget_set_usize( m_widget, m_width, m_height ); + m_sizeSet = TRUE; /* send size event to frame */ - wxSizeEvent event( wxSize(m_width,m_height), GetId() ); event.SetEventObject( this ); GetEventHandler()->ProcessEvent( event ); /* send size event to status bar */ - if (m_frameStatusBar) { wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() ); @@ -473,15 +757,20 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height void wxFrame::OnInternalIdle() { - if (!m_sizeSet) + if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow)) GtkOnSize( m_x, m_y, m_width, m_height ); DoMenuUpdates(); } +void wxFrame::OnCloseWindow( wxCloseEvent& event ) +{ + Destroy(); +} + void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); if (GetAutoLayout()) { @@ -489,39 +778,44 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) ) } else { - // no child: go out ! - if (!GetChildren().First()) return; - - // do we have exactly one child? - wxWindow *child = (wxWindow *) NULL; - for(wxNode *node = GetChildren().First(); node; node = node->Next()) + /* do we have exactly one child? */ + wxWindow *child = (wxWindow *)NULL; + for ( wxNode *node = GetChildren().First(); node; node = node->Next() ) { wxWindow *win = (wxWindow *)node->Data(); - if (!wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog) -#if 0 // not in m_children anyway ? - && (win != m_frameMenuBar) && - (win != m_frameToolBar) && - (win != m_frameStatusBar) -#endif - ) + if ( !wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog) ) { - // it's the second one: do nothing - if (child) return; + if (child) + { + /* it's the second one: do nothing */ + return; + } + child = win; } } - // yes: set it's size to fill all the frame - int client_x, client_y; - GetClientSize( &client_x, &client_y ); - child->SetSize( 1, 1, client_x-2, client_y-2 ); + /* no children at all? */ + if (child) + { + /* yes: set it's size to fill all the frame */ + int client_x, client_y; + GetClientSize( &client_x, &client_y ); + child->SetSize( 1, 1, client_x-2, client_y-2 ); + } } } static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) { menu->SetInvokingWindow( win ); - wxNode *node = menu->m_items.First(); + +#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(); @@ -533,14 +827,19 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) void wxFrame::SetMenuBar( wxMenuBar *menuBar ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); + wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid frame") ); m_frameMenuBar = menuBar; if (m_frameMenuBar) { - wxNode *node = m_frameMenuBar->m_menus.First(); +#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 + + wxNode *node = m_frameMenuBar->GetMenus().First(); while (node) { wxMenu *menu = (wxMenu*)node->Data(); @@ -551,11 +850,21 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar ) if (m_frameMenuBar->m_parent != this) { m_frameMenuBar->m_parent = this; - gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), + 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) + { + 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 ); + } } } + /* resize window in OnInternalIdle */ m_sizeSet = FALSE; } @@ -564,11 +873,32 @@ wxMenuBar *wxFrame::GetMenuBar() const return m_frameMenuBar; } +void wxFrame::OnMenuHighlight(wxMenuEvent& event) +{ + if (GetStatusBar()) + { + // if no help string found, we will clear the status bar text + wxString helpString; + + int menuId = event.GetMenuId(); + if ( menuId != -1 ) + { + wxMenuBar *menuBar = GetMenuBar(); + if (menuBar) + { + helpString = menuBar->GetHelpString(menuId); + } + } + + SetStatusText(helpString); + } +} + wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); - wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" ); + wxCHECK_MSG( m_frameToolBar == NULL, FALSE, _T("recreating toolbar in wxFrame") ); m_frameToolBar = OnCreateToolBar( style, id, name ); @@ -591,9 +921,9 @@ wxToolBar *wxFrame::GetToolBar() const wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); - wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" ); + wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, _T("recreating status bar in wxFrame") ); m_frameStatusBar = OnCreateStatusBar( number, style, id, name ); @@ -623,20 +953,40 @@ wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id, return statusBar; } +void wxFrame::Command( int id ) +{ + 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::SetStatusText(const wxString& text, int number) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); - wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" ); + wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set text for") ); m_frameStatusBar->SetStatusText(text, number); } void wxFrame::SetStatusWidths(int n, const int widths_field[] ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); - wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" ); + wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set widths for") ); m_frameStatusBar->SetStatusWidths(n, widths_field); } @@ -648,20 +998,22 @@ wxStatusBar *wxFrame::GetStatusBar() const void wxFrame::SetTitle( const wxString &title ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); m_title = title; - if (m_title.IsNull()) m_title = ""; - gtk_window_set_title( GTK_WINDOW(m_widget), title ); + if (m_title.IsNull()) m_title = _T(""); + gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() ); } void wxFrame::SetIcon( const wxIcon &icon ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); m_icon = icon; if (!icon.Ok()) return; + if (!m_widget->window) return; + wxMask *mask = icon.GetMask(); GdkBitmap *bm = (GdkBitmap *) NULL; if (mask) bm = mask->GetBitmap();