X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/219f895a273cdf12ded3f79dbbcd1e076fe83901..ec758a20a2b166b2073e1c902cc745db01290f02:/src/gtk/frame.cpp

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 075ed1e7f6..bfbbda8e30 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -2,10 +2,9 @@
 // Name:        frame.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -16,343 +15,594 @@
 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"
+#include "wx/menu.h"
+#include "wx/toolbar.h"
+#include "wx/statusbr.h"
+#include "wx/dcclient.h"
 #include "wx/gtk/win_gtk.h"
 
-const wxMENU_HEIGHT    = 28;
-const wxSTATUS_HEIGHT  = 25;
+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
 
-extern wxList wxTopLevelWindows;
-extern wxList wxPendingDelete;
+const int wxMENU_HEIGHT    = 30;
+const int wxSTATUS_HEIGHT  = 25;
 
 //-----------------------------------------------------------------------------
-// wxFrame
+// data
 //-----------------------------------------------------------------------------
 
+extern wxList wxTopLevelWindows;
+extern wxList wxPendingDelete;
+
+//-----------------------------------------------------------------------------
+// "size_allocate"
 //-----------------------------------------------------------------------------
-// size
 
-void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
+static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
 {
-  if (!win->HasVMT()) return;
-
+    if (!win->HasVMT()) return;
+    
 /*
-  printf( "OnFrameResize from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
+    printf( "OnFrameResize from " );
+    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+        printf( win->GetClassInfo()->GetClassName() );
+    printf( ".\n" );
 */
+    
+   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->GtkOnSize( alloc->x, alloc->y, alloc->width, alloc->height );
-};
-
 //-----------------------------------------------------------------------------
-// delete
+// "delete_event"
+//-----------------------------------------------------------------------------
 
-bool gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win )
+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" );
+    printf( "OnDelete from " );
+    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+        printf( win->GetClassInfo()->GetClassName() );
+    printf( ".\n" );
 */
 
-  win->Close();
+    win->Close();
 
-  return TRUE;
-};
+    return TRUE;
+}
 
+//-----------------------------------------------------------------------------
+// "configure_event"
+//-----------------------------------------------------------------------------
+
+static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
+{
+    if (!win->HasVMT()) return FALSE;
+  
+    win->m_x = event->x;
+    win->m_y = event->y;
+  
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// wxFrame
 //-----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
-  EVT_CLOSE(wxFrame::OnCloseWindow)
-  EVT_SIZE(wxFrame::OnSize)
+    EVT_SIZE(wxFrame::OnSize)
+    EVT_CLOSE(wxFrame::OnCloseWindow)
+    EVT_IDLE(wxFrame::OnIdle)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
 
-wxFrame::wxFrame(void)
+wxFrame::wxFrame()
 {
-  m_doingOnSize = FALSE;
-  m_frameMenuBar = NULL;
-  m_frameStatusBar = NULL;
-  m_sizeSet = FALSE;
-  wxTopLevelWindows.Insert( this );
-};
+    m_frameMenuBar = (wxMenuBar *) NULL;
+    m_frameStatusBar = (wxStatusBar *) NULL;
+    m_frameToolBar = (wxToolBar *) NULL;
+    m_sizeSet = FALSE;
+}
 
 wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
-  m_sizeSet = FALSE;
-  Create( parent, id, title, pos, size, style, name );
-  wxTopLevelWindows.Insert( this );
-};
+    m_frameMenuBar = (wxMenuBar *) NULL;
+    m_frameStatusBar = (wxStatusBar *) NULL;
+    m_frameToolBar = (wxToolBar *) NULL;
+    m_sizeSet = FALSE;
+    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 )
 {
-  m_needParent = FALSE;
-  m_mainWindow = NULL;
-  m_wxwindow = NULL;
+    wxTopLevelWindows.Append( this );
+    
+    m_needParent = FALSE;
 
-  PreCreation( parent, id, pos, size, style, name );
+    PreCreation( parent, id, pos, size, style, name );
 
-  m_doingOnSize = FALSE;
+    m_title = title;
 
-  m_title = title;
+    GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
+    if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP;
+  
+    m_widget = gtk_window_new( win_type );
+    
+    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_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 );
+    gtk_window_set_title( GTK_WINDOW(m_widget), title );
+    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_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL );
 
-  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 );
 
-  gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
-    GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );
+    m_wxwindow = gtk_myfixed_new();
+    gtk_widget_show( m_wxwindow );
+    GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
 
-  m_mainWindow = gtk_myfixed_new();
-  gtk_widget_show( m_mainWindow );
-  GTK_WIDGET_UNSET_FLAGS( m_mainWindow, GTK_CAN_FOCUS );
+    gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
 
-  gtk_container_add( GTK_CONTAINER(m_widget), m_mainWindow );
-  gtk_widget_set_uposition( m_mainWindow, 0, 0 );
+    gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
+        GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
 
-  m_wxwindow = gtk_myfixed_new();
-  gtk_widget_show( m_wxwindow );
-  GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
+    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();
+    
+    return TRUE;
+}
 
-  gtk_container_add( GTK_CONTAINER(m_mainWindow), m_wxwindow );
+wxFrame::~wxFrame()
+{
+    if (m_frameMenuBar) delete m_frameMenuBar;
+    if (m_frameStatusBar) delete m_frameStatusBar;
+    if (m_frameToolBar) delete m_frameToolBar;
 
-  m_frameMenuBar = NULL;
-  m_frameStatusBar = NULL;
+    wxTopLevelWindows.DeleteObject( this );
+    if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
+}
 
-  gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
-    GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
+bool wxFrame::Show( bool show )
+{
+    wxASSERT_MSG( (m_widget != NULL), "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.
+	
+        GtkOnSize( m_x, m_y, m_width, m_height );
+    }
+	
+    return wxWindow::Show( show );
+}
 
-  PostCreation();
+void wxFrame::OnCloseWindow( wxCloseEvent &event )
+{
+    if (GetEventHandler()->OnClose() || event.GetForce()) this->Destroy();
+}
 
-  gtk_widget_realize( m_mainWindow );
+bool wxFrame::Destroy()
+{
+    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
+    if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
 
-  return TRUE;
-};
+    return TRUE;
+}
 
-wxFrame::~wxFrame(void)
+wxPoint wxFrame::GetClientAreaOrigin() const
 {
-  if (m_frameMenuBar) delete m_frameMenuBar;
-  if (m_frameStatusBar) delete m_frameStatusBar;
+    wxPoint pt(0, 0);
+    if (m_frameMenuBar)
+    {
+        int h = 0;
+        m_frameMenuBar->GetSize( (int*)NULL, &h );
+        pt.y += h + 2;
+    }
+    if (m_frameToolBar)
+    {
+        int h = 0;
+        m_frameToolBar->GetSize( (int*)NULL, &h );
+        pt.y += h;
+    }
+    return pt;
+}
 
-//  if (m_mainWindow) gtk_widget_destroy( m_mainWindow );
+void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
+{
+    wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+  
+    // Don't do anything for children of wxMDIChildFrame
+    if (!m_wxwindow) return;
+
+    if (m_resizing) return; // I don't like recursions
+    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 (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;
+    }
 
-  wxTopLevelWindows.DeleteObject( this );
-  if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
-};
+    if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
+    {
+        if (width == -1) m_width = 80;
+    }
 
-bool wxFrame::Show( bool show )
-{
-  if (show)
-  {
+    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_minWidth;
+    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) 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 );
+    }
+  
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-    m_sizeSet = FALSE;
-    ProcessEvent( event );
-  };
-  return wxWindow::Show( show );
-};
+    event.SetEventObject( this );
+    GetEventHandler()->ProcessEvent( event );
 
-void wxFrame::Enable( bool enable )
+    m_resizing = FALSE;
+}
+
+void wxFrame::SetSize( int width, int height )
 {
-  wxWindow::Enable( enable );
-  gtk_widget_set_sensitive( m_mainWindow, enable );
-};
+    SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
+}
 
-void wxFrame::OnCloseWindow( wxCloseEvent& WXUNUSED(event) )
+void wxFrame::Centre( int direction )
 {
-  this->Destroy();
-};
+    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 );
+}
 
-bool wxFrame::Destroy(void)
+void wxFrame::GetClientSize( int *width, int *height ) const
 {
-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
+    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
+    wxWindow::GetClientSize( width, height );
+    if (height)
+    {
+        if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT;
+        if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
+        if (m_frameToolBar)
+        {
+            int y = 0;
+            m_frameToolBar->GetSize( (int *) NULL, &y );
+            (*height) -= y;
+        }
+    }
+}
 
-  return TRUE;
+void wxFrame::SetClientSize( int const width, int const 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::SetClientSize( width, h );
 }
 
-void wxFrame::GetClientSize( int *width, int *height ) const
+void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
 {
-  wxWindow::GetClientSize( width, height );
-  if (height)
-  {
-    if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT;
-    if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
-  };
-};
-
-void wxFrame::GtkOnSize( int x, int y, int width, int height )
+    // due to a bug in gtk, x,y are always 0
+    // m_x = x;
+    // m_y = y;
+
+    if (m_resizing) return;
+    m_resizing = TRUE;
+    
+    if (!m_wxwindow) return;
+  
+    m_width = width;
+    m_height = height;
+  
+    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_minWidth;
+    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
+
+    gtk_widget_set_usize( m_widget, m_width, m_height );
+    
+    // This emulates the new wxMSW behaviour
+    
+    if (m_frameMenuBar)
+    {
+        m_frameMenuBar->m_x = 1;  
+        m_frameMenuBar->m_y = 1;
+        m_frameMenuBar->m_width = m_width-2;
+        m_frameMenuBar->m_height = wxMENU_HEIGHT-2;
+        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameMenuBar->m_widget, 1, 1 );
+        gtk_widget_set_usize( m_frameMenuBar->m_widget, m_width-2, wxMENU_HEIGHT-2 );
+    }
+
+    if (m_frameToolBar)
+    {
+        int y = 0;
+        if (m_frameMenuBar) y = wxMENU_HEIGHT;
+        int h = m_frameToolBar->m_height;
+    
+        m_frameToolBar->m_x = 2;  
+        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameToolBar->m_widget, 2, y );
+        gtk_widget_set_usize( m_frameToolBar->m_widget, m_width-3, h );
+    }
+  
+    if (m_frameStatusBar)
+    {
+        // 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.
+        m_frameStatusBar->m_x = 0;  
+        m_frameStatusBar->m_y = m_height-wxSTATUS_HEIGHT;
+        m_frameStatusBar->m_width = m_width;
+        m_frameStatusBar->m_height = wxSTATUS_HEIGHT;
+        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, 0, m_height-wxSTATUS_HEIGHT );
+        gtk_widget_set_usize( m_frameStatusBar->m_widget, m_width, wxSTATUS_HEIGHT );
+    }
+    
+    m_sizeSet = TRUE;
+    
+    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
+    event.SetEventObject( this );
+    GetEventHandler()->ProcessEvent( event );
+    
+    m_resizing = FALSE;
+}
+
+void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event) )
 {
-  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;
-  };
-
-  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_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 );
-};
+    if (!m_sizeSet)
+        GtkOnSize( m_x, m_y, m_width, m_height );
+  
+    DoMenuUpdates();
+}
 
 void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
-  if ( GetAutoLayout() )
-    Layout();
-  else {
-    // do we have exactly one child?
-    wxWindow *child = NULL;
-    for(wxNode *node = GetChildren()->First(); node; node = node->Next())
+    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
+    if (GetAutoLayout())
     {
-      wxWindow *win = (wxWindow *)node->Data();
-      if (!win->IsKindOf(CLASSINFO(wxFrame)) &&
-          !win->IsKindOf(CLASSINFO(wxDialog))
-#if 0 // not in m_children anyway
-          && (win != m_frameMenuBar) &&
-             (win != m_frameStatusBar)
+        Layout();
+    }
+    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 (!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)
 #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 SetInvokingWindow( wxMenu *menu, wxWindow *win )
+            )
+            {
+	        // 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 );
+    }
+}
+
+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->m_isSubMenu) SetInvokingWindow( menuitem->m_subMenu, win );
-    node = node->Next();
-  };
-};
+    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();
+    }
+}
 
 void wxFrame::SetMenuBar( wxMenuBar *menuBar )
 {
-  m_frameMenuBar = menuBar;
-
-  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 );
-};
-
-bool wxFrame::CreateStatusBar( int number )
+    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+    wxASSERT_MSG( (m_wxwindow != NULL), "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();
+        }
+    
+        if (m_frameMenuBar->m_parent != this)
+        {
+            m_frameMenuBar->m_parent = this;
+            gtk_myfixed_put( GTK_MYFIXED(m_wxwindow),
+                m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
+        }
+    }
+    
+    if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
+}
+
+wxMenuBar *wxFrame::GetMenuBar(void) const
+{
+    return m_frameMenuBar;
+}
+
+wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
-  if (m_frameStatusBar)
-  delete m_frameStatusBar;
+    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
+    wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" );
+
+    m_frameToolBar = OnCreateToolBar( style, id, name );
+  
+    GetChildren()->DeleteObject( m_frameToolBar );
+    
+    if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
+  
+    return m_frameToolBar;
+}
 
-  m_frameStatusBar = new wxStatusBar( this, -1, wxPoint(0,0), wxSize(100,20) );
+wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString& name )
+{
+    return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name );
+}
 
-  m_frameStatusBar->SetFieldsCount( number );
-  return TRUE;
-};
+wxToolBar *wxFrame::GetToolBar(void) const 
+{ 
+    return m_frameToolBar; 
+}
 
-void wxFrame::SetStatusText( const wxString &text, int number )
+wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
 {
-  if (m_frameStatusBar) m_frameStatusBar->SetStatusText( text, number );
-};
+    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
+    wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" );
+
+    m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
+  
+    if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
+  
+    return m_frameStatusBar;
+}
 
-void wxFrame::SetStatusWidths( int n, int *width )
+wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
 {
-  if (m_frameStatusBar) m_frameStatusBar->SetStatusWidths( n, width );
-};
+    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() );
+
+    long x, y;
+    dc.GetTextExtent( "X", &x, &y );
+
+    int height = (int)( (y  * 1.1) + 2* statusBar->GetBorderY());
+
+    statusBar->SetSize( -1, -1, 100, height );
 
-wxStatusBar *wxFrame::GetStatusBar(void)
+    statusBar->SetFieldsCount( number );
+    return statusBar;
+}
+
+void wxFrame::SetStatusText(const wxString& text, int number)
 {
-  return m_frameStatusBar;
-};
+    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
+    wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
+
+    m_frameStatusBar->SetStatusText(text, number);
+}
 
-wxMenuBar *wxFrame::GetMenuBar(void)
+void wxFrame::SetStatusWidths(int n, const int widths_field[] )
 {
-  return m_frameMenuBar;
-};
+    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  
+    wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
 
-void wxFrame::SetTitle( const wxString &title )
+    m_frameStatusBar->SetStatusWidths(n, widths_field);
+}
+
+wxStatusBar *wxFrame::GetStatusBar(void) const
 {
-  m_title = title;
-  gtk_window_set_title( GTK_WINDOW(m_widget), title );
-};
+    return m_frameStatusBar;
+}
 
-wxString wxFrame::GetTitle(void) const
+void wxFrame::SetTitle( const wxString &title )
 {
-  return (wxString&)m_title;
-};
+    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 );
+}
 
+void wxFrame::SetIcon( const wxIcon &icon )
+{
+    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 );
+}