X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e014a0c44e36efe429bea1303f4309af287eb77..bce1406bff2a6c2eaa87b637335df22560b207de:/src/gtk1/frame.cpp diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 3e87057d4a..cf54c400db 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -7,6 +7,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ #pragma implementation "frame.h" #endif @@ -17,44 +25,52 @@ #include "wx/app.h" #include "wx/menu.h" #if wxUSE_TOOLBAR -#include "wx/toolbar.h" + #include "wx/toolbar.h" #endif #if wxUSE_STATUSBAR -#include "wx/statusbr.h" + #include "wx/statusbr.h" #endif #include "wx/dcclient.h" -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include +#include +#include +#include + #include "wx/gtk/win_gtk.h" -#include "gdk/gdkkeysyms.h" -#include "gdk/gdkx.h" -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // constants -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- const int wxMENU_HEIGHT = 27; const int wxSTATUS_HEIGHT = 25; const int wxPLACE_HOLDER = 0; -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // idle system -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- extern void wxapp_install_idle_handler(); extern bool g_isIdle; +extern int g_openDialogs; -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// event tables +// ---------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow) + +// ---------------------------------------------------------------------------- // data -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- extern wxList wxPendingDelete; -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // debug -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- #ifdef __WXDEBUG__ @@ -62,6 +78,28 @@ extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar #endif +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// 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" //----------------------------------------------------------------------------- @@ -71,13 +109,24 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* if (g_isIdle) wxapp_install_idle_handler(); - if (!win->m_hasVMT) return; + 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->UpdateSize(); + win->GtkUpdateSize(); } } @@ -90,7 +139,8 @@ static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WX if (g_isIdle) wxapp_install_idle_handler(); - win->Close(); + if (g_openDialogs == 0) + win->Close(); return TRUE; } @@ -104,7 +154,7 @@ static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget * if (!win->m_hasVMT) return; win->m_menuBarDetached = FALSE; - win->UpdateSize(); + win->GtkUpdateSize(); } //----------------------------------------------------------------------------- @@ -116,7 +166,7 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget * if (!win->m_hasVMT) return; win->m_menuBarDetached = TRUE; - win->UpdateSize(); + win->GtkUpdateSize(); } #if wxUSE_TOOLBAR @@ -130,14 +180,14 @@ static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidge win->m_toolBarDetached = FALSE; - win->UpdateSize(); + win->GtkUpdateSize(); } //----------------------------------------------------------------------------- // "child_detached" of tool bar //----------------------------------------------------------------------------- -static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSED(child), wxFrame *win ) +static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -145,7 +195,7 @@ static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSE if (!win->m_hasVMT) return; win->m_toolBarDetached = TRUE; - win->UpdateSize(); + win->GtkUpdateSize(); } #endif // wxUSE_TOOLBAR @@ -153,19 +203,20 @@ static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSE // "configure_event" //----------------------------------------------------------------------------- -static gint -#if (GTK_MINOR_VERSON > 0) +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) + if (g_isIdle) wxapp_install_idle_handler(); - if (!win->m_hasVMT) return FALSE; + if (!win->m_hasVMT) + return FALSE; -#if (GTK_MINOR_VERSON > 0) +#if (GTK_MINOR_VERSION > 0) int x = 0; int y = 0; gdk_window_get_root_origin( win->m_widget->window, &x, &y ); @@ -196,6 +247,11 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) if (g_isIdle) wxapp_install_idle_handler(); + /* I haven't been able to set the position of + the dialog before it is shown, so I set the + position in "realize" */ + gtk_widget_set_uposition( widget, win->m_x, win->m_y ); + /* 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; @@ -233,11 +289,25 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) else gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1); + /* set size hints */ + gint flag = 0; // GDK_HINT_POS; + if ((win->GetMinWidth() != -1) || (win->GetMinHeight() != -1)) flag |= GDK_HINT_MIN_SIZE; + if ((win->GetMaxWidth() != -1) || (win->GetMaxHeight() != -1)) flag |= GDK_HINT_MAX_SIZE; + if (flag) + { + gdk_window_set_hints( win->m_widget->window, + win->m_x, win->m_y, + win->GetMinWidth(), win->GetMinHeight(), + win->GetMaxWidth(), win->GetMaxHeight(), + flag ); + } + /* reset the icon */ - if (win->m_icon != wxNullIcon) + wxIcon iconOld = win->GetIcon(); + if ( iconOld != wxNullIcon ) { - wxIcon icon( win->m_icon ); - win->m_icon = wxNullIcon; + wxIcon icon( iconOld ); + win->SetIcon( wxNullIcon ); win->SetIcon( icon ); } @@ -259,6 +329,10 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) return FALSE; } +// ---------------------------------------------------------------------------- +// wxFrame itself +// ---------------------------------------------------------------------------- + //----------------------------------------------------------------------------- // InsertChild for wxFrame //----------------------------------------------------------------------------- @@ -270,18 +344,20 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) { + wxASSERT( GTK_IS_WIDGET(child->m_widget) ); + if (!parent->m_insertInClientArea) { /* these are outside the client area */ wxFrame* frame = (wxFrame*) parent; - gtk_myfixed_put( GTK_MYFIXED(frame->m_mainWidget), + gtk_pizza_put( GTK_PIZZA(frame->m_mainWidget), GTK_WIDGET(child->m_widget), child->m_x, child->m_y, child->m_width, child->m_height ); -#if wxUSE_TOOLBAR +#if wxUSE_TOOLBAR_NATIVE /* we connect to these events for recalculating the client area space when the toolbar is floating */ if (wxIS_KIND_OF(child,wxToolBar)) @@ -301,7 +377,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) else { /* these are inside the client area */ - gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow), + gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow), GTK_WIDGET(child->m_widget), child->m_x, child->m_y, @@ -310,30 +386,15 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) } /* resize on OnInternalIdle */ - parent->UpdateSize(); + parent->GtkUpdateSize(); } -//----------------------------------------------------------------------------- -// wxFrame -//----------------------------------------------------------------------------- - -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) +// ---------------------------------------------------------------------------- +// wxFrame creation +// ---------------------------------------------------------------------------- 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; @@ -341,20 +402,16 @@ void wxFrame::Init() m_menuBarDetached = FALSE; m_toolBarDetached = FALSE; m_insertInClientArea = TRUE; + m_isFrame = TRUE; } -wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, - const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) -{ - Init(); - - Create( parent, id, title, pos, size, style, name ); -} - -bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, - const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) +bool wxFrame::Create( wxWindow *parent, + wxWindowID id, + const wxString &title, + const wxPoint &pos, + const wxSize &size, + long style, + const wxString &name ) { wxTopLevelWindows.Append( this ); @@ -363,8 +420,8 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { - wxFAIL_MSG( _T("wxFrame creation failed") ); - return FALSE; + wxFAIL_MSG( wxT("wxFrame creation failed") ); + return FALSE; } m_title = title; @@ -380,7 +437,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, 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 ); + debug_focus_in( m_widget, wxT("wxFrame::m_widget"), name ); #endif gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() ); @@ -390,22 +447,22 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, 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(); + 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, _T("wxFrame::m_mainWidget"), name ); + 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_myfixed_new(); + 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, _T("wxFrame::m_wxwindow"), name ); + debug_focus_in( m_wxwindow, wxT("wxFrame::m_wxwindow"), name ); #endif /* we donm't allow the frame to get the focus as otherwise @@ -414,6 +471,10 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, 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(); /* we cannot set MWM hints and icons before the widget has @@ -421,14 +482,14 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, 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 ); + /* disable native tab traversal */ + gtk_signal_connect( GTK_OBJECT(m_widget), "focus", + GTK_SIGNAL_FUNC(gtk_frame_focus_callback), (gpointer)this ); + return TRUE; } @@ -436,31 +497,27 @@ 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 + DeleteAllBars(); wxTopLevelWindows.DeleteObject( this ); if (wxTheApp->GetTopWindow() == this) wxTheApp->SetTopWindow( (wxWindow*) NULL ); - if (wxTopLevelWindows.Number() == 0) + if ((wxTopLevelWindows.Number() == 0) && + (wxTheApp->GetExitOnFrameDelete())) + { wxTheApp->ExitMainLoop(); + } } +// ---------------------------------------------------------------------------- +// overridden wxWindow methods +// ---------------------------------------------------------------------------- + bool wxFrame::Show( bool show ) { - wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); + wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); if (show && !m_sizeSet) { @@ -475,28 +532,26 @@ bool wxFrame::Show( bool show ) return wxWindow::Show( show ); } -bool wxFrame::Destroy() +void wxFrame::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) ) { - wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); - - if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); - - return TRUE; + 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), _T("invalid frame") ); + wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */ - wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid frame") ); + wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); /* avoid recursions */ - if (m_resizing) return; + 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; @@ -515,6 +570,7 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags ) m_height = height; } +/* if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH) { if (width == -1) m_width = 80; @@ -524,6 +580,7 @@ void wxFrame::DoSetSize( 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; @@ -549,22 +606,9 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags ) m_resizing = FALSE; } -void wxFrame::Centre( int direction ) -{ - 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; - - Move( x, y ); -} - void wxFrame::DoGetClientSize( int *width, int *height ) const { - wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); + wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); wxWindow::DoGetClientSize( width, height ); if (height) @@ -581,35 +625,44 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const #if wxUSE_STATUSBAR /* status bar */ if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT; -#endif +#endif // wxUSE_STATUSBAR #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; + *height -= wxPLACE_HOLDER; } else - (*height) -= wxPLACE_HOLDER; + { + int x, y; + m_frameToolBar->GetSize( &x, &y ); + if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL ) + { + *width -= x; + } + else + { + *height -= y; + } + } } -#endif +#endif // wxUSE_TOOLBAR /* mini edge */ - (*height) -= m_miniEdge*2 + m_miniTitle; + *height -= m_miniEdge*2 + m_miniTitle; } if (width) { - (*width) -= m_miniEdge*2; + *width -= m_miniEdge*2; } } void wxFrame::DoSetClientSize( int width, int height ) { - wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); + wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); /* menu bar */ if (m_frameMenuBar) @@ -629,21 +682,31 @@ void wxFrame::DoSetClientSize( int width, int height ) /* tool bar */ if (m_frameToolBar) { - if (!m_toolBarDetached) + if (m_toolBarDetached) { - int y = 0; - m_frameToolBar->GetSize( (int *) NULL, &y ); - height += y; + height += wxPLACE_HOLDER; } else - height += wxPLACE_HOLDER; + { + int x, y; + m_frameToolBar->GetSize( &x, &y ); + if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL ) + { + width += x; + } + else + { + height += y; + } + } } #endif - wxWindow::DoSetClientSize( width + m_miniEdge*2, height + m_miniEdge*2 + m_miniTitle ); + DoSetSize( -1, -1, width + m_miniEdge*2, height + m_miniEdge*2 + m_miniTitle, 0 ); } -void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height ) +void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), + int width, int height ) { // due to a bug in gtk, x,y are always 0 // m_x = x; @@ -654,13 +717,14 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height m_resizing = TRUE; /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */ - wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid frame") ); + wxASSERT_MSG( (m_wxwindow != NULL), wxT("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_x_offset = 0, + 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 @@ -694,14 +758,15 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height m_frameMenuBar->m_y = yy; m_frameMenuBar->m_width = ww; m_frameMenuBar->m_height = hh; - gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), + gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), m_frameMenuBar->m_widget, xx, yy, ww, hh ); client_area_y_offset += hh; } #if wxUSE_TOOLBAR - if (m_frameToolBar) + if ((m_frameToolBar) && + (m_frameToolBar->m_widget->parent == m_mainWidget)) { int xx = m_miniEdge; int yy = m_miniEdge + m_miniTitle; @@ -712,25 +777,40 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int 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_set_size( GTK_MYFIXED(m_mainWidget), + + /* don't change the toolbar's reported height/width */ + int ww, hh; + if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL ) + { + ww = m_toolBarDetached ? wxPLACE_HOLDER + : m_frameToolBar->m_width; + hh = m_height - 2*m_miniEdge; + + client_area_x_offset += ww; + } + else + { + ww = m_width - 2*m_miniEdge; + hh = m_toolBarDetached ? wxPLACE_HOLDER + : m_frameToolBar->m_height; + + client_area_y_offset += hh; + } + + gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), m_frameToolBar->m_widget, xx, yy, ww, hh ); - client_area_y_offset += hh; } -#endif +#endif // wxUSE_TOOLBAR - int client_x = m_miniEdge; + int client_x = client_area_x_offset + m_miniEdge; int client_y = client_area_y_offset + m_miniEdge + m_miniTitle; - int client_w = m_width - 2*m_miniEdge; + int client_w = m_width - client_area_x_offset - 2*m_miniEdge; int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle; - gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), + gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), m_wxwindow, client_x, client_y, client_w, client_h ); } @@ -751,9 +831,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height m_frameStatusBar->m_y = yy; m_frameStatusBar->m_width = ww; m_frameStatusBar->m_height = hh; - gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow), - m_frameStatusBar->m_widget, - xx, yy, ww, hh ); + gtk_pizza_set_size( GTK_PIZZA(m_wxwindow), + m_frameStatusBar->m_widget, + xx, yy, ww, hh ); } #endif @@ -762,12 +842,12 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height m_sizeSet = TRUE; - /* send size event to frame */ + // 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 */ + // send size event to status bar if (m_frameStatusBar) { wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() ); @@ -789,9 +869,14 @@ void wxFrame::MakeModal( bool modal ) void wxFrame::OnInternalIdle() { if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow)) + { GtkOnSize( m_x, m_y, m_width, m_height ); - DoMenuUpdates(); + // we'll come back later + if (g_isIdle) + wxapp_install_idle_handler(); + return; + } if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle(); #if wxUSE_TOOLBAR @@ -804,55 +889,14 @@ void wxFrame::OnInternalIdle() wxWindow::OnInternalIdle(); } -void wxFrame::OnCloseWindow( wxCloseEvent& WXUNUSED(event) ) -{ - Destroy(); -} - -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; - 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 (child) - { - /* it's the second one: do nothing */ - return; - } - - child = win; - } - } - - /* no children at all? */ - if (child) - { - /* yes: set it's size to fill all the frame */ - int client_x, client_y; - DoGetClientSize( &client_x, &client_y ); - child->SetSize( 1, 1, client_x-2, client_y-2 ); - } - } -} +// ---------------------------------------------------------------------------- +// menu/tool/status bar stuff +// ---------------------------------------------------------------------------- void wxFrame::SetMenuBar( wxMenuBar *menuBar ) { - wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); - wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid frame") ); + wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); + wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); m_frameMenuBar = menuBar; @@ -863,7 +907,7 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar ) if (m_frameMenuBar->GetParent() != this) { m_frameMenuBar->SetParent(this); - gtk_myfixed_put( GTK_MYFIXED(m_mainWidget), + gtk_pizza_put( GTK_PIZZA(m_mainWidget), m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y, @@ -878,8 +922,8 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar ) gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached", GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this ); } - - m_frameMenuBar->Show( TRUE ); + + m_frameMenuBar->Show( TRUE ); } } @@ -887,46 +931,17 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar ) m_sizeSet = FALSE; } -wxMenuBar *wxFrame::GetMenuBar() const -{ - return m_frameMenuBar; -} - -void wxFrame::OnMenuHighlight(wxMenuEvent& event) -{ -#if wxUSE_STATUSBAR - 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); - } -#endif // wxUSE_STATUSBAR -} - #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") ); + wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); m_insertInClientArea = FALSE; - m_frameToolBar = OnCreateToolBar( style, id, name ); + m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name ); - if (m_frameToolBar) GetChildren().DeleteObject( m_frameToolBar ); + if (m_frameToolBar) + GetChildren().DeleteObject( m_frameToolBar ); m_insertInClientArea = TRUE; @@ -935,113 +950,73 @@ wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& na return m_frameToolBar; } -wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString& name ) +void wxFrame::SetToolBar(wxToolBar *toolbar) { - return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name ); -} - -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") ); - - wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, _T("recreating status bar in wxFrame") ); + wxFrameBase::SetToolBar(toolbar); - m_frameStatusBar = OnCreateStatusBar( number, style, id, name ); - - m_sizeSet = FALSE; + if (m_frameToolBar) + { + /* insert into toolbar area if not already there */ + if ((m_frameToolBar->m_widget->parent) && + (m_frameToolBar->m_widget->parent != m_mainWidget)) + { + GetChildren().DeleteObject( m_frameToolBar ); - return m_frameStatusBar; + gtk_widget_reparent( m_frameToolBar->m_widget, m_mainWidget ); + GtkUpdateSize(); + } + } } -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() ); - - long x, y; - dc.GetTextExtent( "X", &x, &y ); - - int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY()); - - statusBar->SetSize( -1, -1, 100, height ); - - statusBar->SetFieldsCount( number ); - return statusBar; -} +#endif // wxUSE_TOOLBAR -wxStatusBar *wxFrame::GetStatusBar() const -{ - return m_frameStatusBar; -} +#if wxUSE_STATUSBAR -void wxFrame::SetStatusText(const wxString& text, int number) +wxStatusBar* wxFrame::CreateStatusBar(int number, + long style, + wxWindowID id, + const wxString& name) { - wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); + wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set text for") ); + // because it will change when toolbar is added + m_sizeSet = FALSE; - m_frameStatusBar->SetStatusText(text, number); + return wxFrameBase::CreateStatusBar( number, style, id, name ); } -void wxFrame::SetStatusWidths(int n, const int widths_field[] ) +void wxFrame::PositionStatusBar() { - wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); - - wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set widths for") ); + if ( !m_frameStatusBar ) + return; - m_frameStatusBar->SetStatusWidths(n, widths_field); + m_sizeSet = FALSE; } #endif // wxUSE_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); -} +// ---------------------------------------------------------------------------- +// frame title/icon +// ---------------------------------------------------------------------------- void wxFrame::SetTitle( const wxString &title ) { - wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); + wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); m_title = 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), _T("invalid frame") ); + wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - m_icon = icon; - if (!icon.Ok()) return; + wxFrameBase::SetIcon(icon); - if (!m_widget->window) return; + if ( !m_icon.Ok() ) + return; + + if (!m_widget->window) + return; wxMask *mask = icon.GetMask(); GdkBitmap *bm = (GdkBitmap *) NULL; @@ -1050,25 +1025,34 @@ void wxFrame::SetIcon( const wxIcon &icon ) gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm ); } -void wxFrame::Maximize(bool WXUNUSED(maximize)) +// ---------------------------------------------------------------------------- +// frame state: maximized/iconized/normal (TODO) +// ---------------------------------------------------------------------------- + +void wxFrame::Maximize(bool WXUNUSED(maximize)) +{ +} + +bool wxFrame::IsMaximized() const { + return FALSE; } -void wxFrame::Restore() +void wxFrame::Restore() { } -void wxFrame::Iconize( bool iconize ) -{ +void wxFrame::Iconize( bool iconize ) +{ if (iconize) { XIconifyWindow( GDK_WINDOW_XDISPLAY( m_widget->window ), - GDK_WINDOW_XWINDOW( m_widget->window ), - DefaultScreen( GDK_DISPLAY() ) ); + GDK_WINDOW_XWINDOW( m_widget->window ), + DefaultScreen( GDK_DISPLAY() ) ); } } -bool wxFrame::IsIconized() const -{ - return FALSE; +bool wxFrame::IsIconized() const +{ + return FALSE; }