// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
#ifdef __GNUG__
#pragma implementation "frame.h"
#endif
#include "wx/control.h"
#include "wx/app.h"
#include "wx/menu.h"
-#include "wx/toolbar.h"
-#include "wx/statusbr.h"
+#if wxUSE_TOOLBAR
+ #include "wx/toolbar.h"
+#endif
+#if wxUSE_STATUSBAR
+ #include "wx/statusbr.h"
+#endif
#include "wx/dcclient.h"
-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <glib.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
+
#include "wx/gtk/win_gtk.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 wxTopLevelWindows;
extern wxList wxPendingDelete;
+// ----------------------------------------------------------------------------
+// debug
+// ----------------------------------------------------------------------------
+
+#ifdef __WXDEBUG__
+
+extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window );
+
+#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"
//-----------------------------------------------------------------------------
static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
{
- if (!win->HasVMT()) return;
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+ if (!win->m_hasVMT)
+ return;
+
+ if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
+ {
/*
- printf( "OnFrameResize from " );
- if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
- printf( win->GetClassInfo()->GetClassName() );
- printf( ".\n" );
+ 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 );
*/
- if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
- {
- win->m_sizeSet = FALSE;
- win->m_width = alloc->width;
- win->m_height = alloc->height;
- }
+ win->m_width = alloc->width;
+ win->m_height = alloc->height;
+ win->m_queuedFullRedraw = TRUE;
+ win->GtkUpdateSize();
+ }
}
//-----------------------------------------------------------------------------
static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win )
{
-/*
- printf( "OnDelete from " );
- if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
- printf( win->GetClassInfo()->GetClassName() );
- printf( ".\n" );
-*/
+ if (g_isIdle)
+ wxapp_install_idle_handler();
- win->Close();
+ if ((g_openDialogs == 0) && (win->IsEnabled()))
+ win->Close();
return TRUE;
}
+//-----------------------------------------------------------------------------
+// "child_attached" of menu bar
+//-----------------------------------------------------------------------------
+
+static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
+{
+ if (!win->m_hasVMT) return;
+
+ win->m_menuBarDetached = FALSE;
+ win->GtkUpdateSize();
+}
+
+//-----------------------------------------------------------------------------
+// "child_detached" of menu bar
+//-----------------------------------------------------------------------------
+
+static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
+{
+ if (!win->m_hasVMT) return;
+
+ win->m_menuBarDetached = TRUE;
+ win->GtkUpdateSize();
+}
+
+#if wxUSE_TOOLBAR
+//-----------------------------------------------------------------------------
+// "child_attached" of tool bar
+//-----------------------------------------------------------------------------
+
+static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
+{
+ if (!win->m_hasVMT) return;
+
+ win->m_toolBarDetached = FALSE;
+
+ win->GtkUpdateSize();
+}
+
+//-----------------------------------------------------------------------------
+// "child_detached" of tool bar
+//-----------------------------------------------------------------------------
+
+static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
+{
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+
+ if (!win->m_hasVMT) return;
+
+ win->m_toolBarDetached = TRUE;
+ win->GtkUpdateSize();
+}
+#endif // wxUSE_TOOLBAR
+
//-----------------------------------------------------------------------------
// "configure_event"
//-----------------------------------------------------------------------------
-static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
+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 (!win->HasVMT()) return FALSE;
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+
+ if (!win->m_hasVMT)
+ return FALSE;
+#if (GTK_MINOR_VERSION > 0)
+ int x = 0;
+ int y = 0;
+ gdk_window_get_root_origin( win->m_widget->window, &x, &y );
+ win->m_x = x;
+ win->m_y = y;
+#else
win->m_x = event->x;
win->m_y = event->y;
+#endif
wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
mevent.SetEventObject( win );
}
//-----------------------------------------------------------------------------
-// wxFrame
+// "realize" from m_widget
//-----------------------------------------------------------------------------
-BEGIN_EVENT_TABLE(wxFrame, wxWindow)
- EVT_SIZE(wxFrame::OnSize)
- EVT_CLOSE(wxFrame::OnCloseWindow)
- EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
-END_EVENT_TABLE()
+/* we cannot MWM hints and icons before the widget has been realized,
+ so we do this directly after realization */
-IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
+static gint
+gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), wxFrame *win )
+{
+ if (g_isIdle)
+ wxapp_install_idle_handler();
-wxFrame::wxFrame()
+ if ((win->m_miniEdge > 0) || (win->HasFlag(wxSIMPLE_BORDER)))
+ {
+ /* This is a mini-frame or a borderless frame. */
+ gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)0 );
+ gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)0 );
+ }
+ else
+ {
+ /* 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;
+ long func = (long) GDK_FUNC_MOVE;
+
+ if ((win->GetWindowStyle() & wxCAPTION) != 0)
+ decor |= GDK_DECOR_TITLE;
+ if ((win->GetWindowStyle() & wxSYSTEM_MENU) != 0)
+ {
+ decor |= GDK_DECOR_MENU;
+ func |= GDK_FUNC_CLOSE;
+ }
+ if ((win->GetWindowStyle() & wxMINIMIZE_BOX) != 0)
+ {
+ func |= GDK_FUNC_MINIMIZE;
+ decor |= GDK_DECOR_MINIMIZE;
+ }
+ if ((win->GetWindowStyle() & wxMAXIMIZE_BOX) != 0)
+ {
+ func |= GDK_FUNC_MAXIMIZE;
+ decor |= GDK_DECOR_MAXIMIZE;
+ }
+ if ((win->GetWindowStyle() & wxRESIZE_BORDER) != 0)
+ {
+ func |= GDK_FUNC_RESIZE;
+ decor |= GDK_DECOR_RESIZEH;
+ }
+
+ 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->GetWindowStyle() & 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 */
+ wxIcon iconOld = win->GetIcon();
+ if ( iconOld != wxNullIcon )
+ {
+ wxIcon icon( iconOld );
+ win->SetIcon( 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? */
+ wxWindowList::Node *node = win->GetChildren().GetFirst();
+ while (node)
+ {
+ wxWindow *child = node->GetData();
+ if (child->AcceptsFocus())
+ {
+ child->SetFocus();
+ break;
+ }
+
+ node = node->GetNext();
+ }
+
+ return FALSE;
+}
+
+// ----------------------------------------------------------------------------
+// wxFrame itself
+// ----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// 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( wxFrame* parent, wxWindow* child )
{
- m_frameMenuBar = (wxMenuBar *) NULL;
- m_frameStatusBar = (wxStatusBar *) NULL;
- m_frameToolBar = (wxToolBar *) NULL;
- m_sizeSet = FALSE;
- m_miniEdge = 0;
- m_miniTitle = 0;
+ wxASSERT( GTK_IS_WIDGET(child->m_widget) );
+
+ if (!parent->m_insertInClientArea)
+ {
+ /* these are outside the client area */
+ wxFrame* frame = (wxFrame*) parent;
+ 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_NATIVE
+ /* 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->GetWindowStyle() & 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 );
+ }
+ }
+#endif // wxUSE_TOOLBAR
+ }
+ else
+ {
+ /* these are inside the client area */
+ gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
+ GTK_WIDGET(child->m_widget),
+ child->m_x,
+ child->m_y,
+ child->m_width,
+ child->m_height );
+ }
+
+ /* resize on OnInternalIdle */
+ parent->GtkUpdateSize();
}
-wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
- const wxPoint &pos, const wxSize &size,
- long style, const wxString &name )
+// ----------------------------------------------------------------------------
+// wxFrame creation
+// ----------------------------------------------------------------------------
+
+void wxFrame::Init()
{
- m_frameMenuBar = (wxMenuBar *) NULL;
- m_frameStatusBar = (wxStatusBar *) NULL;
- m_frameToolBar = (wxToolBar *) NULL;
m_sizeSet = FALSE;
m_miniEdge = 0;
m_miniTitle = 0;
- Create( parent, id, title, pos, size, style, name );
+ m_mainWidget = (GtkWidget*) NULL;
+ m_menuBarDetached = FALSE;
+ m_toolBarDetached = FALSE;
+ m_insertInClientArea = TRUE;
}
-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 );
m_needParent = FALSE;
- PreCreation( parent, id, pos, size, style, name );
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+ {
+ wxFAIL_MSG( wxT("wxFrame creation failed") );
+ return FALSE;
+ }
m_title = title;
+ m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;
+
GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
- if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP;
m_widget = gtk_window_new( win_type );
+ if ((m_parent) && (HasFlag(wxFRAME_FLOAT_ON_PARENT)) && (GTK_IS_WINDOW(m_parent->m_widget)))
+ gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
+
+ if (!name.IsEmpty())
+ gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() );
+
#ifdef __WXDEBUG__
- debug_focus_in( m_widget, "wxFrame::m_widget", name );
+ debug_focus_in( m_widget, wxT("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_wxwindow = gtk_myfixed_new();
+ /* m_mainWidget holds the toolbar, the menubar and the client area */
+ 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, wxT("wxFrame::m_mainWidget"), name );
+#endif
+
+ /* m_wxwindow only represents the client area without toolbar and menubar */
+ m_wxwindow = gtk_pizza_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, wxT("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 );
+ /* 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();
+
+ if ((m_x != -1) || (m_y != -1))
+ gtk_widget_set_uposition( m_widget, m_x, m_y );
+ gtk_widget_set_usize( m_widget, m_width, m_height );
+
+ /* 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 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();
+ /* disable native tab traversal */
+ gtk_signal_connect( GTK_OBJECT(m_widget), "focus",
+ GTK_SIGNAL_FUNC(gtk_frame_focus_callback), (gpointer)this );
return TRUE;
}
wxFrame::~wxFrame()
{
- if (m_frameMenuBar) delete m_frameMenuBar;
- if (m_frameStatusBar) delete m_frameStatusBar;
- if (m_frameToolBar) delete m_frameToolBar;
+ m_isBeingDeleted = TRUE;
+
+ 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), "invalid frame" );
+ wxASSERT_MSG( (m_widget != NULL), wxT("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 );
}
-bool wxFrame::Destroy()
-{
- wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-
- if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
-
- return TRUE;
-}
-
-wxPoint wxFrame::GetClientAreaOrigin() const
+void wxFrame::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )
{
- 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;
+ wxFAIL_MSG( wxT("DoMoveWindow called for wxFrame") );
}
-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" );
+ wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
- // Don't do anything for children of wxMDIChildFrame
- if (!m_wxwindow) return;
+ /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
+ wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
- if (m_resizing) return; // I don't like recursions
+ /* 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 ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)
{
if (x != -1) m_x = x;
if (y != -1) m_y = y;
m_height = height;
}
+/*
if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
{
if (width == -1) m_width = 80;
{
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_x != -1) || (m_y != -1))
{
if ((m_x != old_x) || (m_y != old_y))
+ {
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 );
- }
+ gtk_widget_set_usize( m_widget, m_width, m_height );
- wxSizeEvent event( wxSize(m_width,m_height), GetId() );
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
+ /* 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;
+ }
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" );
-
- 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::GetClientSize( int *width, int *height ) const
+void wxFrame::DoGetClientSize( int *width, int *height ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+ wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
- wxWindow::GetClientSize( width, height );
+ wxWindow::DoGetClientSize( 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;
+ }
+
+#if wxUSE_STATUSBAR
+ /* status bar */
if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+ /* tool bar */
if (m_frameToolBar)
{
- int y = 0;
- m_frameToolBar->GetSize( (int *) NULL, &y );
- (*height) -= y;
+ if (m_toolBarDetached)
+ {
+ *height -= wxPLACE_HOLDER;
+ }
+ else
+ {
+ int x, y;
+ m_frameToolBar->GetSize( &x, &y );
+ if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
+ {
+ *width -= x;
+ }
+ else
+ {
+ *height -= y;
+ }
+ }
}
- (*height) -= m_miniEdge*2 + m_miniTitle;
+#endif // wxUSE_TOOLBAR
+
+ /* mini edge */
+ *height -= m_miniEdge*2 + m_miniTitle;
}
if (width)
{
- (*width) -= m_miniEdge*2;
+ *width -= m_miniEdge*2;
}
}
-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), wxT("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;
+ }
+
+#if wxUSE_STATUSBAR
+ /* status bar */
+ if (m_frameStatusBar) height += wxSTATUS_HEIGHT;
+#endif
+
+#if wxUSE_TOOLBAR
+ /* tool bar */
+ if (m_frameToolBar)
+ {
+ if (m_toolBarDetached)
+ {
+ height += wxPLACE_HOLDER;
+ }
+ else
+ {
+ int x, y;
+ m_frameToolBar->GetSize( &x, &y );
+ if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
+ {
+ width += x;
+ }
+ else
+ {
+ height += y;
+ }
+ }
+ }
+#endif
+
+ 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;
// 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), wxT("invalid frame") );
m_width = width;
m_height = height;
+ /* space occupied by m_frameToolBar and m_frameMenuBar */
+ 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
+ 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_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 );
+ if (m_mainWidget)
+ {
+ /* set size hints */
+ gint flag = 0; // GDK_HINT_POS;
+ if ((m_minWidth != -1) || (m_minHeight != -1)) flag |= GDK_HINT_MIN_SIZE;
+ if ((m_maxWidth != -1) || (m_maxHeight != -1)) flag |= GDK_HINT_MAX_SIZE;
+ GdkGeometry geom;
+ geom.min_width = m_minWidth;
+ geom.min_height = m_minHeight;
+ geom.max_width = m_maxWidth;
+ geom.max_height = m_maxHeight;
+ gtk_window_set_geometry_hints( GTK_WINDOW(m_widget),
+ (GtkWidget*) NULL,
+ &geom,
+ (GdkWindowHints) flag );
+
+ /* 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_pizza_set_size( GTK_PIZZA(m_mainWidget),
+ m_frameMenuBar->m_widget,
+ xx, yy, ww, hh );
+ client_area_y_offset += hh;
+ }
- // 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 wxUSE_TOOLBAR
+ if ((m_frameToolBar) &&
+ (m_frameToolBar->m_widget->parent == m_mainWidget))
+ {
+ int xx = m_miniEdge;
+ int yy = m_miniEdge + m_miniTitle;
+ if (m_frameMenuBar)
+ {
+ if (!m_menuBarDetached)
+ yy += wxMENU_HEIGHT;
+ else
+ yy += wxPLACE_HOLDER;
+ }
- if (m_frameMenuBar)
- {
- 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 );
- }
+ m_frameToolBar->m_x = xx;
+ m_frameToolBar->m_y = yy;
- 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;
+ /* 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;
- m_frameToolBar->m_x = xx;
- m_frameToolBar->m_y = yy;
- m_frameToolBar->m_height = hh;
- m_frameToolBar->m_width = ww;
+ client_area_y_offset += hh;
+ }
- gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameToolBar->m_widget, xx, yy );
- gtk_widget_set_usize( m_frameToolBar->m_widget, ww, hh );
+ gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
+ m_frameToolBar->m_widget,
+ xx, yy, ww, hh );
+ }
+#endif // wxUSE_TOOLBAR
+
+ 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 - client_area_x_offset - 2*m_miniEdge;
+ int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;
+ gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
+ m_wxwindow,
+ client_x, client_y, 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 wxUSE_STATUSBAR
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;
-
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 );
+ gtk_pizza_set_size( GTK_PIZZA(m_wxwindow),
+ m_frameStatusBar->m_widget,
+ xx, yy, ww, hh );
+ gtk_widget_draw( m_frameStatusBar->m_widget, (GdkRectangle*) NULL );
}
+#endif
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() );
m_resizing = FALSE;
}
-void wxFrame::OnInternalIdle()
-{
- if (!m_sizeSet)
- GtkOnSize( m_x, m_y, m_width, m_height );
-
- DoMenuUpdates();
-}
-
-void wxFrame::OnCloseWindow( wxCloseEvent& event )
+void wxFrame::MakeModal( bool modal )
{
- // close the window if it wasn't vetoed by the application
- if ( !event.GetVeto() )
- Destroy();
+ if (modal)
+ gtk_grab_add( m_widget );
+ else
+ gtk_grab_remove( m_widget );
}
-void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
+void wxFrame::OnInternalIdle()
{
- wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-
- if (GetAutoLayout())
+ if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
{
- Layout();
+ GtkOnSize( m_x, m_y, m_width, m_height );
+
+ // we'll come back later
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+ return;
}
- 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 *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)
+ if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();
+#if wxUSE_TOOLBAR
+ if (m_frameToolBar) m_frameToolBar->OnInternalIdle();
+#endif
+#if wxUSE_STATUSBAR
+ if (m_frameStatusBar) m_frameStatusBar->OnInternalIdle();
#endif
- )
- {
- // it's the second one: do nothing
- if (child) 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 );
- }
+ wxWindow::OnInternalIdle();
}
-static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
-{
- menu->SetInvokingWindow( win );
- wxNode *node = menu->m_items.First();
- while (node)
- {
- wxMenuItem *menuitem = (wxMenuItem*)node->Data();
- if (menuitem->IsSubMenu())
- SetInvokingWindow( menuitem->GetSubMenu(), win );
- node = node->Next();
- }
-}
+// ----------------------------------------------------------------------------
+// menu/tool/status bar stuff
+// ----------------------------------------------------------------------------
void wxFrame::SetMenuBar( wxMenuBar *menuBar )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
- wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" );
+ wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+ wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
- m_frameMenuBar = menuBar;
+ if (menuBar == m_frameMenuBar)
+ return;
if (m_frameMenuBar)
{
- wxNode *node = m_frameMenuBar->m_menus.First();
- while (node)
- {
- wxMenu *menu = (wxMenu*)node->Data();
- SetInvokingWindow( menu, this );
- node = node->Next();
- }
+ m_frameMenuBar->UnsetInvokingWindow( this );
- if (m_frameMenuBar->m_parent != this)
+ if (m_frameMenuBar->GetWindowStyle() & wxMB_DOCKABLE)
{
- m_frameMenuBar->m_parent = this;
- gtk_myfixed_put( GTK_MYFIXED(m_wxwindow),
- m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
+ gtk_signal_disconnect_by_func( GTK_OBJECT(m_frameMenuBar->m_widget),
+ GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this );
+
+ gtk_signal_disconnect_by_func( GTK_OBJECT(m_frameMenuBar->m_widget),
+ GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
}
- }
- m_sizeSet = FALSE;
-}
+ gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
+ gtk_widget_ref( m_frameMenuBar->m_widget );
+ gtk_widget_unparent( m_frameMenuBar->m_widget );
+ }
-wxMenuBar *wxFrame::GetMenuBar() const
-{
- return m_frameMenuBar;
-}
+ m_frameMenuBar = menuBar;
-void wxFrame::OnMenuHighlight(wxMenuEvent& event)
-{
- if (GetStatusBar())
+ if (m_frameMenuBar)
{
- if (event.GetMenuId() == -1)
- {
- SetStatusText("");
- }
- else
+ m_frameMenuBar->SetInvokingWindow( this );
+
+ m_frameMenuBar->SetParent(this);
+ gtk_pizza_put( GTK_PIZZA(m_mainWidget),
+ m_frameMenuBar->m_widget,
+ m_frameMenuBar->m_x,
+ m_frameMenuBar->m_y,
+ m_frameMenuBar->m_width,
+ m_frameMenuBar->m_height );
+
+ if (menuBar->GetWindowStyle() & wxMB_DOCKABLE)
{
- wxMenuBar *menuBar = GetMenuBar();
- if (menuBar)
- {
- int menuId = event.GetMenuId();
- wxString helpString;
- helpString = menuBar->GetHelpString(menuId);
- if (helpString != "")
- SetStatusText(helpString);
- }
+ 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 );
}
+
+ m_frameMenuBar->Show( TRUE );
}
+
+ /* resize window in OnInternalIdle */
+ m_sizeSet = FALSE;
}
-wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
+#if wxUSE_TOOLBAR
+wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& name )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+ wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
- wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" );
+ m_insertInClientArea = FALSE;
- m_frameToolBar = OnCreateToolBar( style, id, name );
+ m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name );
- GetChildren().DeleteObject( m_frameToolBar );
+ m_insertInClientArea = TRUE;
m_sizeSet = FALSE;
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 );
-}
+ wxFrameBase::SetToolBar(toolbar);
-wxToolBar *wxFrame::GetToolBar() const
-{
- return m_frameToolBar;
+ 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 );
+
+ gtk_widget_reparent( m_frameToolBar->m_widget, m_mainWidget );
+ GtkUpdateSize();
+ }
+ }
}
-wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
-{
- wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+#endif // wxUSE_TOOLBAR
- wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" );
+#if wxUSE_STATUSBAR
- m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
+wxStatusBar* wxFrame::CreateStatusBar(int number,
+ long style,
+ wxWindowID id,
+ const wxString& name)
+{
+ wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+ // because it will change when toolbar is added
m_sizeSet = FALSE;
- return m_frameStatusBar;
+ return wxFrameBase::CreateStatusBar( number, style, id, name );
}
-wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
+void wxFrame::PositionStatusBar()
{
- wxStatusBar *statusBar = (wxStatusBar *) NULL;
-
- statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20), style, name);
+ if ( !m_frameStatusBar )
+ return;
- // 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 );
+ m_sizeSet = FALSE;
+}
+#endif // wxUSE_STATUSBAR
- int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY());
+// ----------------------------------------------------------------------------
+// frame title/icon
+// ----------------------------------------------------------------------------
- statusBar->SetSize( -1, -1, 100, height );
+void wxFrame::SetTitle( const wxString &title )
+{
+ wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
- statusBar->SetFieldsCount( number );
- return statusBar;
+ m_title = title;
+ gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );
}
-void wxFrame::SetStatusText(const wxString& text, int number)
+void wxFrame::SetIcon( const wxIcon &icon )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+ wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
- wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
+ wxFrameBase::SetIcon(icon);
- m_frameStatusBar->SetStatusText(text, number);
-}
+ if ( !m_icon.Ok() )
+ return;
-void wxFrame::SetStatusWidths(int n, const int widths_field[] )
-{
- wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+ if (!m_widget->window)
+ return;
- wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
+ wxMask *mask = icon.GetMask();
+ GdkBitmap *bm = (GdkBitmap *) NULL;
+ if (mask) bm = mask->GetBitmap();
- m_frameStatusBar->SetStatusWidths(n, widths_field);
+ gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
}
-wxStatusBar *wxFrame::GetStatusBar() const
+// ----------------------------------------------------------------------------
+// frame state: maximized/iconized/normal (TODO)
+// ----------------------------------------------------------------------------
+
+void wxFrame::Maximize(bool WXUNUSED(maximize))
{
- return m_frameStatusBar;
}
-void wxFrame::SetTitle( const wxString &title )
+bool wxFrame::IsMaximized() const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-
- m_title = title;
- if (m_title.IsNull()) m_title = "";
- gtk_window_set_title( GTK_WINDOW(m_widget), title );
+ return FALSE;
}
-void wxFrame::SetIcon( const wxIcon &icon )
+void wxFrame::Restore()
{
- wxASSERT_MSG( (m_widget != NULL), "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 );
+void wxFrame::Iconize( bool iconize )
+{
+ if (iconize)
+ {
+ XIconifyWindow( GDK_WINDOW_XDISPLAY( m_widget->window ),
+ GDK_WINDOW_XWINDOW( m_widget->window ),
+ DefaultScreen( GDK_DISPLAY() ) );
+ }
}
+bool wxFrame::IsIconized() const
+{
+ return FALSE;
+}
projects / wxWidgets.git / blobdiff