X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/907789a0f72354f30ec04f79f03a0b7e2a29ac9a..66fbdb15a49c82e631b3ed122409bed9c67c82c6:/src/gtk1/frame.cpp diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 4c987eacfd..40fd665182 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -8,7 +8,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "frame.h" + #pragma implementation "frame.h" #endif #include "wx/frame.h" @@ -19,6 +19,10 @@ #include "wx/toolbar.h" #include "wx/statusbr.h" #include "wx/dcclient.h" + +#include "glib.h" +#include "gdk/gdk.h" +#include "gtk/gtk.h" #include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- @@ -27,12 +31,12 @@ const int wxMENU_HEIGHT = 27; const int wxSTATUS_HEIGHT = 25; +const int wxPLACE_HOLDER = 0; //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- -extern wxList wxTopLevelWindows; extern wxList wxPendingDelete; //----------------------------------------------------------------------------- @@ -42,14 +46,14 @@ extern wxList wxPendingDelete; static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win ) { if (!win->HasVMT()) return; - + /* printf( "OnFrameResize from " ); if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) printf( win->GetClassInfo()->GetClassName() ); printf( ".\n" ); */ - + if ((win->m_width != alloc->width) || (win->m_height != alloc->height)) { win->m_sizeSet = FALSE; @@ -76,6 +80,54 @@ 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 (!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 (!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 (!win->HasVMT()) return; + + win->m_toolBarDetached = FALSE; + win->m_sizeSet = FALSE; +} + +//----------------------------------------------------------------------------- +// "child_detached" of tool bar +//----------------------------------------------------------------------------- + +static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) +{ + if (!win->HasVMT()) return; + + win->m_toolBarDetached = TRUE; + win->m_sizeSet = FALSE; +} + //----------------------------------------------------------------------------- // "configure_event" //----------------------------------------------------------------------------- @@ -83,13 +135,79 @@ static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WX static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win ) { if (!win->HasVMT()) return FALSE; - + win->m_x = event->x; win->m_y = event->y; - + + wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() ); + mevent.SetEventObject( win ); + win->GetEventHandler()->ProcessEvent( mevent ); + 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; + + if (parent->m_windowStyle & wxTAB_TRAVERSAL) + { + /* we now allow a window to get the focus as long as it + doesn't have any children. */ + GTK_WIDGET_UNSET_FLAGS( parent->m_wxwindow, GTK_CAN_FOCUS ); + } +} + //----------------------------------------------------------------------------- // wxFrame //----------------------------------------------------------------------------- @@ -97,7 +215,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_IDLE(wxFrame::OnIdle) + EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow) @@ -110,6 +228,9 @@ wxFrame::wxFrame() m_sizeSet = FALSE; m_miniEdge = 0; m_miniTitle = 0; + m_mainWidget = (GtkWidget*) NULL; + m_menuBarDetached = FALSE; + m_toolBarDetached = FALSE; } wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, @@ -122,6 +243,9 @@ 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; Create( parent, id, title, pos, size, style, name ); } @@ -130,124 +254,144 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, long style, const wxString &name ) { wxTopLevelWindows.Append( this ); - + m_needParent = FALSE; 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; - + m_widget = gtk_window_new( win_type ); - - 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 ); + /* needed ? */ + gtk_window_set_policy( GTK_WINDOW(m_widget), 1, 1, 0 ); 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 ); + gtk_widget_realize( m_mainWidget ); + + /* 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 ); - gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow ); + if (m_parent) m_parent->AddChild( this ); + + PostCreation(); + gtk_widget_realize( m_widget ); + + /* 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 ((m_windowStyle & wxCAPTION) == 0) + decor |= GDK_DECOR_TITLE; +/* if ((m_windowStyle & wxMINIMIZE) == 0) + func |= GDK_FUNC_MINIMIZE; + if ((m_windowStyle & wxMAXIMIZE) == 0) + func |= GDK_FUNC_MAXIMIZE; */ + if ((m_windowStyle & wxSYSTEM_MENU) == 0) + decor |= GDK_DECOR_MENU; + if ((m_windowStyle & wxMINIMIZE_BOX) == 0) + decor |= GDK_DECOR_MINIMIZE; + if ((m_windowStyle & wxMAXIMIZE_BOX) == 0) + decor |= GDK_DECOR_MAXIMIZE; + if ((m_windowStyle & wxRESIZE_BORDER) == 0) + func |= GDK_FUNC_RESIZE; + + gdk_window_set_decorations(m_widget->window, (GdkWMDecoration)decor); + gdk_window_set_functions(m_widget->window, (GdkWMFunction)func); + + /* 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 (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop(); + + 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 ); } - - return wxWindow::Show( show ); -} -void wxFrame::OnCloseWindow( wxCloseEvent &event ) -{ - if (GetEventHandler()->OnClose() || event.GetForce()) this->Destroy(); + return wxWindow::Show( show ); } 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 -{ - 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 ) +void wxFrame::DoSetSize( 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; int old_y = m_y; int old_width = m_width; int old_height = m_height; - + if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING) { if (x != -1) m_x = x; @@ -272,63 +416,78 @@ void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags ) { if (height == -1) m_height = 26; } - + if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth; if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight; - if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth; - if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight; + if ((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)) + if ((m_x != old_x) || (m_y != old_y)) + { + /* m_sizeSet = FALSE; */ 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) @@ -337,20 +496,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" ); - - 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 ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); + + /* 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 ) @@ -359,134 +534,189 @@ 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; + + /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */ + wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid frame") ); - if (!m_wxwindow) return; - m_width = width; m_height = height; - - if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth; - if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight; - if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth; - if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight; - 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; + /* 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 ); + gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh ); - gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameMenuBar->m_widget, xx, yy ); - gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh ); - } - - if (m_frameToolBar) - { - 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; + client_area_y_offset += hh; + } - m_frameToolBar->m_x = xx; - m_frameToolBar->m_y = yy; - m_frameToolBar->m_height = hh; - m_frameToolBar->m_width = ww; + 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 ); - gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), 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 ); + + 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 + { + /* 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 ww = m_width - 2*m_miniEdge; - int hh = wxSTATUS_HEIGHT; - + 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 ); } - + + /* 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() ); + event2.SetEventObject( m_frameStatusBar ); + m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 ); + } + m_resizing = FALSE; } -void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event) ) +void wxFrame::OnInternalIdle() { if (!m_sizeSet) 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()) { Layout(); } - else + 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()) + wxWindow *child = (wxWindow *)NULL; + for ( wxNode *node = GetChildren().First(); node; node = node->Next() ) { wxWindow *win = (wxWindow *)node->Data(); - if (!IS_KIND_OF(win,wxFrame) && !IS_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(); + wxNode *node = menu->GetItems().First(); while (node) { wxMenuItem *menuitem = (wxMenuItem*)node->Data(); @@ -498,49 +728,79 @@ 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(); + wxNode *node = m_frameMenuBar->GetMenus().First(); while (node) { wxMenu *menu = (wxMenu*)node->Data(); SetInvokingWindow( menu, this ); node = node->Next(); } - + 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 ); + } } } - - if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height ); + + m_sizeSet = FALSE; } -wxMenuBar *wxFrame::GetMenuBar(void) const +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" ); - - wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); + + wxCHECK_MSG( m_frameToolBar == NULL, FALSE, _T("recreating toolbar in wxFrame") ); m_frameToolBar = OnCreateToolBar( style, id, name ); - - GetChildren()->DeleteObject( m_frameToolBar ); - - if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height ); - + + GetChildren().DeleteObject( m_frameToolBar ); + + m_sizeSet = FALSE; + return m_frameToolBar; } @@ -549,33 +809,33 @@ wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString& return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name ); } -wxToolBar *wxFrame::GetToolBar(void) const -{ - return m_frameToolBar; +wxToolBar *wxFrame::GetToolBar() const +{ + return m_frameToolBar; } wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); + + wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, _T("recreating status bar in wxFrame") ); m_frameStatusBar = OnCreateStatusBar( number, style, id, name ); - - if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height ); - + + m_sizeSet = FALSE; + return m_frameStatusBar; } wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id, const wxString& name ) { wxStatusBar *statusBar = (wxStatusBar *) NULL; - + statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20), style, name); - + // Set the height according to the font and the border size wxClientDC dc(statusBar); - dc.SetFont( *statusBar->GetFont() ); + dc.SetFont( statusBar->GetFont() ); long x, y; dc.GetTextExtent( "X", &x, &y ); @@ -588,49 +848,69 @@ 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" ); - - wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); + + 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" ); - - wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); + + wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set widths for") ); m_frameStatusBar->SetStatusWidths(n, widths_field); } -wxStatusBar *wxFrame::GetStatusBar(void) const +wxStatusBar *wxFrame::GetStatusBar() const { return m_frameStatusBar; } 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; - + 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 ); }