/////////////////////////////////////////////////////////////////////////////
-// Name: frame.cpp
+// Name: src/gtk1/frame.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
// ============================================================================
// declarations
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #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"
-#include "wx/menu.h"
-#if wxUSE_TOOLBAR
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/dcclient.h"
+ #include "wx/menu.h"
+ #include "wx/dialog.h"
+ #include "wx/control.h"
#include "wx/toolbar.h"
-#endif
-#if wxUSE_STATUSBAR
#include "wx/statusbr.h"
-#endif
-#include "wx/dcclient.h"
+#endif // WX_PRECOMP
#include <glib.h>
-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"
#include <gdk/gdkkeysyms.h>
#include <gdk/gdkx.h>
-#include "wx/gtk/win_gtk.h"
+#include "wx/gtk1/win_gtk.h"
// ----------------------------------------------------------------------------
// constants
extern void wxapp_install_idle_handler();
extern bool g_isIdle;
-extern int g_openDialogs;
// ----------------------------------------------------------------------------
// event tables
// "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)
// 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
// "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)
// 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
/* 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 )
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
child->m_width,
child->m_height );
}
-
+
// Resize on OnInternalIdle
parent->GtkUpdateSize();
}
void wxFrame::Init()
{
- m_menuBarDetached = FALSE;
- m_toolBarDetached = FALSE;
+ m_menuBarDetached = false;
+ m_toolBarDetached = false;
m_menuBarHeight = 2;
}
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();
}
// 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") );
}
#endif // wxUSE_STATUSBAR
- m_sizeSet = TRUE;
+ m_sizeSet = true;
// send size event to frame
wxSizeEvent event( wxSize(m_width,m_height), GetId() );
event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
+ HandleWindowEvent( event );
#if wxUSE_STATUSBAR
// send size event to status bar
{
wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() );
event2.SetEventObject( m_frameStatusBar );
- m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 );
+ m_frameStatusBar->HandleWindowEvent( event2 );
}
#endif // wxUSE_STATUSBAR
- m_resizing = FALSE;
+ m_resizing = false;
}
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
}
gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
}
-
+
gtk_widget_show( m_frameMenuBar->m_widget );
UpdateMenuBarSize();
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();
}
{
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();
void wxFrame::SetStatusBar(wxStatusBar *statbar)
{
bool hadStatBar = m_frameStatusBar != NULL;
-
+
wxFrameBase::SetStatusBar(statbar);
-
- if (hadStatBar && !m_frameToolBar)
+
+ if (hadStatBar && !m_frameStatusBar)
GtkUpdateSize();
}
GtkUpdateSize();
}
#endif // wxUSE_STATUSBAR
-
projects / wxWidgets.git / blobdiff