X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e39af974ef7846e26686ae39d74e4696c1fef0c3..122d1d563a3b2c797e00dd1032d178735e84f300:/src/gtk1/frame.cpp?ds=inline diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index fd6e17f28a..9b703f28d8 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -15,12 +15,12 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "frame.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/defs.h" +#include "wx/frame.h" #include "wx/dialog.h" #include "wx/control.h" #include "wx/app.h" @@ -34,12 +34,12 @@ #include "wx/dcclient.h" #include -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" #include #include -#include "wx/gtk/win_gtk.h" +#include "wx/gtk1/win_gtk.h" // ---------------------------------------------------------------------------- // constants @@ -54,7 +54,6 @@ const int wxPLACE_HOLDER = 0; extern void wxapp_install_idle_handler(); extern bool g_isIdle; -extern int g_openDialogs; // ---------------------------------------------------------------------------- // event tables @@ -76,18 +75,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) // "child_attached" of menu bar //----------------------------------------------------------------------------- +extern "C" { static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { if (!win->m_hasVMT) return; - win->m_menuBarDetached = FALSE; + win->m_menuBarDetached = false; win->GtkUpdateSize(); } +} //----------------------------------------------------------------------------- // "child_detached" of menu bar //----------------------------------------------------------------------------- +extern "C" { static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { if (g_isIdle) @@ -98,9 +100,10 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget * // Raise the client area area gdk_window_raise( win->m_wxwindow->window ); - win->m_menuBarDetached = TRUE; + win->m_menuBarDetached = true; win->GtkUpdateSize(); } +} #endif // wxUSE_MENUS_NATIVE @@ -109,18 +112,21 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget * // "child_attached" of tool bar //----------------------------------------------------------------------------- +extern "C" { static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { if (!win->m_hasVMT) return; - win->m_toolBarDetached = FALSE; + win->m_toolBarDetached = false; win->GtkUpdateSize(); } +} //----------------------------------------------------------------------------- // "child_detached" of tool bar //----------------------------------------------------------------------------- +extern "C" { static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { if (g_isIdle) @@ -131,9 +137,10 @@ static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidge // Raise the client area area gdk_window_raise( win->m_wxwindow->window ); - win->m_toolBarDetached = TRUE; + win->m_toolBarDetached = true; win->GtkUpdateSize(); } +} #endif // wxUSE_TOOLBAR @@ -147,7 +154,7 @@ static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidge /* Callback for wxFrame. This very strange beast has to be used because * C++ has no virtual methods in a constructor. We have to emulate a - * virtual function here as wxWindows requires different ways to insert + * virtual function here as wxWidgets requires different ways to insert * a child in container classes. */ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) @@ -164,7 +171,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) child->m_y, child->m_width, child->m_height ); - + #if wxUSE_TOOLBAR_NATIVE // We connect to these events for recalculating the client area // space when the toolbar is floating @@ -192,7 +199,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) child->m_width, child->m_height ); } - + // Resize on OnInternalIdle parent->GtkUpdateSize(); } @@ -203,8 +210,8 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) void wxFrame::Init() { - m_menuBarDetached = FALSE; - m_toolBarDetached = FALSE; + m_menuBarDetached = false; + m_toolBarDetached = false; m_menuBarHeight = 2; } @@ -219,13 +226,13 @@ bool wxFrame::Create( wxWindow *parent, bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig, style, name); m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame; - + return rt; } wxFrame::~wxFrame() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; DeleteAllBars(); } @@ -340,7 +347,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), // avoid recursions if (m_resizing) return; - m_resizing = TRUE; + m_resizing = true; // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); @@ -486,7 +493,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), } #endif // wxUSE_STATUSBAR - m_sizeSet = TRUE; + m_sizeSet = true; // send size event to frame wxSizeEvent event( wxSize(m_width,m_height), GetId() ); @@ -503,7 +510,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), } #endif // wxUSE_STATUSBAR - m_resizing = FALSE; + m_resizing = false; } void wxFrame::OnInternalIdle() @@ -517,7 +524,20 @@ void wxFrame::OnInternalIdle() if (m_frameToolBar) m_frameToolBar->OnInternalIdle(); #endif #if wxUSE_STATUSBAR - if (m_frameStatusBar) m_frameStatusBar->OnInternalIdle(); + if (m_frameStatusBar) + { + m_frameStatusBar->OnInternalIdle(); + + // There may be controls in the status bar that + // need to be updated + for ( wxWindowList::compatibility_iterator node = m_frameStatusBar->GetChildren().GetFirst(); + node; + node = node->GetNext() ) + { + wxWindow *child = node->GetData(); + child->OnInternalIdle(); + } + } #endif } @@ -577,8 +597,8 @@ void wxFrame::AttachMenuBar( 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 ); + + gtk_widget_show( m_frameMenuBar->m_widget ); UpdateMenuBarSize(); } @@ -591,19 +611,19 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) void wxFrame::UpdateMenuBarSize() { - wxASSERT_MSG( m_frameMenuBar, _T("Updating non existant menubar?") ); - GtkRequisition req; req.width = 2; req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_frameMenuBar->m_widget) )->size_request ) - (m_frameMenuBar->m_widget, &req ); + // this is called after Remove with a NULL m_frameMenuBar + if ( m_frameMenuBar ) + (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_frameMenuBar->m_widget) )->size_request ) + (m_frameMenuBar->m_widget, &req ); m_menuBarHeight = req.height; - // resize window in OnInternalIdle + // resize window in OnInternalIdle GtkUpdateSize(); } @@ -616,11 +636,11 @@ wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& na { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - m_insertInClientArea = FALSE; + m_insertInClientArea = false; m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name ); - m_insertInClientArea = TRUE; + m_insertInClientArea = true; GtkUpdateSize(); @@ -672,6 +692,16 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, return wxFrameBase::CreateStatusBar( number, style, id, name ); } +void wxFrame::SetStatusBar(wxStatusBar *statbar) +{ + bool hadStatBar = m_frameStatusBar != NULL; + + wxFrameBase::SetStatusBar(statbar); + + if (hadStatBar && !m_frameStatusBar) + GtkUpdateSize(); +} + void wxFrame::PositionStatusBar() { if ( !m_frameStatusBar ) @@ -680,4 +710,3 @@ void wxFrame::PositionStatusBar() GtkUpdateSize(); } #endif // wxUSE_STATUSBAR -