[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 63ef3e2728c2330467f498c88b86d5eb13e2200b..2e602ab9dc4d440f075b9a28864a2e657d274f82 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -15,12 +15,16 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "frame.h"
 #endif
 
     #pragma implementation "frame.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/defs.h"
 
 #include "wx/defs.h"
 

+#include "wx/frame.h"

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


@@ -34,8 +38,8 @@
 #include "wx/dcclient.h"
 
 #include <glib.h>
 #include "wx/dcclient.h"
 
 #include <glib.h>

-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
+

 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 


@@ -45,7 +49,6 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-const int wxMENU_HEIGHT    = 27;

 const int wxSTATUS_HEIGHT  = 25;
 const int wxPLACE_HOLDER   = 0;
 
 const int wxSTATUS_HEIGHT  = 25;
 const int wxPLACE_HOLDER   = 0;
 


@@ -55,7 +58,6 @@ const int wxPLACE_HOLDER   = 0;
 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;

-extern int g_openDialogs;

 
 // ----------------------------------------------------------------------------
 // event tables
 
 // ----------------------------------------------------------------------------
 // event tables


@@ -77,25 +79,35 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 // "child_attached" of menu bar
 //-----------------------------------------------------------------------------
 
 // "child_attached" of menu bar
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
     if (!win->m_hasVMT) return;
 
 static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
     if (!win->m_hasVMT) return;
 

-    win->m_menuBarDetached = FALSE;
+    win->m_menuBarDetached = false;

     win->GtkUpdateSize();
 }
     win->GtkUpdateSize();
 }

+}

 
 //-----------------------------------------------------------------------------
 // "child_detached" of menu bar
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "child_detached" of menu bar
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
 static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {

+    if (g_isIdle)
+        wxapp_install_idle_handler();
+

     if (!win->m_hasVMT) return;
 
     if (!win->m_hasVMT) return;
 

-    win->m_menuBarDetached = TRUE;
+    // Raise the client area area
+    gdk_window_raise( win->m_wxwindow->window );
+
+    win->m_menuBarDetached = true;

     win->GtkUpdateSize();
 }
     win->GtkUpdateSize();
 }

+}

 
 #endif // wxUSE_MENUS_NATIVE
 
 
 #endif // wxUSE_MENUS_NATIVE
 


@@ -104,19 +116,21 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
 // "child_attached" of tool bar
 //-----------------------------------------------------------------------------
 
 // "child_attached" of tool bar
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
     if (!win->m_hasVMT) return;
 
 static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
     if (!win->m_hasVMT) return;
 

-    win->m_toolBarDetached = FALSE;
-
+    win->m_toolBarDetached = false;

     win->GtkUpdateSize();
 }
     win->GtkUpdateSize();
 }

+}

 
 //-----------------------------------------------------------------------------
 // "child_detached" of tool bar
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "child_detached" of tool bar
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
     if (g_isIdle)
 static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
     if (g_isIdle)


@@ -124,9 +138,13 @@ static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
 
     if (!win->m_hasVMT) return;
 
 
     if (!win->m_hasVMT) return;
 

-    win->m_toolBarDetached = TRUE;
+    // Raise the client area area
+    gdk_window_raise( win->m_wxwindow->window );
+
+    win->m_toolBarDetached = true;

     win->GtkUpdateSize();
 }
     win->GtkUpdateSize();
 }

+}

 #endif // wxUSE_TOOLBAR
 
 
 #endif // wxUSE_TOOLBAR
 
 


@@ -140,7 +158,7 @@ static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
 
 /* 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
 
 /* 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
+ * virtual function here as wxWidgets requires different ways to insert

  * a child in container classes. */
 
 static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
  * a child in container classes. */
 
 static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )


@@ -149,7 +167,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
 
     if (!parent->m_insertInClientArea)
     {
 
     if (!parent->m_insertInClientArea)
     {

-        /* these are outside the client area */
+        // These are outside the client area

         wxFrame* frame = (wxFrame*) parent;
         gtk_pizza_put( GTK_PIZZA(frame->m_mainWidget),
                          GTK_WIDGET(child->m_widget),
         wxFrame* frame = (wxFrame*) parent;
         gtk_pizza_put( GTK_PIZZA(frame->m_mainWidget),
                          GTK_WIDGET(child->m_widget),


@@ -159,8 +177,8 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
                          child->m_height );
 
 #if wxUSE_TOOLBAR_NATIVE
                          child->m_height );
 
 #if wxUSE_TOOLBAR_NATIVE

-        /* we connect to these events for recalculating the client area
-           space when the toolbar is floating */
+        // 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 (wxIS_KIND_OF(child,wxToolBar))
         {
             wxToolBar *toolBar = (wxToolBar*) child;


@@ -177,7 +195,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
     }
     else
     {
     }
     else
     {

-        /* these are inside the client area */
+        // These are inside the client area

         gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
                          GTK_WIDGET(child->m_widget),
                          child->m_x,
         gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
                          GTK_WIDGET(child->m_widget),
                          child->m_x,


@@ -186,7 +204,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
                          child->m_height );
     }
 
                          child->m_height );
     }
 

-    /* resize on OnInternalIdle */
+    // Resize on OnInternalIdle

     parent->GtkUpdateSize();
 }
 
     parent->GtkUpdateSize();
 }
 


@@ -196,8 +214,9 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
 
 void wxFrame::Init()
 {
 
 void wxFrame::Init()
 {

-    m_menuBarDetached = FALSE;
-    m_toolBarDetached = FALSE;
+    m_menuBarDetached = false;
+    m_toolBarDetached = false;
+    m_menuBarHeight = 2;

 }
 
 bool wxFrame::Create( wxWindow *parent,
 }
 
 bool wxFrame::Create( wxWindow *parent,


@@ -208,15 +227,16 @@ bool wxFrame::Create( wxWindow *parent,
                       long style,
                       const wxString &name )
 {
                       long style,
                       const wxString &name )
 {

-    bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig, 
+    bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig,

                                        style, name);
     m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;
                                        style, name);
     m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;

+

     return rt;
 }
 
 wxFrame::~wxFrame()
 {
     return rt;
 }
 
 wxFrame::~wxFrame()
 {

-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;

     DeleteAllBars();
 }
 
     DeleteAllBars();
 }
 


@@ -227,30 +247,30 @@ wxFrame::~wxFrame()
 void wxFrame::DoGetClientSize( int *width, int *height ) const
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 void wxFrame::DoGetClientSize( int *width, int *height ) const
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

-    
+

     wxTopLevelWindow::DoGetClientSize( width, height );
 
     if (height)
     {
 #if wxUSE_MENUS_NATIVE
     wxTopLevelWindow::DoGetClientSize( width, height );
 
     if (height)
     {
 #if wxUSE_MENUS_NATIVE

-        /* menu bar */
+        // menu bar

         if (m_frameMenuBar)
         {
             if (!m_menuBarDetached)
         if (m_frameMenuBar)
         {
             if (!m_menuBarDetached)

-                (*height) -= wxMENU_HEIGHT;
+                (*height) -= m_menuBarHeight;

             else
                 (*height) -= wxPLACE_HOLDER;
         }
 #endif // wxUSE_MENUS_NATIVE
 
 #if wxUSE_STATUSBAR
             else
                 (*height) -= wxPLACE_HOLDER;
         }
 #endif // wxUSE_MENUS_NATIVE
 
 #if wxUSE_STATUSBAR

-        /* status bar */
-        if (m_frameStatusBar && m_frameStatusBar->IsShown()) 
+        // status bar
+        if (m_frameStatusBar && m_frameStatusBar->IsShown())

             (*height) -= wxSTATUS_HEIGHT;
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR
             (*height) -= wxSTATUS_HEIGHT;
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR

-        /* tool bar */
+        // tool bar

         if (m_frameToolBar && m_frameToolBar->IsShown())
         {
             if (m_toolBarDetached)
         if (m_frameToolBar && m_frameToolBar->IsShown())
         {
             if (m_toolBarDetached)


@@ -280,23 +300,23 @@ void wxFrame::DoSetClientSize( int width, int height )
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
 #if wxUSE_MENUS_NATIVE
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
 #if wxUSE_MENUS_NATIVE

-        /* menu bar */
+        // menu bar

         if (m_frameMenuBar)
         {
             if (!m_menuBarDetached)
         if (m_frameMenuBar)
         {
             if (!m_menuBarDetached)

-                height += wxMENU_HEIGHT;
+                height += m_menuBarHeight;

             else
                 height += wxPLACE_HOLDER;
         }
 #endif // wxUSE_MENUS_NATIVE
 
 #if wxUSE_STATUSBAR
             else
                 height += wxPLACE_HOLDER;
         }
 #endif // wxUSE_MENUS_NATIVE
 
 #if wxUSE_STATUSBAR

-        /* status bar */
+        // status bar

         if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT;
 #endif
 
 #if wxUSE_TOOLBAR
         if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT;
 #endif
 
 #if wxUSE_TOOLBAR

-        /* tool bar */
+        // tool bar

         if (m_frameToolBar && m_frameToolBar->IsShown())
         {
             if (m_toolBarDetached)
         if (m_frameToolBar && m_frameToolBar->IsShown())
         {
             if (m_toolBarDetached)


@@ -329,17 +349,17 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
     // m_x = x;
     // m_y = y;
 
     // m_x = x;
     // m_y = y;
 

-    /* avoid recursions */
+    // avoid recursions

     if (m_resizing) return;
     if (m_resizing) return;

-    m_resizing = TRUE;
+    m_resizing = true;

 
 

-    /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
+    // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow

     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 
     m_width = width;
     m_height = height;
 
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 
     m_width = width;
     m_height = height;
 

-    /* space occupied by m_frameToolBar and m_frameMenuBar */
+    // space occupied by m_frameToolBar and m_frameMenuBar

     int client_area_x_offset = 0,
         client_area_y_offset = 0;
 
     int client_area_x_offset = 0,
         client_area_y_offset = 0;
 


@@ -362,7 +382,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
 
     if (m_mainWidget)
     {
 
     if (m_mainWidget)
     {

-        /* set size hints */
+        // set size hints

         gint flag = 0; // GDK_HINT_POS;
         if ((minWidth != -1) || (minHeight != -1)) flag |= GDK_HINT_MIN_SIZE;
         if ((maxWidth != -1) || (maxHeight != -1)) flag |= GDK_HINT_MAX_SIZE;
         gint flag = 0; // GDK_HINT_POS;
         if ((minWidth != -1) || (minHeight != -1)) flag |= GDK_HINT_MIN_SIZE;
         if ((maxWidth != -1) || (maxHeight != -1)) flag |= GDK_HINT_MAX_SIZE;


@@ -376,11 +396,11 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
                                        &geom,
                                        (GdkWindowHints) flag );
 
                                        &geom,
                                        (GdkWindowHints) flag );
 

-        /* 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. */
+        // 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 wxUSE_MENUS_NATIVE
         if (m_frameMenuBar)
 
 #if wxUSE_MENUS_NATIVE
         if (m_frameMenuBar)


@@ -388,7 +408,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
             int ww = m_width  - 2*m_miniEdge;
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
             int ww = m_width  - 2*m_miniEdge;

-            int hh = wxMENU_HEIGHT;
+            int hh = m_menuBarHeight;

             if (m_menuBarDetached) hh = wxPLACE_HOLDER;
             m_frameMenuBar->m_x = xx;
             m_frameMenuBar->m_y = yy;
             if (m_menuBarDetached) hh = wxPLACE_HOLDER;
             m_frameMenuBar->m_x = xx;
             m_frameMenuBar->m_y = yy;


@@ -411,7 +431,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
             if (m_frameMenuBar)
             {
                 if (!m_menuBarDetached)
             if (m_frameMenuBar)
             {
                 if (!m_menuBarDetached)

-                    yy += wxMENU_HEIGHT;
+                    yy += m_menuBarHeight;

                 else
                     yy += wxPLACE_HOLDER;
             }
                 else
                     yy += wxPLACE_HOLDER;
             }


@@ -420,7 +440,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
             m_frameToolBar->m_x = xx;
             m_frameToolBar->m_y = yy;
 
             m_frameToolBar->m_x = xx;
             m_frameToolBar->m_y = yy;
 

-            /* don't change the toolbar's reported height/width */
+            // don't change the toolbar's reported height/width

             int ww, hh;
             if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
             {
             int ww, hh;
             if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
             {


@@ -455,8 +475,8 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
     }
     else
     {
     }
     else
     {

-        /* if there is no m_mainWidget between m_widget and m_wxwindow there
-           is no need to set the size or position of m_wxwindow. */
+        // If 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 wxUSE_STATUSBAR


@@ -477,7 +497,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
     }
 #endif // wxUSE_STATUSBAR
 
     }
 #endif // wxUSE_STATUSBAR
 

-    m_sizeSet = TRUE;
+    m_sizeSet = true;

 
     // send size event to frame
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
 
     // send size event to frame
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );


@@ -494,12 +514,12 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
     }
 #endif // wxUSE_STATUSBAR
 
     }
 #endif // wxUSE_STATUSBAR
 

-    m_resizing = FALSE;
+    m_resizing = false;

 }
 
 void wxFrame::OnInternalIdle()
 {
 }
 
 void wxFrame::OnInternalIdle()
 {

-    wxTopLevelWindow::OnInternalIdle();
+    wxFrameBase::OnInternalIdle();

 
 #if wxUSE_MENUS_NATIVE
     if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();
 
 #if wxUSE_MENUS_NATIVE
     if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();


@@ -508,7 +528,20 @@ void wxFrame::OnInternalIdle()
     if (m_frameToolBar) m_frameToolBar->OnInternalIdle();
 #endif
 #if wxUSE_STATUSBAR
     if (m_frameToolBar) m_frameToolBar->OnInternalIdle();
 #endif
 #if wxUSE_STATUSBAR

-    if (m_frameStatusBar) m_frameStatusBar->OnInternalIdle();
+    if (m_frameStatusBar)
+    {
+        m_frameStatusBar->OnInternalIdle();
+
+        // There may be controls in the status bar that
+        // need to be updated
+        for ( wxWindowList::compatibility_iterator node = m_frameStatusBar->GetChildren().GetFirst();
+          node;
+          node = node->GetNext() )
+        {
+            wxWindow *child = node->GetData();
+            child->OnInternalIdle();
+        }
+    }

 #endif
 }
 
 #endif
 }
 


@@ -569,11 +602,34 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
                 GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
         }
 
                 GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
         }
 

-        m_frameMenuBar->Show( TRUE );
+        gtk_widget_show( m_frameMenuBar->m_widget );
+
+        UpdateMenuBarSize();

     }
     }

+    else
+    {
+        m_menuBarHeight = 2;
+        GtkUpdateSize();        // resize window in OnInternalIdle
+    }
+}
+
+void wxFrame::UpdateMenuBarSize()
+{
+    GtkRequisition  req;
+
+    req.width = 2;
+    req.height = 2;

 
 

-    // resize window in OnInternalIdle
-    m_sizeSet = FALSE;
+    // this is called after Remove with a NULL m_frameMenuBar
+    if ( m_frameMenuBar )
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_frameMenuBar->m_widget) )->size_request )
+        (m_frameMenuBar->m_widget, &req );
+
+    m_menuBarHeight = req.height;
+
+        // resize window in OnInternalIdle
+
+    GtkUpdateSize();

 }
 
 #endif // wxUSE_MENUS_NATIVE
 }
 
 #endif // wxUSE_MENUS_NATIVE


@@ -584,22 +640,24 @@ wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& na
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 

-    m_insertInClientArea = FALSE;
+    m_insertInClientArea = false;

 
     m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name );
 
 
     m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name );
 

-    m_insertInClientArea = TRUE;
+    m_insertInClientArea = true;

 
 

-    m_sizeSet = FALSE;
+    GtkUpdateSize();

 
     return m_frameToolBar;
 }
 
 void wxFrame::SetToolBar(wxToolBar *toolbar)
 {
 
     return m_frameToolBar;
 }
 
 void wxFrame::SetToolBar(wxToolBar *toolbar)
 {

+    bool hadTbar = m_frameToolBar != NULL;
+

     wxFrameBase::SetToolBar(toolbar);
 
     wxFrameBase::SetToolBar(toolbar);
 

-    if (m_frameToolBar)
+    if ( m_frameToolBar )

     {
         // insert into toolbar area if not already there
         if ((m_frameToolBar->m_widget->parent) &&
     {
         // insert into toolbar area if not already there
         if ((m_frameToolBar->m_widget->parent) &&


@@ -611,6 +669,14 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
             GtkUpdateSize();
         }
     }
             GtkUpdateSize();
         }
     }

+    else // toolbar unset
+    {
+        // still need to update size if it had been there before
+        if ( hadTbar )
+        {
+            GtkUpdateSize();
+        }
+    }

 }
 
 #endif // wxUSE_TOOLBAR
 }
 
 #endif // wxUSE_TOOLBAR


@@ -625,17 +691,27 @@ wxStatusBar* wxFrame::CreateStatusBar(int number,
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
     // because it will change when toolbar is added
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
     // because it will change when toolbar is added

-    m_sizeSet = FALSE;
+    GtkUpdateSize();

 
     return wxFrameBase::CreateStatusBar( number, style, id, name );
 }
 
 
     return wxFrameBase::CreateStatusBar( number, style, id, name );
 }
 

+void wxFrame::SetStatusBar(wxStatusBar *statbar)
+{
+    bool hadStatBar = m_frameStatusBar != NULL;
+
+    wxFrameBase::SetStatusBar(statbar);
+
+    if (hadStatBar && !m_frameStatusBar)
+        GtkUpdateSize();
+}
+

 void wxFrame::PositionStatusBar()
 {
     if ( !m_frameStatusBar )
         return;
 
 void wxFrame::PositionStatusBar()
 {
     if ( !m_frameStatusBar )
         return;
 

-    m_sizeSet = FALSE;
+    GtkUpdateSize();

 }
 #endif // wxUSE_STATUSBAR
 
 }
 #endif // wxUSE_STATUSBAR