#include "gdk/gdk.h"
#include "gtk/gtk.h"
#include "wx/gtk/win_gtk.h"
+#include "gdk/gdkkeysyms.h"
//-----------------------------------------------------------------------------
// constants
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 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 (!win->HasVMT()) return;
+ if (g_isIdle)
+ wxapp_install_idle_handler();
-/*
- printf( "OnFrameResize from " );
- if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
- printf( win->GetClassInfo()->GetClassName() );
- printf( ".\n" );
-*/
+ if (!win->m_hasVMT) return;
- 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;
- }
+ if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
+ {
+ win->m_width = alloc->width;
+ win->m_height = alloc->height;
+ win->UpdateSize();
+ }
}
//-----------------------------------------------------------------------------
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();
static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
{
- if (!win->HasVMT()) return;
+ if (!win->m_hasVMT) return;
win->m_menuBarDetached = FALSE;
- win->m_sizeSet = FALSE;
+ win->UpdateSize();
}
//-----------------------------------------------------------------------------
static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
{
- if (!win->HasVMT()) return;
+ if (!win->m_hasVMT) return;
win->m_menuBarDetached = TRUE;
- win->m_sizeSet = FALSE;
+ win->UpdateSize();
}
//-----------------------------------------------------------------------------
static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
{
- if (!win->HasVMT()) return;
+ if (!win->m_hasVMT) return;
win->m_toolBarDetached = FALSE;
- win->m_sizeSet = FALSE;
+
+ win->UpdateSize();
}
//-----------------------------------------------------------------------------
static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSED(child), wxFrame *win )
{
- if (!win->HasVMT()) return;
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+
+ if (!win->m_hasVMT) return;
win->m_toolBarDetached = TRUE;
- win->m_sizeSet = FALSE;
+ win->UpdateSize();
}
//-----------------------------------------------------------------------------
// "configure_event"
//-----------------------------------------------------------------------------
-static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
+static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxFrame *win )
{
- if (!win->HasVMT()) return FALSE;
+ if (g_isIdle)
+ wxapp_install_idle_handler();
- win->m_x = event->x;
- win->m_y = event->y;
+ if (!win->m_hasVMT) return FALSE;
+
+ 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;
wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
mevent.SetEventObject( win );
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 & wxMINIMIZE) == 0)
- func |= GDK_FUNC_MINIMIZE;
- if ((win->m_windowStyle & wxMAXIMIZE) == 0)
- func |= GDK_FUNC_MAXIMIZE; */
- if ((win->m_windowStyle & wxSYSTEM_MENU) == 0)
- decor |= GDK_DECOR_MENU;
- if ((win->m_windowStyle & wxMINIMIZE_BOX) == 0)
- decor |= GDK_DECOR_MINIMIZE;
- if ((win->m_windowStyle & wxMAXIMIZE_BOX) == 0)
- decor |= GDK_DECOR_MAXIMIZE;
- if ((win->m_windowStyle & wxRESIZE_BORDER) == 0)
- func |= GDK_FUNC_RESIZE;
-
+ 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->m_windowStyle & wxRESIZE_BORDER) == 0)
+ 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);
{
wxIcon icon( win->m_icon );
win->m_icon = wxNullIcon;
- win->SetIcon( icon );
+ win->SetIcon( icon );
}
- return FALSE;
-}
-
-//-----------------------------------------------------------------------------
-// "map" from m_widget
-//-----------------------------------------------------------------------------
-
-static gint
-gtk_frame_map_callback( GtkWidget *widget, wxFrame *win )
-{
- gtk_widget_set_uposition( widget, win->m_x, win->m_y );
+ /* 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;
}
* virtual function here as wxWindows requires different ways to insert
* a child in container classes. */
-static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child )
+static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
{
- if (wxIS_KIND_OF(child,wxToolBar) || wxIS_KIND_OF(child,wxMenuBar))
+ if (!parent->m_insertInClientArea)
{
- /* actually, menubars are never inserted here, but this
- may change one day */
-
/* these are outside the client area */
- wxFrame* frame = (wxFrame*) parent;
+ 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)
- {
+ child->m_y,
+ child->m_width,
+ child->m_height );
+
+ /* 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 );
- }
- }
+ }
+ }
}
else
{
gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
GTK_WIDGET(child->m_widget),
child->m_x,
- child->m_y );
+ child->m_y,
+ child->m_width,
+ child->m_height );
}
- gtk_widget_set_usize( GTK_WIDGET(child->m_widget),
- child->m_width,
- child->m_height );
-
/* resize on OnInternalIdle */
- parent->m_sizeSet = FALSE;
+ parent->UpdateSize();
}
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
-wxFrame::wxFrame()
+void wxFrame::Init()
{
m_frameMenuBar = (wxMenuBar *) NULL;
m_frameStatusBar = (wxStatusBar *) NULL;
m_mainWidget = (GtkWidget*) NULL;
m_menuBarDetached = FALSE;
m_toolBarDetached = FALSE;
- m_insertCallback = wxInsertChildInFrame;
+ m_insertInClientArea = TRUE;
}
wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
- m_frameMenuBar = (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;
+ Init();
+
Create( parent, id, title, pos, size, style, name );
}
m_title = title;
- m_insertCallback = wxInsertChildInFrame;
+ 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 (!name.IsEmpty())
+ 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 );
+#endif
gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );
GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
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_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
- /* we allow the frame to get the focus as otherwise no
- key events will get sent to it. the point with this is
- that the menu's key accelerators work by interceting
- key events here */
- GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
- gtk_widget_grab_focus( m_wxwindow );
+#ifdef __WXDEBUG__
+ debug_focus_in( m_wxwindow, _T("wxFrame::m_wxwindow"), name );
+#endif
+
+ /* 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 );
/* 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 );
+ GTK_SIGNAL_FUNC(gtk_frame_realized_callback), (gpointer) this );
- /* we set the position of the window after the map event. setting it
- before has no effect (with KWM) */
- gtk_signal_connect( GTK_OBJECT(m_widget), "map",
- GTK_SIGNAL_FUNC(gtk_frame_map_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 );
wxFrame::~wxFrame()
{
+ m_isBeingDeleted = TRUE;
+
if (m_frameMenuBar) delete m_frameMenuBar;
m_frameMenuBar = (wxMenuBar *) NULL;
{
if ((m_x != old_x) || (m_y != old_y))
{
- /* we set the size here and in gtk_frame_map_callback */
- gtk_widget_set_uposition( m_widget, m_x, m_y );
+ 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, 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. */
+ 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;
}
Move( x, y );
}
-void wxFrame::GetClientSize( int *width, int *height ) const
+void wxFrame::DoGetClientSize( int *width, int *height ) const
{
wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
- wxWindow::GetClientSize( width, height );
+ wxWindow::DoGetClientSize( width, height );
if (height)
{
/* menu bar */
if (m_frameMenuBar)
- {
- if (!m_menuBarDetached)
- (*height) -= wxMENU_HEIGHT;
- else
- (*height) -= wxPLACE_HOLDER;
- }
-
- /* status bar */
+ {
+ if (!m_menuBarDetached)
+ (*height) -= wxMENU_HEIGHT;
+ else
+ (*height) -= wxPLACE_HOLDER;
+ }
+
+ /* status bar */
if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
-
- /* tool bar */
+
+ /* tool bar */
if (m_frameToolBar)
{
- if (!m_toolBarDetached)
- {
+ if (!m_toolBarDetached)
+ {
int y = 0;
m_frameToolBar->GetSize( (int *) NULL, &y );
(*height) -= y;
- }
- else
+ }
+ else
(*height) -= wxPLACE_HOLDER;
}
-
- /* mini edge */
+
+ /* mini edge */
(*height) -= m_miniEdge*2 + m_miniTitle;
}
if (width)
/* menu bar */
if (m_frameMenuBar)
- {
- if (!m_menuBarDetached)
- height += wxMENU_HEIGHT;
- else
- height += wxPLACE_HOLDER;
- }
-
- /* status bar */
+ {
+ if (!m_menuBarDetached)
+ height += wxMENU_HEIGHT;
+ else
+ height += wxPLACE_HOLDER;
+ }
+
+ /* status bar */
if (m_frameStatusBar) height += wxSTATUS_HEIGHT;
-
- /* tool bar */
+
+ /* tool bar */
if (m_frameToolBar)
{
- if (!m_toolBarDetached)
- {
+ if (!m_toolBarDetached)
+ {
int y = 0;
m_frameToolBar->GetSize( (int *) NULL, &y );
height += y;
- }
- else
+ }
+ else
height += wxPLACE_HOLDER;
}
-
+
wxWindow::DoSetClientSize( width + m_miniEdge*2, height + m_miniEdge*2 + m_miniTitle );
}
int yy = m_miniEdge + m_miniTitle;
int ww = m_width - 2*m_miniEdge;
int hh = wxMENU_HEIGHT;
- if (m_menuBarDetached) hh = wxPLACE_HOLDER;
+ 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 );
- gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh );
-
- client_area_y_offset += hh;
+ gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+ m_frameMenuBar->m_widget,
+ xx, yy, ww, hh );
+ client_area_y_offset += hh;
}
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;
- }
+ {
+ 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_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;
+ gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+ m_frameToolBar->m_widget,
+ xx, yy, 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 );
-
+ int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;
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 );
+ int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;
+ gtk_myfixed_set_size( GTK_MYFIXED(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. */
+ is no need to set the size or position of m_wxwindow. */
}
if (m_frameStatusBar)
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_myfixed_set_size( GTK_MYFIXED(m_wxwindow),
+ m_frameStatusBar->m_widget,
+ xx, yy, 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 */
m_resizing = FALSE;
}
+void wxFrame::MakeModal( bool modal )
+{
+ if (modal)
+ gtk_grab_add( m_widget );
+ else
+ gtk_grab_remove( m_widget );
+}
+
void wxFrame::OnInternalIdle()
{
- if (!m_sizeSet)
+ if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
GtkOnSize( m_x, m_y, m_width, m_height );
DoMenuUpdates();
+
+ if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();
+ if (m_frameToolBar) m_frameToolBar->OnInternalIdle();
+ if (m_frameStatusBar) m_frameStatusBar->OnInternalIdle();
}
-void wxFrame::OnCloseWindow( wxCloseEvent& event )
+void wxFrame::OnCloseWindow( wxCloseEvent& WXUNUSED(event) )
{
Destroy();
}
}
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 );
+ DoGetClientSize( &client_x, &client_y );
child->SetSize( 1, 1, client_x-2, client_y-2 );
}
}
static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
{
menu->SetInvokingWindow( win );
+
+#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)
{
if (m_frameMenuBar)
{
- /* support for native key accelerators indicated by underscroes */
#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
node = node->Next();
}
- if (m_frameMenuBar->m_parent != this)
+ if (m_frameMenuBar->GetParent() != this)
{
- m_frameMenuBar->m_parent = this;
+ m_frameMenuBar->SetParent(this);
gtk_myfixed_put( GTK_MYFIXED(m_mainWidget),
- m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
-
- if (menuBar->m_windowStyle & wxMB_DOCKABLE)
- {
+ 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)
+ {
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 );
- }
+ }
}
}
}
}
-wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
+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") );
+ m_insertInClientArea = FALSE;
+
m_frameToolBar = OnCreateToolBar( style, id, name );
- GetChildren().DeleteObject( m_frameToolBar );
+ if (m_frameToolBar) GetChildren().DeleteObject( m_frameToolBar );
+
+ m_insertInClientArea = TRUE;
m_sizeSet = FALSE;
projects / wxWidgets.git / blobdiff