don't strip &s from tooltips (patch 1488318)

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index a2b97cc2e20488d85d7e0f540a9c8194fb24e03d..34e6b9de37542817c4f06d1d8e459f77e1c374e3 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        frame.cpp
+// Name:        src/gtk/frame.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,6 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 // ============================================================================
 // declarations
 // ============================================================================
@@ -15,23 +18,22 @@
 // headers
 // ----------------------------------------------------------------------------
 
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
+#include "wx/frame.h"
 
-#include "wx/defs.h"
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/dcclient.h"
+    #include "wx/menu.h"
+    #include "wx/dialog.h"
+    #include "wx/control.h"
+#endif // WX_PRECOMP
 
-#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 "wx/gtk/private.h"
@@ -48,13 +50,6 @@
 const int wxSTATUS_HEIGHT  = 25;
 const int wxPLACE_HOLDER   = 0;
 
-// ----------------------------------------------------------------------------
-// idle system
-// ----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------
@@ -490,7 +485,12 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
         gtk_pizza_set_size( GTK_PIZZA(m_wxwindow),
                             m_frameStatusBar->m_widget,
                             xx, yy, ww, hh );
-        gtk_widget_draw( m_frameStatusBar->m_widget, (GdkRectangle*) NULL );
+        if (GTK_WIDGET_DRAWABLE (m_frameStatusBar->m_widget))
+        {
+            gtk_widget_queue_draw (m_frameStatusBar->m_widget);
+            // FIXME: Do we really want to force an immediate redraw?
+            gdk_window_process_updates (m_frameStatusBar->m_widget->window, TRUE);
+        }
     }
 #endif // wxUSE_STATUSBAR