Bit fiddling.

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

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 2d3be72e102a5367fe73472ea012abd9845f4988..118c1cb4010a9fff5b33099b6d144725d3b6213c 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -2,9 +2,8 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -19,24 +18,28 @@
 #include "wx/menu.h"
 #include "wx/toolbar.h"
 #include "wx/statusbr.h"
 #include "wx/menu.h"
 #include "wx/toolbar.h"
 #include "wx/statusbr.h"

-#include "wx/mdi.h"

 #include "wx/dcclient.h"
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/dcclient.h"
 #include "wx/gtk/win_gtk.h"
 

-const int wxMENU_HEIGHT    = 28;
+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
+
+const int wxMENU_HEIGHT    = 30;

 const int wxSTATUS_HEIGHT  = 25;
 
 const int wxSTATUS_HEIGHT  = 25;
 

+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+

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

-// wxFrame
+// "size_allocate"

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

-//-----------------------------------------------------------------------------
-// set 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;
 


@@ -51,9 +54,10 @@ void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc,
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// 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 " );
 {
 /*
   printf( "OnDelete from " );


@@ -68,9 +72,10 @@ bool gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// configure
+// "configure_event"
+//-----------------------------------------------------------------------------

 
 

-gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
+static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )

 {
   if (!win->HasVMT()) return FALSE;
   
 {
   if (!win->HasVMT()) return FALSE;
   


@@ -80,6 +85,8 @@ gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigur
   return FALSE;
 }
 
   return FALSE;
 }
 

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

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


@@ -96,9 +103,6 @@ wxFrame::wxFrame()
   m_frameStatusBar = (wxStatusBar *) NULL;
   m_frameToolBar = (wxToolBar *) NULL;
   m_sizeSet = FALSE;
   m_frameStatusBar = (wxStatusBar *) NULL;
   m_frameToolBar = (wxToolBar *) NULL;
   m_sizeSet = FALSE;

-  m_addPrivateChild = FALSE;
-  m_wxwindow = (GtkWidget *) NULL;
-  m_mainWindow = (GtkWidget *) NULL;

   wxTopLevelWindows.Insert( this );
 }
 
   wxTopLevelWindows.Insert( this );
 }
 


@@ -110,9 +114,6 @@ wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
   m_frameStatusBar = (wxStatusBar *) NULL;
   m_frameToolBar = (wxToolBar *) NULL;
   m_sizeSet = FALSE;
   m_frameStatusBar = (wxStatusBar *) NULL;
   m_frameToolBar = (wxToolBar *) NULL;
   m_sizeSet = FALSE;

-  m_addPrivateChild = FALSE;
-  m_wxwindow = (GtkWidget *) NULL;
-  m_mainWindow = (GtkWidget *) NULL;

   Create( parent, id, title, pos, size, style, name );
   wxTopLevelWindows.Insert( this );
 }
   Create( parent, id, title, pos, size, style, name );
   wxTopLevelWindows.Insert( this );
 }


@@ -127,7 +128,10 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 
   m_title = title;
 
 
   m_title = title;
 

-  m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+  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))
   if ((size.x != -1) && (size.y != -1))
     gtk_widget_set_usize( m_widget, m_width, m_height );
   if ((pos.x != -1) && (pos.y != -1))


@@ -136,23 +140,16 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
   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_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_mainWindow );
-  gtk_widget_set_uposition( m_mainWindow, 0, 0 );
-

   m_wxwindow = gtk_myfixed_new();
   gtk_widget_show( m_wxwindow );
   GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
 
   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_mainWindow), m_wxwindow );
+  gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );

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


@@ -160,10 +157,10 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
   gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
     GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this );
     
   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();
 
   PostCreation();
 

-  gtk_widget_realize( m_mainWindow );
-

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -173,14 +170,14 @@ wxFrame::~wxFrame()
   if (m_frameStatusBar) delete m_frameStatusBar;
   if (m_frameToolBar) delete m_frameToolBar;
 
   if (m_frameStatusBar) delete m_frameStatusBar;
   if (m_frameToolBar) delete m_frameToolBar;
 

-//  if (m_mainWindow) gtk_widget_destroy( m_mainWindow );
-

   wxTopLevelWindows.DeleteObject( this );
   if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
 }
 
 bool wxFrame::Show( bool show )
 {
   wxTopLevelWindows.DeleteObject( this );
   if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
 }
 
 bool wxFrame::Show( bool show )
 {

+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  

   if (show)
   {
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
   if (show)
   {
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );


@@ -190,28 +187,39 @@ bool wxFrame::Show( bool show )
   return wxWindow::Show( show );
 }
 
   return wxWindow::Show( show );
 }
 

-void wxFrame::Enable( bool enable )
-{
-  wxWindow::Enable( enable );
-  gtk_widget_set_sensitive( m_mainWindow, enable );
-}
-

 void wxFrame::OnCloseWindow( wxCloseEvent &event )
 {
 void wxFrame::OnCloseWindow( wxCloseEvent &event )
 {

-    if ( GetEventHandler()->OnClose() || event.GetForce())
-    {
-        this->Destroy();
-    }
+  if (GetEventHandler()->OnClose() || event.GetForce()) this->Destroy();

 }
 
 bool wxFrame::Destroy()
 {
 }
 
 bool wxFrame::Destroy()
 {

+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  

   if (!wxPendingDelete.Member(this))
     wxPendingDelete.Append(this);
 
   return TRUE;
 }
 
   if (!wxPendingDelete.Member(this))
     wxPendingDelete.Append(this);
 
   return TRUE;
 }
 

+wxPoint wxFrame::GetClientAreaOrigin() const
+{
+  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;
+}
+

 void wxFrame::ImplementSetPosition(void)
 {
   if ((m_x != -1) || (m_y != -1))
 void wxFrame::ImplementSetPosition(void)
 {
   if ((m_x != -1) || (m_y != -1))


@@ -220,13 +228,18 @@ void wxFrame::ImplementSetPosition(void)
 
 void wxFrame::Centre( int direction )
 {
 
 void wxFrame::Centre( int direction )
 {

+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  

   if (direction & wxHORIZONTAL == wxHORIZONTAL) m_x = (gdk_screen_width () - m_width) / 2;
   if (direction & wxVERTICAL == wxVERTICAL) m_y = (gdk_screen_height () - m_height) / 2;
   if (direction & wxHORIZONTAL == wxHORIZONTAL) m_x = (gdk_screen_width () - m_width) / 2;
   if (direction & wxVERTICAL == wxVERTICAL) m_y = (gdk_screen_height () - m_height) / 2;

+  

   ImplementSetPosition();
 }
 
 void wxFrame::GetClientSize( int *width, int *height ) const
 {
   ImplementSetPosition();
 }
 
 void wxFrame::GetClientSize( int *width, int *height ) const
 {

+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  

   wxWindow::GetClientSize( width, height );
   if (height)
   {
   wxWindow::GetClientSize( width, height );
   if (height)
   {


@@ -243,6 +256,8 @@ void wxFrame::GetClientSize( int *width, int *height ) const
 
 void wxFrame::SetClientSize( int const width, int const height )
 {
 
 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;
   int h = height;
   if (m_frameMenuBar) h += wxMENU_HEIGHT;
   if (m_frameStatusBar) h += wxSTATUS_HEIGHT;


@@ -263,62 +278,50 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
 
   if ((m_height == height) && (m_width == width) &&
       (m_sizeSet)) return;
 
   if ((m_height == height) && (m_width == width) &&
       (m_sizeSet)) return;

-  if (!m_mainWindow) return;

   if (!m_wxwindow) return;
 
   m_width = width;
   m_height = height;
   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;

 
 

-  // VZ: why??
-  //gtk_widget_set_usize( m_widget, width, height );
-
-  int main_x = 0;
-  int main_y = 0;
-  int main_height = height;
-  int main_width = width;
+  gtk_widget_set_usize( m_widget, m_width, m_height );

 
 

-  // 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( (int *) NULL, &toolbar_height );
-  
-  main_y += toolbar_height;
-  main_height -= toolbar_height;
-  
-  gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_wxwindow, main_x, main_y );
-  gtk_widget_set_usize( m_wxwindow, main_width, main_height );
+  // This emulates the new wxMSW behaviour

 
   if (m_frameMenuBar)
   {
 
   if (m_frameMenuBar)
   {

-    gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_frameMenuBar->m_widget, 1, 1 );
-    gtk_widget_set_usize( m_frameMenuBar->m_widget, width-2, wxMENU_HEIGHT-2 );
+    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)
   {
   }
 
   if (m_frameToolBar)
   {

-    gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_frameToolBar->m_widget, 1, wxMENU_HEIGHT );
-    gtk_widget_set_usize( m_frameToolBar->m_widget, width-2, toolbar_height );
+    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)
   {
   }
   
   if (m_frameStatusBar)
   {

-    m_frameStatusBar->SetSize( 0, main_height-wxSTATUS_HEIGHT, width, wxSTATUS_HEIGHT );
+    // 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;
   }
 
   m_sizeSet = TRUE;


@@ -330,6 +333,8 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
 
 void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
 
 void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 {

+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  

   if ( GetAutoLayout() )
     Layout();
   else {
   if ( GetAutoLayout() )
     Layout();
   else {


@@ -343,7 +348,7 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
     {
       wxWindow *win = (wxWindow *)node->Data();
       if (!IS_KIND_OF(win,wxFrame) && !IS_KIND_OF(win,wxDialog)
     {
       wxWindow *win = (wxWindow *)node->Data();
       if (!IS_KIND_OF(win,wxFrame) && !IS_KIND_OF(win,wxDialog)

-#if 0  // not in m_children anyway
+#if 0  // not in m_children anyway ?

           && (win != m_frameMenuBar) &&
              (win != m_frameToolBar) &&
              (win != m_frameStatusBar)
           && (win != m_frameMenuBar) &&
              (win != m_frameToolBar) &&
              (win != m_frameStatusBar)


@@ -364,39 +369,6 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
   }
 }
 
   }
 }
 

-void wxFrame::AddChild( wxWindow *child )
-{
-  // wxFrame and wxDialog as children aren't placed into the parents
-  
-  if (IS_KIND_OF(child,wxMDIChildFrame)) printf( "wxFrame::AddChild error.\n" );
-  
-  if ( IS_KIND_OF(child,wxFrame) || IS_KIND_OF(child,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 );
 static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
 {
   menu->SetInvokingWindow( win );


@@ -412,6 +384,9 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
 
 void wxFrame::SetMenuBar( wxMenuBar *menuBar )
 {
 
 void wxFrame::SetMenuBar( wxMenuBar *menuBar )
 {

+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" );
+  

   m_frameMenuBar = menuBar;
   
   if (m_frameMenuBar)
   m_frameMenuBar = menuBar;
   
   if (m_frameMenuBar)


@@ -427,7 +402,7 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
     if (m_frameMenuBar->m_parent != this)
     {
       m_frameMenuBar->m_parent = this;
     if (m_frameMenuBar->m_parent != this)
     {
       m_frameMenuBar->m_parent = this;

-      gtk_myfixed_put( GTK_MYFIXED(m_mainWindow),
+      gtk_myfixed_put( GTK_MYFIXED(m_wxwindow),

         m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
     }
   }
         m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
     }
   }


@@ -440,11 +415,13 @@ wxMenuBar *wxFrame::GetMenuBar(void) const
 
 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), "invalid frame" );
+  

   wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" );
 
   wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" );
 

-  m_addPrivateChild = TRUE;

   m_frameToolBar = OnCreateToolBar( style, id, name );
   m_frameToolBar = OnCreateToolBar( style, id, name );

-  m_addPrivateChild = FALSE;
+  
+  GetChildren()->DeleteObject( m_frameToolBar );

   
   return m_frameToolBar;
 }
   
   return m_frameToolBar;
 }


@@ -461,6 +438,8 @@ wxToolBar *wxFrame::GetToolBar(void) const
 
 wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
 {
 
 wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
 {

+  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 );
   wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" );
 
   m_frameStatusBar = OnCreateStatusBar( number, style, id, name );


@@ -491,6 +470,8 @@ wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id,
 
 void wxFrame::SetStatusText(const wxString& text, int number)
 {
 
 void wxFrame::SetStatusText(const wxString& text, int number)
 {

+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  

   wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
 
   m_frameStatusBar->SetStatusText(text, number);
   wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
 
   m_frameStatusBar->SetStatusText(text, number);


@@ -498,6 +479,8 @@ void wxFrame::SetStatusText(const wxString& text, int number)
 
 void wxFrame::SetStatusWidths(int n, const int widths_field[] )
 {
 
 void wxFrame::SetStatusWidths(int n, const int widths_field[] )
 {

+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  

   wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
 
   m_frameStatusBar->SetStatusWidths(n, widths_field);
   wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
 
   m_frameStatusBar->SetStatusWidths(n, widths_field);


@@ -510,28 +493,17 @@ wxStatusBar *wxFrame::GetStatusBar(void) const
 
 void wxFrame::SetTitle( const wxString &title )
 {
 
 void wxFrame::SetTitle( const wxString &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 );
 }
 
   m_title = title;
   if (m_title.IsNull()) m_title = "";
   gtk_window_set_title( GTK_WINDOW(m_widget), title );
 }
 

-void wxFrame::SetSizeHints(int minW, int minH,
-                           int WXUNUSED(maxW), int WXUNUSED(maxH),
-                           int WXUNUSED(incW), int WXUNUSED(incH) )
-{
-  // gdk_window_set_hints alone doesn't really prevent the user from shrinking
-  // the window to the size smaller than (minW, minH)
-  gtk_widget_set_usize( GTK_WIDGET(m_widget), minW, minH );
-
-  /*
-  gdk_window_set_hints( m_widget->window, -1, -1, 
-                             minW, minH, maxW, maxH,
-                        GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE );
-  */
-}
-

 void wxFrame::SetIcon( const wxIcon &icon )
 {
 void wxFrame::SetIcon( const wxIcon &icon )
 {

+  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+  

   m_icon = icon;
   if (!icon.Ok()) return;
   
   m_icon = icon;
   if (!icon.Ok()) return;
   


@@ -541,4 +513,3 @@ void wxFrame::SetIcon( const wxIcon &icon )
   
   gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
 }
   
   gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
 }

-