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;
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
-extern wxList wxTopLevelWindows;
extern wxList wxPendingDelete;
+//-----------------------------------------------------------------------------
+// debug
+//-----------------------------------------------------------------------------
+
+#ifdef __WXDEBUG__
+
+extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window );
+
+#endif
+
//-----------------------------------------------------------------------------
// "size_allocate"
//-----------------------------------------------------------------------------
static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
{
+ if (g_isIdle) wxapp_install_idle_handler();
+
if (!win->HasVMT()) return;
/*
static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win )
{
+ if (g_isIdle) wxapp_install_idle_handler();
+
/*
printf( "OnDelete from " );
if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
return TRUE;
}
+//-----------------------------------------------------------------------------
+// "child_attached" of menu bar
+//-----------------------------------------------------------------------------
+
+static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
+{
+ if (g_isIdle) wxapp_install_idle_handler();
+
+ 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 (g_isIdle) wxapp_install_idle_handler();
+
+ 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 (g_isIdle) wxapp_install_idle_handler();
+
+ if (!win->HasVMT()) return;
+
+ win->m_toolBarDetached = FALSE;
+ win->m_sizeSet = FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "child_detached" of tool bar
+//-----------------------------------------------------------------------------
+
+static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSED(child), wxFrame *win )
+{
+ if (g_isIdle) wxapp_install_idle_handler();
+
+ if (!win->HasVMT()) return;
+
+ win->m_toolBarDetached = TRUE;
+ win->m_sizeSet = FALSE;
+}
+
//-----------------------------------------------------------------------------
// "configure_event"
//-----------------------------------------------------------------------------
static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
{
+ if (g_isIdle) wxapp_install_idle_handler();
+
if (!win->HasVMT()) return FALSE;
win->m_x = event->x;
return FALSE;
}
+//-----------------------------------------------------------------------------
+// "realize" from m_widget
+//-----------------------------------------------------------------------------
+
+/* we cannot MWM hints and icons before the widget has been realized,
+ so we do this directly after realization */
+
+static gint
+gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
+{
+ if (g_isIdle) wxapp_install_idle_handler();
+
+ /* 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 ((win->m_windowStyle & wxCAPTION) == 0)
+ decor |= GDK_DECOR_TITLE;
+ if ((win->m_windowStyle & wxSYSTEM_MENU) == 0)
+ decor |= GDK_DECOR_MENU;
+ if ((win->m_windowStyle & wxMINIMIZE_BOX) == 0)
+ {
+ func |= GDK_FUNC_MINIMIZE;
+ decor |= GDK_DECOR_MINIMIZE;
+ }
+ if ((win->m_windowStyle & wxMAXIMIZE_BOX) == 0)
+ {
+ func |= GDK_FUNC_MAXIMIZE;
+ decor |= GDK_DECOR_MAXIMIZE;
+ }
+ if ((win->m_windowStyle & wxRESIZE_BORDER) == 0)
+ func |= GDK_FUNC_RESIZE;
+
+ 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->m_windowStyle & 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 */
+ if (win->m_icon != wxNullIcon)
+ {
+ wxIcon icon( win->m_icon );
+ win->m_icon = 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? */
+ wxNode *node = win->m_children.First();
+ while (node)
+ {
+ wxWindow *child = (wxWindow*) node->Data();
+ if (child->AcceptsFocus())
+ {
+ child->SetFocus();
+ break;
+ }
+
+ node = node->Next();
+ }
+
+ 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;
+}
+
//-----------------------------------------------------------------------------
// wxFrame
//-----------------------------------------------------------------------------
wxFrame::wxFrame()
{
m_frameMenuBar = (wxMenuBar *) NULL;
- m_mdiMenuBar = (wxMenuBar *) NULL;
m_frameStatusBar = (wxStatusBar *) NULL;
m_frameToolBar = (wxToolBar *) NULL;
m_sizeSet = FALSE;
m_miniEdge = 0;
m_miniTitle = 0;
+ m_mainWidget = (GtkWidget*) NULL;
+ m_menuBarDetached = FALSE;
+ m_toolBarDetached = FALSE;
+ m_insertCallback = wxInsertChildInFrame;
}
wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
long style, const wxString &name )
{
m_frameMenuBar = (wxMenuBar *) NULL;
- m_mdiMenuBar = (wxMenuBar *) NULL;
m_frameStatusBar = (wxStatusBar *) NULL;
m_frameToolBar = (wxToolBar *) NULL;
m_sizeSet = FALSE;
m_miniEdge = 0;
m_miniTitle = 0;
+ m_mainWidget = (GtkWidget*) NULL;
+ m_menuBarDetached = FALSE;
+ m_toolBarDetached = FALSE;
+ m_insertCallback = wxInsertChildInFrame;
Create( parent, id, title, pos, size, style, name );
}
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 );
- gtk_window_set_title( GTK_WINDOW(m_widget), title );
- GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
+#ifdef __WXDEBUG__
+ debug_focus_in( m_widget, _T("wxFrame::m_widget"), name );
+#endif
- gtk_window_set_policy( GTK_WINDOW(m_widget), 1, 1, 0 );
+ gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );
+ GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
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 );
+
+#ifdef __WXDEBUG__
+ debug_focus_in( m_mainWidget, _T("wxFrame::m_mainWidget"), name );
+#endif
+
+ /* 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 );
+
+#ifdef __WXDEBUG__
+ debug_focus_in( m_wxwindow, _T("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 );
PostCreation();
- gtk_widget_realize( m_widget );
+ /* 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 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 );
wxTopLevelWindows.DeleteObject( this );
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
+ 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 );
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::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+ wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
- /* don't do anything for children of wxMDIChildFrame */
- if (!m_wxwindow) return;
-
- 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;
{
if ((m_x != old_x) || (m_y != old_y))
{
- /* m_sizeSet = FALSE; */
- gtk_widget_set_uposition( m_widget, m_x, m_y );
+ /* we set the size here and in gtk_frame_map_callback */
+ gtk_widget_set_uposition( m_widget, m_x, m_y );
}
}
if ((m_width != old_width) || (m_height != old_height))
{
- /* we set the size in GtkOnSize */
+ /* 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;
}
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;
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)
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::DoSetClientSize( 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 )
// 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), _T("invalid frame") );
+
m_width = width;
m_height = height;
- /* 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;
-
- /* this emulates the new wxMSW behaviour of placing all
- * frame-subwindows (menu, toolbar..) on one native window
- * 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;
-
- gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameMenuBar->m_widget, xx, yy );
- gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, 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 );
+
+// m_frameMenuBar->m_widget->requisition.width = ww;
+// m_frameMenuBar->m_widget->requisition.height = hh;
+ gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh );
+
+ client_area_y_offset += hh;
+ }
- if (m_frameToolBar)
- {
- int xx = m_miniEdge;
- int yy = m_miniEdge + m_miniTitle;
- if ((m_frameMenuBar) || (m_mdiMenuBar)) yy += wxMENU_HEIGHT;
- int ww = m_width - 2*m_miniEdge;
- int hh = m_frameToolBar->m_height;
-
- 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 );
+
+ 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 );
- gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameToolBar->m_widget, xx, yy );
- gtk_widget_set_usize( m_frameToolBar->m_widget, ww, hh );
+ 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 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_height = hh;
gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, xx, yy );
+
+// m_frameStatusBar->m_widget->requisition.width = ww;
+// m_frameStatusBar->m_widget->requisition.height = hh;
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 */
void wxFrame::OnInternalIdle()
{
- if (!m_sizeSet)
+ if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
GtkOnSize( m_x, m_y, m_width, m_height );
DoMenuUpdates();
void wxFrame::OnCloseWindow( wxCloseEvent& event )
{
- // close the window if it wasn't vetoed by the application
-// if ( !event.GetVeto() ) // No, this isn't the interpretation of GetVeto.
Destroy();
}
void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+ wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
if (GetAutoLayout())
{
}
else
{
- // do we have exactly one child?
+ /* 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 )
+ if (child)
{
- // it's the second one: do nothing
+ /* it's the second one: do nothing */
return;
}
}
}
- // no children at all?
- if ( child )
+ /* no children at all? */
+ if (child)
{
- // yes: set it's size to fill all the frame
+ /* 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();
+
+#if (GTK_MINOR_VERSION > 0)
+ /* support for native hot keys */
+ gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(win->m_widget));
+#endif
+
+ wxNode *node = menu->GetItems().First();
while (node)
{
wxMenuItem *menuitem = (wxMenuItem*)node->Data();
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();
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+ /* support for native key accelerators indicated by underscroes */
+ gtk_accel_group_attach( m_frameMenuBar->m_accel, GTK_OBJECT(m_widget));
+#endif
+
+ wxNode *node = m_frameMenuBar->GetMenus().First();
while (node)
{
wxMenu *menu = (wxMenu*)node->Data();
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 );
-
- /* an mdi child menu bar might be underneath */
- if (m_mdiMenuBar) m_frameMenuBar->Show( FALSE );
+
+ 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 );
+ }
}
}
+ /* resize window in OnInternalIdle */
m_sizeSet = FALSE;
}
wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
{
- wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+ wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
- wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" );
+ wxCHECK_MSG( m_frameToolBar == NULL, FALSE, _T("recreating toolbar in wxFrame") );
m_frameToolBar = OnCreateToolBar( style, id, name );
wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+ wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
- wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" );
+ wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, _T("recreating status bar in wxFrame") );
m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
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" );
+ wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
- wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
+ 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" );
+ wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
- wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
+ wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set widths for") );
m_frameStatusBar->SetStatusWidths(n, widths_field);
}
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;
+ if (!m_widget->window) return;
+
wxMask *mask = icon.GetMask();
GdkBitmap *bm = (GdkBitmap *) NULL;
if (mask) bm = mask->GetBitmap();
projects / wxWidgets.git / blobdiff