Small changed to wxExtDialog

[wxWidgets.git] / src / gtk1 / frame.cpp

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 9e4f52a448129351c22ad10f3aa93ceb1b110eaa..61259fad4b0f23497b45048703f53d0dbd49effd 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -2,443 +2,1044 @@
 // Name:        frame.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        frame.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "frame.h"
+    #pragma implementation "frame.h"

 #endif
 
 #include "wx/frame.h"
 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"
 #endif
 
 #include "wx/frame.h"
 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"

+#include "wx/menu.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 "wx/gtk/win_gtk.h"
 #include "wx/gtk/win_gtk.h"

+#include "gdk/gdkkeysyms.h"
+
+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
+
+const int wxMENU_HEIGHT    = 27;
+const int wxSTATUS_HEIGHT  = 25;
+const int wxPLACE_HOLDER   = 0;
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------

 
 

-const wxMENU_HEIGHT    = 28;
-const wxSTATUS_HEIGHT  = 25;
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------

 
 

-extern wxList wxTopLevelWindows;

 extern wxList wxPendingDelete;
 
 //-----------------------------------------------------------------------------
 extern wxList wxPendingDelete;
 
 //-----------------------------------------------------------------------------

-// wxFrame
+// 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->m_hasVMT) return;
+
+    if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
+    {
+        win->m_width = alloc->width;
+        win->m_height = alloc->height;
+        win->UpdateSize();
+    }
+}
+
+//-----------------------------------------------------------------------------
+// "delete_event"

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// size

 
 

-void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
+static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), 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" );
-*/
+    win->Close();

 
 

-  win->GtkOnSize( alloc->x, alloc->y, alloc->width, alloc->height );
-};
+    return TRUE;
+}

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// delete
+// "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->UpdateSize();
+}
+
+//-----------------------------------------------------------------------------
+// "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->UpdateSize();
+}
+
+#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->UpdateSize();
+}
+
+//-----------------------------------------------------------------------------
+// "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->m_hasVMT) return;
+
+    win->m_toolBarDetached = TRUE;
+    win->UpdateSize();
+}
+#endif // wxUSE_TOOLBAR
+
+//-----------------------------------------------------------------------------
+// "configure_event"
+//-----------------------------------------------------------------------------
+
+static gint 
+#if (GTK_MINOR_VERSON > 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 (g_isIdle) 
+        wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT) return FALSE;
+
+#if (GTK_MINOR_VERSON > 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 );
+    win->GetEventHandler()->ProcessEvent( mevent );
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "realize" from m_widget
+//-----------------------------------------------------------------------------

 
 

-bool gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win )
+/* 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 )

 {
 {

-/*
-  printf( "OnDelete from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
+    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_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 */
+    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? */
+    wxWindowList::Node *node = win->GetChildren().GetFirst();
+    while (node)
+    {
+        wxWindow *child = node->GetData();
+        if (child->AcceptsFocus())
+        {
+            child->SetFocus();
+            break;
+        }
+
+        node = node->GetNext();
+    }

 
 

-  win->Close();
+    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( wxFrame* parent, wxWindow* child )
+{
+    if (!parent->m_insertInClientArea)
+    {
+        /* 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,
+                         child->m_width,
+                         child->m_height );
+
+#if wxUSE_TOOLBAR
+        /* 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_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
+                         GTK_WIDGET(child->m_widget),
+                         child->m_x,
+                         child->m_y,
+                         child->m_width,
+                         child->m_height );
+    }

 
 

-  return TRUE;
-};
+    /* resize on OnInternalIdle */
+    parent->UpdateSize();
+}

 
 

+//-----------------------------------------------------------------------------
+// wxFrame

 //-----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
 //-----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)

-  EVT_SIZE(wxFrame::OnSize)
-  EVT_CLOSE(wxFrame::OnCloseWindow)
-  EVT_IDLE(wxFrame::OnIdle)
+    EVT_SIZE(wxFrame::OnSize)
+    EVT_CLOSE(wxFrame::OnCloseWindow)
+    EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)

 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
 
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
 

-wxFrame::wxFrame()
+void wxFrame::Init()

 {
 {

-  m_doingOnSize = FALSE;
-  m_frameMenuBar = NULL;
-  m_frameStatusBar = NULL;
-  m_frameToolBar = NULL;
-  m_sizeSet = FALSE;
-  m_addPrivateChild = FALSE;
-  wxTopLevelWindows.Insert( this );
-};
+    m_frameMenuBar = (wxMenuBar *) NULL;
+#if wxUSE_STATUSBAR
+    m_frameStatusBar = (wxStatusBar *) NULL;
+#endif // wxUSE_STATUSBAR
+#if wxUSE_TOOLBAR
+    m_frameToolBar = (wxToolBar *) NULL;
+#endif // wxUSE_TOOLBAR
+    m_sizeSet = FALSE;
+    m_miniEdge = 0;
+    m_miniTitle = 0;
+    m_mainWidget = (GtkWidget*) NULL;
+    m_menuBarDetached = FALSE;
+    m_toolBarDetached = FALSE;
+    m_insertInClientArea = TRUE;
+}

 
 wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
 
 wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {

-  m_doingOnSize = FALSE;
-  m_frameMenuBar = NULL;
-  m_frameStatusBar = NULL;
-  m_frameToolBar = NULL;
-  m_sizeSet = FALSE;
-  m_addPrivateChild = FALSE;
-  Create( parent, id, title, pos, size, style, name );
-  wxTopLevelWindows.Insert( this );
-};
+    Init();
+
+    Create( parent, id, title, pos, size, style, name );
+}

 
 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 )
 {

-  m_needParent = FALSE;
-  m_mainWindow = NULL;
-  m_wxwindow = NULL;
+    wxTopLevelWindows.Append( this );

 
 

-  PreCreation( parent, id, pos, size, style, name );
+    m_needParent = FALSE;

 
 

-  m_doingOnSize = FALSE;
+    PreCreation( parent, id, pos, size, style, name );

 
 

-  m_title = title;
+    m_title = title;

 
 

-  m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-  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 );
+    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_window_set_title( GTK_WINDOW(m_widget), title );
-  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 );

 
 

-  gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL);
+    /* 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 );

 
 

-  gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
-    GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );
+#ifdef __WXDEBUG__
+    debug_focus_in( m_mainWidget, _T("wxFrame::m_mainWidget"), name );
+#endif

 
 

-  m_mainWindow = gtk_myfixed_new();
-  gtk_widget_show( m_mainWindow );
-  GTK_WIDGET_UNSET_FLAGS( m_mainWindow, GTK_CAN_FOCUS );
+    /* 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 );

 
 

-  gtk_container_add( GTK_CONTAINER(m_widget), m_mainWindow );
-  gtk_widget_set_uposition( m_mainWindow, 0, 0 );
+#ifdef __WXDEBUG__
+    debug_focus_in( m_wxwindow, _T("wxFrame::m_wxwindow"), name );
+#endif

 
 

-  m_wxwindow = gtk_myfixed_new();
-  gtk_widget_show( m_wxwindow );
-  GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
+    /* 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 );

 
 

-  gtk_container_add( GTK_CONTAINER(m_mainWindow), m_wxwindow );
+    if (m_parent) m_parent->AddChild( this );

 
 

-  gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
-    GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
+    PostCreation();

 
 

-  PostCreation();
+    /*  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_widget_realize( m_mainWindow );
+    /* 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 );

 
 

-  return TRUE;
-};
+    /* 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 );
+
+    return TRUE;
+}

 
 wxFrame::~wxFrame()
 {
 
 wxFrame::~wxFrame()
 {

-  if (m_frameMenuBar) delete m_frameMenuBar;
-  if (m_frameStatusBar) delete m_frameStatusBar;
+    m_isBeingDeleted = TRUE;
+
+    if (m_frameMenuBar) delete m_frameMenuBar;
+    m_frameMenuBar = (wxMenuBar *) NULL;

 
 

-//  if (m_mainWindow) gtk_widget_destroy( m_mainWindow );
+#if wxUSE_STATUSBAR
+    if (m_frameStatusBar) delete m_frameStatusBar;
+    m_frameStatusBar = (wxStatusBar *) NULL;
+#endif // wxUSE_STATUSBAR

 
 

-  wxTopLevelWindows.DeleteObject( this );
-  if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
-};
+#if wxUSE_TOOLBAR
+    if (m_frameToolBar) delete m_frameToolBar;
+    m_frameToolBar = (wxToolBar *) NULL;
+#endif // wxUSE_TOOLBAR
+
+    wxTopLevelWindows.DeleteObject( this );
+
+    if (wxTheApp->GetTopWindow() == this)
+        wxTheApp->SetTopWindow( (wxWindow*) NULL );
+
+    if (wxTopLevelWindows.Number() == 0)
+        wxTheApp->ExitMainLoop();
+}

 
 bool wxFrame::Show( bool show )
 {
 
 bool wxFrame::Show( bool show )
 {

-  if (show)
-  {
-    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-    m_sizeSet = FALSE;
-    ProcessEvent( event );
-  };
-  return wxWindow::Show( show );
-};
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );

 
 

-void wxFrame::Enable( bool enable )
+    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 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()

 {
 {

-  wxWindow::Enable( enable );
-  gtk_widget_set_sensitive( m_mainWindow, enable );
-};
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );

 
 

-void wxFrame::OnCloseWindow( wxCloseEvent &event )
+    if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
+
+    return TRUE;
+}
+
+void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )

 {
 {

-    if ( GetEventHandler()->OnClose() || event.GetForce())
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
+
+    /* 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;
+    int old_y = m_y;
+    int old_width = m_width;
+    int old_height = m_height;
+
+    if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)

     {
     {

-        this->Destroy();
+        if (x != -1) m_x = x;
+        if (y != -1) m_y = y;
+        if (width != -1) m_width = width;
+        if (height != -1) m_height = height;
+    }
+    else
+    {
+        m_x = x;
+        m_y = y;
+        m_width = width;
+        m_height = height;

     }
     }

-};

 
 

-bool wxFrame::Destroy()
+    if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
+    {
+        if (width == -1) m_width = 80;
+    }
+
+    if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT)
+    {
+       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_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
+    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
+
+    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))
+    {
+        /* 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::Centre( int direction )

 {
 {

-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
+
+    int x = 0;
+    int y = 0;

 
 

-  return TRUE;
+    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

 {
 {

-  wxWindow::GetClientSize( width, height );
-  if (height)
-  {
-    if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT;
-    if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
-    if (m_frameToolBar)
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
+
+    wxWindow::DoGetClientSize( width, height );
+    if (height)

     {
     {

-      int y = 0;
-      m_frameToolBar->GetSize( NULL, &y );
-      (*height) -= y;
+        /* 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)
+            {
+                int y = 0;
+                m_frameToolBar->GetSize( (int *) NULL, &y );
+                (*height) -= y;
+            }
+            else
+                (*height) -= wxPLACE_HOLDER;
+        }
+#endif
+
+        /* mini edge */
+        (*height) -= m_miniEdge*2 + m_miniTitle;
+    }
+    if (width)
+    {
+        (*width) -= m_miniEdge*2;

     }
     }

-  };
-};
-
-void wxFrame::GtkOnSize( int x, int y, int width, int height )
-{
-  m_x = x;
-  m_y = y;
-
-  if ((m_height == height) && (m_width == width) &&
-      (m_sizeSet)) return;
-  if (!m_mainWindow) return;
-  if (!m_wxwindow) return;
-
-  m_width = width;
-  m_height = height;
-
-  gtk_widget_set_usize( m_widget, width, height );
-
-  int main_x = 0;
-  int main_y = 0;
-  int main_height = height;
-  int main_width = width;
-
-  // This emulates Windows behaviour:
-  // The menu bar is part of the main window, but the status bar
-  // is on the implementation side in the client area. The
-  // function GetClientSize returns the size of the client area
-  // minus the status bar height. Under wxGTK, the main window
-  // is represented by m_mainWindow. The menubar is inserted
-  // into m_mainWindow whereas the statusbar is insertes into
-  // m_wxwindow just like any other window.
-
-//  not really needed
-  gtk_widget_set_usize( m_mainWindow, width, height );
-
-  if (m_frameMenuBar)
-  {
-    main_y = wxMENU_HEIGHT;
-    main_height -= wxMENU_HEIGHT;
-  };
-
-  int toolbar_height = 0;
-  if (m_frameToolBar) m_frameToolBar->GetSize( NULL, &toolbar_height );
-  
-  main_y += toolbar_height;
-  main_height -= toolbar_height;
-  
-  gtk_widget_set_uposition( GTK_WIDGET(m_wxwindow), main_x, main_y );
-  gtk_widget_set_usize( GTK_WIDGET(m_wxwindow), main_width, main_height );
-
-  if (m_frameMenuBar)
-  {
-    gtk_widget_set_uposition( m_frameMenuBar->m_widget, 1, 1 );
-    gtk_widget_set_usize( m_frameMenuBar->m_widget, width-2, wxMENU_HEIGHT-2 );
-  };
-
-  if (m_frameToolBar)
-  {
-    gtk_widget_set_uposition( m_frameToolBar->m_widget, 1, wxMENU_HEIGHT );
-    gtk_widget_set_usize( m_frameToolBar->m_widget, width-2, toolbar_height );
-  };
-  
-  if (m_frameStatusBar)
-  {
-    m_frameStatusBar->SetSize( 0, main_height-wxSTATUS_HEIGHT, width, wxSTATUS_HEIGHT );
-  };
-
-  m_sizeSet = TRUE;
-
-  wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-  event.SetEventObject( this );
-  ProcessEvent( event );
-};
+}

 
 

-void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
+void wxFrame::DoSetClientSize( int width, int height )

 {
 {

-  if ( GetAutoLayout() )
-    Layout();
-  else {
-    // no child: go out !
-    if (!GetChildren()->First())
-      return;
-      
-    // do we have exactly one child?
-    wxWindow *child = NULL;
-    for(wxNode *node = GetChildren()->First(); node; node = node->Next())
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
+
+        /* 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)
+            {
+                int y = 0;
+                m_frameToolBar->GetSize( (int *) NULL, &y );
+                height += y;
+            }
+            else
+                height += wxPLACE_HOLDER;
+        }
+#endif
+
+    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 )
+{
+    // 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;
+
+    /* 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;
+
+    /* 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)
+    {
+        /* 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_set_size( GTK_MYFIXED(m_mainWidget),
+                                  m_frameMenuBar->m_widget,
+                                  xx, yy, ww, hh );
+            client_area_y_offset += hh;
+        }
+
+#if wxUSE_TOOLBAR
+        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_set_size( GTK_MYFIXED(m_mainWidget),
+                                  m_frameToolBar->m_widget,
+                                  xx, yy, ww, hh );
+            client_area_y_offset += hh;
+        }
+#endif
+
+        int client_x = m_miniEdge;
+        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_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+                              m_wxwindow,
+                              client_x, client_y, client_w, client_h );
+    }
+    else

     {
     {

-      wxWindow *win = (wxWindow *)node->Data();
-      if (!IS_KIND_OF(win,wxFrame) && !IS_KIND_OF(win,wxDialog)
-#if 0  // not in m_children anyway
-          && (win != m_frameMenuBar) &&
-             (win != m_frameToolBar) &&
-             (win != m_frameStatusBar)
+        /* 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 - 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_set_size( GTK_MYFIXED(m_wxwindow),
+                              m_frameStatusBar->m_widget,
+                              xx, yy, ww, hh );
+    }

 #endif
 #endif

-         )
-      {
-        if ( child )  // it's the second one: do nothing
-          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);
-  }
-};
-
-void wxFrame::AddChild( wxWindow *child )
-{
-  // wxFrame and wxDialog as children aren't placed into the parents
-  
-  if (child->IsKindOf(CLASSINFO(wxFrame)) || child->IsKindOf(CLASSINFO(wxDialog)))
-  {
-    m_children.Append( child );
-    
-    if ((child->m_x != -1) && (child->m_y != -1))
-      gtk_widget_set_uposition( child->m_widget, child->m_x, child->m_y );
-      
-    return;
-  }
-  
-  if (m_addPrivateChild)
-  {
-    gtk_myfixed_put( GTK_MYFIXED(m_mainWindow), child->m_widget, child->m_x, child->m_y );
-      
-    gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height );
-  }
-  else
-  {
-    m_children.Append( child );
-    
-    if (m_wxwindow)
-      gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y );
-      
-    gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height );
-  }    
-};
-
-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();
-  };
-};
+
+    /* 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 */
+    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
+    event.SetEventObject( this );
+    GetEventHandler()->ProcessEvent( event );
+
+    /* send size event to status bar */
+    if (m_frameStatusBar)
+    {
+        wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() );
+        event2.SetEventObject( m_frameStatusBar );
+        m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 );
+    }
+
+    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 && GTK_WIDGET_REALIZED(m_wxwindow))
+        GtkOnSize( m_x, m_y, m_width, m_height );
+
+    DoMenuUpdates();
+
+    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
+}
+
+void wxFrame::OnCloseWindow( wxCloseEvent& WXUNUSED(event) )
+{
+    Destroy();
+}
+
+void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
+{
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
+
+#if wxUSE_CONSTRAINTS
+    if (GetAutoLayout())
+    {
+        Layout();
+    }
+    else
+#endif // wxUSE_CONSTRAINTS
+    {
+        /* 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)
+                {
+                    /* it's the second one: do nothing */
+                    return;
+                }
+
+                child = win;
+            }
+        }
+
+        /* no children at all? */
+        if (child)
+        {
+            /* yes: set it's size to fill all the frame */
+            int client_x, client_y;
+            DoGetClientSize( &client_x, &client_y );
+            child->SetSize( 1, 1, client_x-2, client_y-2 );
+        }
+    }
+}

 
 void wxFrame::SetMenuBar( wxMenuBar *menuBar )
 {
 
 void wxFrame::SetMenuBar( wxMenuBar *menuBar )
 {

-  m_frameMenuBar = menuBar;
-  
-  if (m_frameMenuBar)
-  {
-    if (m_frameMenuBar->m_parent != this)
+    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();
-      while (node)
-      {
-        wxMenu *menu = (wxMenu*)node->Data();
-        SetInvokingWindow( menu, this );
-        node = node->Next();
-      };
-  
-      m_frameMenuBar->m_parent = this;
-      gtk_myfixed_put( GTK_MYFIXED(m_mainWindow),
-        m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
+        m_frameMenuBar->SetInvokingWindow( this );
+
+        if (m_frameMenuBar->GetParent() != this)
+        {
+            m_frameMenuBar->SetParent(this);
+            gtk_myfixed_put( GTK_MYFIXED(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)
+            {
+                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 );
+        }

     }
     }

-  }
-};

 
 

-wxMenuBar *wxFrame::GetMenuBar(void)
+    /* resize window in OnInternalIdle */
+    m_sizeSet = FALSE;
+}
+
+wxMenuBar *wxFrame::GetMenuBar() const

 {
 {

-  return m_frameMenuBar;
-};
+    return m_frameMenuBar;
+}

 
 

-wxToolBar *wxFrame::CreateToolBar( long style , wxWindowID id, const wxString& name )
+void wxFrame::OnMenuHighlight(wxMenuEvent& event)

 {
 {

-  m_addPrivateChild = TRUE;
-  
-  m_frameToolBar = new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name );
-  
-  m_addPrivateChild = FALSE;
-  
-  return m_frameToolBar;
-};
+#if wxUSE_STATUSBAR
+    if (GetStatusBar())
+    {
+        // if no help string found, we will clear the status bar text
+        wxString helpString;
+
+        int menuId = event.GetMenuId();
+        if ( menuId != -1 )
+        {
+            wxMenuBar *menuBar = GetMenuBar();
+            if (menuBar)
+            {
+                helpString = menuBar->GetHelpString(menuId);
+            }
+        }
+
+        SetStatusText(helpString);
+    }
+#endif // wxUSE_STATUSBAR
+}

 
 

-wxToolBar *wxFrame::GetToolBar(void)
+#if wxUSE_TOOLBAR
+wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& name )

 {
 {

-  return m_frameToolBar;
-};
+    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 );
+
+    if (m_frameToolBar) GetChildren().DeleteObject( m_frameToolBar );

 
 

+    m_insertInClientArea = TRUE;
+
+    m_sizeSet = FALSE;
+
+    return m_frameToolBar;
+}
+
+wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString& name )
+{
+    return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name );
+}
+
+wxToolBar *wxFrame::GetToolBar() const
+{
+    return m_frameToolBar;
+}
+#endif // wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR

 wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
 {
 wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
 {

-  if (m_frameStatusBar)
-  delete m_frameStatusBar;
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
+
+    wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, _T("recreating status bar in wxFrame") );
+
+    m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
+
+    m_sizeSet = FALSE;
+
+    return m_frameStatusBar;
+}
+
+wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
+{
+    wxStatusBar *statusBar = (wxStatusBar *) NULL;
+
+    statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20), style, name);
+
+    // Set the height according to the font and the border size
+    wxClientDC dc(statusBar);
+    dc.SetFont( statusBar->GetFont() );

 
 

-  m_frameStatusBar = new wxStatusBar( this, id, wxPoint(0,0), wxSize(100,20), style, name );
+    long x, y;
+    dc.GetTextExtent( "X", &x, &y );

 
 

-  m_frameStatusBar->SetFieldsCount( number );
-  
-  return m_frameStatusBar;
-};
+    int height = (int)( (y  * 1.1) + 2* statusBar->GetBorderY());

 
 

-void wxFrame::SetStatusText( const wxString &text, int number )
+    statusBar->SetSize( -1, -1, 100, height );
+
+    statusBar->SetFieldsCount( number );
+    return statusBar;
+}
+
+wxStatusBar *wxFrame::GetStatusBar() const

 {
 {

-  if (m_frameStatusBar) m_frameStatusBar->SetStatusText( text, number );
-};
+    return m_frameStatusBar;
+}

 
 

-void wxFrame::SetStatusWidths( int n, int *width )
+void wxFrame::SetStatusText(const wxString& text, int number)

 {
 {

-  if (m_frameStatusBar) m_frameStatusBar->SetStatusWidths( n, width );
-};
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
+
+    wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set text for") );

 
 

-wxStatusBar *wxFrame::GetStatusBar(void)
+    m_frameStatusBar->SetStatusText(text, number);
+}
+
+void wxFrame::SetStatusWidths(int n, const int widths_field[] )

 {
 {

-  return m_frameStatusBar;
-};
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
+
+    wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set widths for") );
+
+    m_frameStatusBar->SetStatusWidths(n, widths_field);
+}
+#endif // wxUSE_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::SetTitle( const wxString &title )
 {
 
 void wxFrame::SetTitle( const wxString &title )
 {

-  m_title = title;
-  gtk_window_set_title( GTK_WINDOW(m_widget), title );
-};
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
+
+    m_title = title;
+    if (m_title.IsNull()) m_title = _T("");
+    gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );
+}

 
 

-void wxFrame::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW) )
+void wxFrame::SetIcon( const wxIcon &icon )

 {
 {

-  if (m_wxwindow)
-    gdk_window_set_hints( m_wxwindow->window, -1, -1, 
-                         minW, minH, maxW, maxH, GDK_HINT_MIN_SIZE | GDK_HINT_MIN_SIZE );
+    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();
+
+    gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );

 }
 }

+