]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkstatusbar.c
stylecontext: Do invalidation on first resize container
[~andy/gtk] / gtk / gtkstatusbar.c
index 125efef98be0d548d2d76a8897b31b41bece4542..47350376ad2cbe885e0c107f983abb09f326339e 100644 (file)
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
  */
 
 #include "config.h"
+
+#include "gtkstatusbar.h"
+
+#include "gtkboxprivate.h"
 #include "gtkframe.h"
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
-#include "gtkstatusbar.h"
 #include "gtkwindow.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkbuildable.h"
-#include "gtkalias.h"
+#include "gtkorientable.h"
+#include "gtktypebuiltins.h"
+#include "a11y/gtkstatusbaraccessible.h"
 
+/**
+ * SECTION:gtkstatusbar
+ * @title: GtkStatusbar
+ * @short_description: Report messages of minor importance to the user
+ *
+ * A #GtkStatusbar is usually placed along the bottom of an application's
+ * main #GtkWindow. It may provide a regular commentary of the application's
+ * status (as is usually the case in a web browser, for example), or may be
+ * used to simply output a message when the status changes, (when an upload
+ * is complete in an FTP client, for example).
+ *
+ * Status bars in GTK+ maintain a stack of messages. The message at
+ * the top of the each bar's stack is the one that will currently be displayed.
+ *
+ * Any messages added to a statusbar's stack must specify a
+ * <emphasis>context id</emphasis> that is used to uniquely identify
+ * the source of a message. This context id can be generated by
+ * gtk_statusbar_get_context_id(), given a message and the statusbar that
+ * it will be added to. Note that messages are stored in a stack, and when
+ * choosing which message to display, the stack structure is adhered to,
+ * regardless of the context identifier of a message.
+ *
+ * One could say that a statusbar maintains one stack of messages for
+ * display purposes, but allows multiple message producers to maintain
+ * sub-stacks of the messages they produced (via context ids).
+ *
+ * Status bars are created using gtk_statusbar_new().
+ *
+ * Messages are added to the bar's stack with gtk_statusbar_push().
+ *
+ * The message at the top of the stack can be removed using
+ * gtk_statusbar_pop(). A message can be removed from anywhere in the
+ * stack if its message id was recorded at the time it was added. This
+ * is done using gtk_statusbar_remove().
+ */
 typedef struct _GtkStatusbarMsg GtkStatusbarMsg;
 
+struct _GtkStatusbarPrivate
+{
+  GtkWidget     *frame;
+  GtkWidget     *label;
+
+  GSList        *messages;
+  GSList        *keys;
+
+  guint          seq_context_id;
+  guint          seq_message_id;
+};
+
+
 struct _GtkStatusbarMsg
 {
   gchar *text;
@@ -52,110 +103,48 @@ enum
   SIGNAL_LAST
 };
 
-enum
-{
-  PROP_0,
-  PROP_HAS_RESIZE_GRIP
-};
-
 static void     gtk_statusbar_buildable_interface_init    (GtkBuildableIface *iface);
 static GObject *gtk_statusbar_buildable_get_internal_child (GtkBuildable *buildable,
                                                             GtkBuilder   *builder,
                                                             const gchar  *childname);
-static void     gtk_statusbar_destroy           (GtkObject         *object);
 static void     gtk_statusbar_update            (GtkStatusbar      *statusbar,
                                                 guint              context_id,
                                                 const gchar       *text);
-static void     gtk_statusbar_size_allocate     (GtkWidget         *widget,
-                                                GtkAllocation     *allocation);
 static void     gtk_statusbar_realize           (GtkWidget         *widget);
-static void     gtk_statusbar_unrealize         (GtkWidget         *widget);
-static void     gtk_statusbar_map               (GtkWidget         *widget);
-static void     gtk_statusbar_unmap             (GtkWidget         *widget);
-static gboolean gtk_statusbar_button_press      (GtkWidget         *widget,
-                                                GdkEventButton    *event);
-static gboolean gtk_statusbar_expose_event      (GtkWidget         *widget,
-                                                GdkEventExpose    *event);
-static void     gtk_statusbar_size_request      (GtkWidget         *widget,
-                                                GtkRequisition    *requisition);
+static void     gtk_statusbar_destroy           (GtkWidget         *widget);
 static void     gtk_statusbar_size_allocate     (GtkWidget         *widget,
-                                                GtkAllocation     *allocation);
-static void     gtk_statusbar_direction_changed (GtkWidget         *widget,
-                                                GtkTextDirection   prev_dir);
-static void     gtk_statusbar_state_changed     (GtkWidget        *widget,
-                                                 GtkStateType      previous_state);
-static void     gtk_statusbar_create_window     (GtkStatusbar      *statusbar);
-static void     gtk_statusbar_destroy_window    (GtkStatusbar      *statusbar);
-static void     gtk_statusbar_get_property      (GObject           *object,
-                                                guint              prop_id,
-                                                GValue            *value,
-                                                GParamSpec        *pspec);
-static void     gtk_statusbar_set_property      (GObject           *object,
-                                                guint              prop_id,
-                                                const GValue      *value,
-                                                GParamSpec        *pspec);
-static void     label_selectable_changed        (GtkWidget         *label,
-                                                 GParamSpec        *pspec,
-                                                gpointer           data);
+                                                 GtkAllocation     *allocation);
+static void     gtk_statusbar_hierarchy_changed (GtkWidget         *widget,
+                                                 GtkWidget         *previous_toplevel);
 
 
 static guint              statusbar_signals[SIGNAL_LAST] = { 0 };
 
-G_DEFINE_TYPE_WITH_CODE (GtkStatusbar, gtk_statusbar, GTK_TYPE_HBOX,
+G_DEFINE_TYPE_WITH_CODE (GtkStatusbar, gtk_statusbar, GTK_TYPE_BOX,
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
                                                 gtk_statusbar_buildable_interface_init));
 
 static void
 gtk_statusbar_class_init (GtkStatusbarClass *class)
 {
-  GObjectClass *gobject_class;
-  GtkObjectClass *object_class;
   GtkWidgetClass *widget_class;
 
-  gobject_class = (GObjectClass *) class;
-  object_class = (GtkObjectClass *) class;
   widget_class = (GtkWidgetClass *) class;
 
-  gobject_class->set_property = gtk_statusbar_set_property;
-  gobject_class->get_property = gtk_statusbar_get_property;
-
-  object_class->destroy = gtk_statusbar_destroy;
-
   widget_class->realize = gtk_statusbar_realize;
-  widget_class->unrealize = gtk_statusbar_unrealize;
-  widget_class->map = gtk_statusbar_map;
-  widget_class->unmap = gtk_statusbar_unmap;
-  widget_class->button_press_event = gtk_statusbar_button_press;
-  widget_class->expose_event = gtk_statusbar_expose_event;
-  widget_class->size_request = gtk_statusbar_size_request;
+  widget_class->destroy = gtk_statusbar_destroy;
   widget_class->size_allocate = gtk_statusbar_size_allocate;
-  widget_class->direction_changed = gtk_statusbar_direction_changed;
-  widget_class->state_changed = gtk_statusbar_state_changed;
-  
+  widget_class->hierarchy_changed = gtk_statusbar_hierarchy_changed;
+
   class->text_pushed = gtk_statusbar_update;
   class->text_popped = gtk_statusbar_update;
-  
+
   /**
-   * GtkStatusbar:has-resize-grip:
-   *
-   * Whether the statusbar has a grip for resizing the toplevel window.
-   *
-   * Since: 2.4
-   */
-  g_object_class_install_property (gobject_class,
-                                  PROP_HAS_RESIZE_GRIP,
-                                  g_param_spec_boolean ("has-resize-grip",
-                                                        P_("Has Resize Grip"),
-                                                        P_("Whether the statusbar has a grip for resizing the toplevel"),
-                                                        TRUE,
-                                                        GTK_PARAM_READWRITE));
-
-  /** 
    * GtkStatusbar::text-pushed:
-   * @statusbar: the object which received the signal.
-   * @context_id: the context id of the relevant message/statusbar.
-   * @text: the message that was pushed.
-   * 
+   * @statusbar: the object which received the signal
+   * @context_id: the context id of the relevant message/statusbar
+   * @text: the message that was pushed
+   *
    * Is emitted whenever a new message gets pushed onto a statusbar's stack.
    */
   statusbar_signals[SIGNAL_TEXT_PUSHED] =
@@ -171,9 +160,9 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
 
   /**
    * GtkStatusbar::text-popped:
-   * @statusbar: the object which received the signal.
-   * @context_id: the context id of the relevant message/statusbar.
-   * @text: the message that was just popped.
+   * @statusbar: the object which received the signal
+   * @context_id: the context id of the relevant message/statusbar
+   * @text: the message that was just popped
    *
    * Is emitted whenever a new message is popped off a statusbar's stack.
    */
@@ -195,48 +184,53 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
                                                               GTK_TYPE_SHADOW_TYPE,
                                                               GTK_SHADOW_IN,
                                                               GTK_PARAM_READABLE));
+
+   g_type_class_add_private (class, sizeof (GtkStatusbarPrivate));
+
+   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_STATUSBAR_ACCESSIBLE);
 }
 
 static void
 gtk_statusbar_init (GtkStatusbar *statusbar)
 {
-  GtkBox *box;
+  GtkStatusbarPrivate *priv;
+  GtkBox *box = GTK_BOX (statusbar);
   GtkWidget *message_area;
   GtkShadowType shadow_type;
-  
-  box = GTK_BOX (statusbar);
 
-  gtk_widget_set_redraw_on_allocate (GTK_WIDGET (box), TRUE);
+  statusbar->priv = G_TYPE_INSTANCE_GET_PRIVATE (statusbar,
+                                                 GTK_TYPE_STATUSBAR,
+                                                 GtkStatusbarPrivate);
+  priv = statusbar->priv;
 
-  box->spacing = 2;
-  box->homogeneous = FALSE;
+  gtk_widget_set_redraw_on_allocate (GTK_WIDGET (box), TRUE);
 
-  statusbar->has_resize_grip = TRUE;
+  gtk_box_set_spacing (box, 2);
+  gtk_box_set_homogeneous (box, FALSE);
 
   gtk_widget_style_get (GTK_WIDGET (statusbar), "shadow-type", &shadow_type, NULL);
-  
-  statusbar->frame = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME (statusbar->frame), shadow_type);
-  gtk_box_pack_start (box, statusbar->frame, TRUE, TRUE, 0);
-  gtk_widget_show (statusbar->frame);
 
-  message_area = gtk_hbox_new (FALSE, 4);
-  gtk_container_add (GTK_CONTAINER (statusbar->frame), message_area);
+  priv->frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (priv->frame), shadow_type);
+  gtk_box_pack_start (box, priv->frame, TRUE, TRUE, 0);
+  gtk_widget_show (priv->frame);
+
+  message_area = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+  gtk_container_add (GTK_CONTAINER (priv->frame), message_area);
   gtk_widget_show (message_area);
 
-  statusbar->label = gtk_label_new ("");
-  gtk_label_set_single_line_mode (GTK_LABEL (statusbar->label), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (statusbar->label), 0.0, 0.5);
-  g_signal_connect (statusbar->label, "notify::selectable",
-                   G_CALLBACK (label_selectable_changed), statusbar);
-  gtk_label_set_ellipsize (GTK_LABEL (statusbar->label), PANGO_ELLIPSIZE_END);
-  gtk_container_add (GTK_CONTAINER (message_area), statusbar->label);
-  gtk_widget_show (statusbar->label);
-
-  statusbar->seq_context_id = 1;
-  statusbar->seq_message_id = 1;
-  statusbar->messages = NULL;
-  statusbar->keys = NULL;
+  priv->label = gtk_label_new ("");
+  gtk_label_set_single_line_mode (GTK_LABEL (priv->label), TRUE);
+  gtk_widget_set_halign (priv->label, GTK_ALIGN_START);
+  gtk_widget_set_valign (priv->label, GTK_ALIGN_CENTER);
+  gtk_label_set_ellipsize (GTK_LABEL (priv->label), PANGO_ELLIPSIZE_END);
+  gtk_container_add (GTK_CONTAINER (message_area), priv->label);
+  gtk_widget_show (priv->label);
+
+  priv->seq_context_id = 1;
+  priv->seq_message_id = 1;
+  priv->messages = NULL;
+  priv->keys = NULL;
 }
 
 static GtkBuildableIface *parent_buildable_iface;
@@ -253,8 +247,11 @@ gtk_statusbar_buildable_get_internal_child (GtkBuildable *buildable,
                                             GtkBuilder   *builder,
                                             const gchar  *childname)
 {
+  GtkStatusbar *statusbar = GTK_STATUSBAR (buildable);
+  GtkStatusbarPrivate *priv = statusbar->priv;
+
     if (strcmp (childname, "message_area") == 0)
-      return G_OBJECT (gtk_bin_get_child (GTK_BIN (GTK_STATUSBAR (buildable)->frame)));
+      return G_OBJECT (gtk_bin_get_child (GTK_BIN (priv->frame)));
 
     return parent_buildable_iface->get_internal_child (buildable,
                                                        builder,
@@ -279,12 +276,16 @@ gtk_statusbar_update (GtkStatusbar *statusbar,
                      guint         context_id,
                      const gchar  *text)
 {
+  GtkStatusbarPrivate *priv;
+
   g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
 
+  priv = statusbar->priv;
+
   if (!text)
     text = "";
 
-  gtk_label_set_text (GTK_LABEL (statusbar->label), text);
+  gtk_label_set_text (GTK_LABEL (priv->label), text);
 }
 
 /**
@@ -303,21 +304,24 @@ guint
 gtk_statusbar_get_context_id (GtkStatusbar *statusbar,
                              const gchar  *context_description)
 {
+  GtkStatusbarPrivate *priv;
   gchar *string;
   guint id;
   
   g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), 0);
   g_return_val_if_fail (context_description != NULL, 0);
 
+  priv = statusbar->priv;
+
   /* we need to preserve namespaces on object datas */
   string = g_strconcat ("gtk-status-bar-context:", context_description, NULL);
 
   id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (statusbar), string));
   if (id == 0)
     {
-      id = statusbar->seq_context_id++;
+      id = priv->seq_context_id++;
       g_object_set_data_full (G_OBJECT (statusbar), string, GUINT_TO_POINTER (id), NULL);
-      statusbar->keys = g_slist_prepend (statusbar->keys, string);
+      priv->keys = g_slist_prepend (priv->keys, string);
     }
   else
     g_free (string);
@@ -325,6 +329,28 @@ gtk_statusbar_get_context_id (GtkStatusbar *statusbar,
   return id;
 }
 
+static GtkStatusbarMsg *
+gtk_statusbar_msg_create (GtkStatusbar *statusbar,
+                         guint         context_id,
+                         const gchar  *text)
+{
+  GtkStatusbarMsg *msg;
+
+  msg = g_slice_new (GtkStatusbarMsg);
+  msg->text = g_strdup (text);
+  msg->context_id = context_id;
+  msg->message_id = statusbar->priv->seq_message_id++;
+
+  return msg;
+}
+
+static void
+gtk_statusbar_msg_free (GtkStatusbarMsg *msg)
+{
+  g_free (msg->text);
+  g_slice_free (GtkStatusbarMsg, msg);
+}
+
 /**
  * gtk_statusbar_push:
  * @statusbar: a #GtkStatusbar
@@ -342,17 +368,16 @@ gtk_statusbar_push (GtkStatusbar *statusbar,
                    guint         context_id,
                    const gchar  *text)
 {
+  GtkStatusbarPrivate *priv;
   GtkStatusbarMsg *msg;
 
   g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), 0);
   g_return_val_if_fail (text != NULL, 0);
 
-  msg = g_slice_new (GtkStatusbarMsg);
-  msg->text = g_strdup (text);
-  msg->context_id = context_id;
-  msg->message_id = statusbar->seq_message_id++;
+  priv = statusbar->priv;
 
-  statusbar->messages = g_slist_prepend (statusbar->messages, msg);
+  msg = gtk_statusbar_msg_create (statusbar, context_id, text);
+  priv->messages = g_slist_prepend (priv->messages, msg);
 
   g_signal_emit (statusbar,
                 statusbar_signals[SIGNAL_TEXT_PUSHED],
@@ -365,10 +390,10 @@ gtk_statusbar_push (GtkStatusbar *statusbar,
 
 /**
  * gtk_statusbar_pop:
- * @statusbar: a #GtkStatusBar
+ * @statusbar: a #GtkStatusbar
  * @context_id: a context identifier
  * 
- * Removes the first message in the #GtkStatusBar's stack
+ * Removes the first message in the #GtkStatusbar's stack
  * with the given context id. 
  *
  * Note that this may not change the displayed message, if 
@@ -379,31 +404,32 @@ void
 gtk_statusbar_pop (GtkStatusbar *statusbar,
                   guint         context_id)
 {
+  GtkStatusbarPrivate *priv;
   GtkStatusbarMsg *msg;
 
   g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
 
-  if (statusbar->messages)
+  priv = statusbar->priv;
+
+  if (priv->messages)
     {
       GSList *list;
 
-      for (list = statusbar->messages; list; list = list->next)
+      for (list = priv->messages; list; list = list->next)
        {
          msg = list->data;
 
          if (msg->context_id == context_id)
            {
-             statusbar->messages = g_slist_remove_link (statusbar->messages,
-                                                        list);
-             g_free (msg->text);
-              g_slice_free (GtkStatusbarMsg, msg);
+             priv->messages = g_slist_remove_link (priv->messages, list);
+             gtk_statusbar_msg_free (msg);
              g_slist_free_1 (list);
              break;
            }
        }
     }
 
-  msg = statusbar->messages ? statusbar->messages->data : NULL;
+  msg = priv->messages ? priv->messages->data : NULL;
 
   g_signal_emit (statusbar,
                 statusbar_signals[SIGNAL_TEXT_POPPED],
@@ -414,7 +440,7 @@ gtk_statusbar_pop (GtkStatusbar *statusbar,
 
 /**
  * gtk_statusbar_remove:
- * @statusbar: a #GtkStatusBar
+ * @statusbar: a #GtkStatusbar
  * @context_id: a context identifier
  * @message_id: a message identifier, as returned by gtk_statusbar_push()
  *
@@ -426,12 +452,15 @@ gtk_statusbar_remove (GtkStatusbar *statusbar,
                      guint        context_id,
                      guint        message_id)
 {
+  GtkStatusbarPrivate *priv;
   GtkStatusbarMsg *msg;
 
   g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
   g_return_if_fail (message_id > 0);
 
-  msg = statusbar->messages ? statusbar->messages->data : NULL;
+  priv = statusbar->priv;
+
+  msg = priv->messages ? priv->messages->data : NULL;
   if (msg)
     {
       GSList *list;
@@ -444,16 +473,15 @@ gtk_statusbar_remove (GtkStatusbar *statusbar,
          return;
        }
       
-      for (list = statusbar->messages; list; list = list->next)
+      for (list = priv->messages; list; list = list->next)
        {
          msg = list->data;
          
          if (msg->context_id == context_id &&
              msg->message_id == message_id)
            {
-             statusbar->messages = g_slist_remove_link (statusbar->messages, list);
-             g_free (msg->text);
-              g_slice_free (GtkStatusbarMsg, msg);
+             priv->messages = g_slist_remove_link (priv->messages, list);
+             gtk_statusbar_msg_free (msg);
              g_slist_free_1 (list);
              
              break;
@@ -463,535 +491,283 @@ gtk_statusbar_remove (GtkStatusbar *statusbar,
 }
 
 /**
- * gtk_statusbar_set_has_resize_grip:
- * @statusbar: a #GtkStatusBar
- * @setting: %TRUE to have a resize grip
+ * gtk_statusbar_remove_all:
+ * @statusbar: a #GtkStatusbar
+ * @context_id: a context identifier
  *
- * Sets whether the statusbar has a resize grip. 
- * %TRUE by default.
- */
-void
-gtk_statusbar_set_has_resize_grip (GtkStatusbar *statusbar,
-                                  gboolean      setting)
-{
-  g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
-
-  setting = setting != FALSE;
-
-  if (setting != statusbar->has_resize_grip)
-    {
-      statusbar->has_resize_grip = setting;
-      gtk_widget_queue_resize (statusbar->label);
-      gtk_widget_queue_draw (GTK_WIDGET (statusbar));
-
-      if (GTK_WIDGET_REALIZED (statusbar))
-        {
-          if (statusbar->has_resize_grip && statusbar->grip_window == NULL)
-           {
-             gtk_statusbar_create_window (statusbar);
-             if (GTK_WIDGET_MAPPED (statusbar))
-               gdk_window_show (statusbar->grip_window);
-           }
-          else if (!statusbar->has_resize_grip && statusbar->grip_window != NULL)
-            gtk_statusbar_destroy_window (statusbar);
-        }
-      
-      g_object_notify (G_OBJECT (statusbar), "has-resize-grip");
-    }
-}
-
-/**
- * gtk_statusbar_get_has_resize_grip:
- * @statusbar: a #GtkStatusBar
- * 
- * Returns whether the statusbar has a resize grip.
+ * Forces the removal of all messages from a statusbar's
+ * stack with the exact @context_id.
  *
- * Returns: %TRUE if the statusbar has a resize grip.
+ * Since: 2.22
  */
-gboolean
-gtk_statusbar_get_has_resize_grip (GtkStatusbar *statusbar)
+void
+gtk_statusbar_remove_all (GtkStatusbar *statusbar,
+                          guint         context_id)
 {
-  g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), FALSE);
+  GtkStatusbarPrivate *priv;
+  GtkStatusbarMsg *msg;
+  GSList *prev, *list;
 
-  return statusbar->has_resize_grip;
-}
+  g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
 
-/**
- * gtk_statusbar_get_message_area:
- * @statusbar: a #GtkStatusBar
- *
- * Retrieves the box containing the label widget.
- *
- * Returns: a #GtkBox
- *
- * Since: 2.20
- */
-GtkWidget*
-gtk_statusbar_get_message_area (GtkStatusbar *statusbar)
-{
-  g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), NULL);
+  priv = statusbar->priv;
 
-  return gtk_bin_get_child (GTK_BIN (statusbar->frame));
-}
+  if (priv->messages == NULL)
+    return;
 
-static void
-gtk_statusbar_destroy (GtkObject *object)
-{
-  GtkStatusbar *statusbar = GTK_STATUSBAR (object);
-  GSList *list;
+  msg = priv->messages->data;
 
-  for (list = statusbar->messages; list; list = list->next)
+  /* care about signal emission if the topmost item is removed */
+  if (msg->context_id == context_id)
     {
-      GtkStatusbarMsg *msg;
+      gtk_statusbar_pop (statusbar, context_id);
 
-      msg = list->data;
-      g_free (msg->text);
-      g_slice_free (GtkStatusbarMsg, msg);
+      prev = NULL;
+      list = priv->messages;
     }
-  g_slist_free (statusbar->messages);
-  statusbar->messages = NULL;
-
-  for (list = statusbar->keys; list; list = list->next)
-    g_free (list->data);
-  g_slist_free (statusbar->keys);
-  statusbar->keys = NULL;
-
-  GTK_OBJECT_CLASS (gtk_statusbar_parent_class)->destroy (object);
-}
-
-static void
-gtk_statusbar_set_property (GObject      *object, 
-                           guint         prop_id, 
-                           const GValue *value, 
-                           GParamSpec   *pspec)
-{
-  GtkStatusbar *statusbar = GTK_STATUSBAR (object);
-
-  switch (prop_id) 
+  else
     {
-    case PROP_HAS_RESIZE_GRIP:
-      gtk_statusbar_set_has_resize_grip (statusbar, g_value_get_boolean (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
+      prev = priv->messages;
+      list = prev->next;
     }
-}
 
-static void
-gtk_statusbar_get_property (GObject    *object, 
-                           guint       prop_id, 
-                           GValue     *value, 
-                           GParamSpec *pspec)
-{
-  GtkStatusbar *statusbar = GTK_STATUSBAR (object);
-       
-  switch (prop_id) 
+  while (list != NULL)
     {
-    case PROP_HAS_RESIZE_GRIP:
-      g_value_set_boolean (value, statusbar->has_resize_grip);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static GdkWindowEdge
-get_grip_edge (GtkStatusbar *statusbar)
-{
-  GtkWidget *widget = GTK_WIDGET (statusbar);
-
-  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) 
-    return GDK_WINDOW_EDGE_SOUTH_EAST; 
-  else
-    return GDK_WINDOW_EDGE_SOUTH_WEST; 
-}
-
-static void
-get_grip_rect (GtkStatusbar *statusbar,
-               GdkRectangle *rect)
-{
-  GtkWidget *widget;
-  gint w, h;
-  
-  widget = GTK_WIDGET (statusbar);
+      msg = list->data;
 
-  /* These are in effect the max/default size of the grip. */
-  w = 18;
-  h = 18;
+      if (msg->context_id == context_id)
+        {
+          if (prev == NULL)
+            priv->messages = list->next;
+          else
+            prev->next = list->next;
 
-  if (w > widget->allocation.width)
-    w = widget->allocation.width;
+          gtk_statusbar_msg_free (msg);
+          g_slist_free_1 (list);
 
-  if (h > widget->allocation.height - widget->style->ythickness)
-    h = widget->allocation.height - widget->style->ythickness;
-  
-  rect->width = w;
-  rect->height = h;
-  rect->y = widget->allocation.y + widget->allocation.height - h;
-
-  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) 
-    rect->x = widget->allocation.x + widget->allocation.width - w;
-  else 
-    rect->x = widget->allocation.x + widget->style->xthickness;
-}
+          if (prev == NULL)
+            prev = priv->messages;
 
-static void
-set_grip_cursor (GtkStatusbar *statusbar)
-{
-  if (statusbar->has_resize_grip && statusbar->grip_window != NULL)
-    {
-      GtkWidget *widget = GTK_WIDGET (statusbar);
-      GdkDisplay *display = gtk_widget_get_display (widget);
-      GdkCursorType cursor_type;
-      GdkCursor *cursor;
-      
-      if (gtk_widget_is_sensitive (widget))
-        {
-          if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
-           cursor_type = GDK_BOTTOM_RIGHT_CORNER;
+          if (prev)
+            list = prev->next;
           else
-           cursor_type = GDK_BOTTOM_LEFT_CORNER;
-
-          cursor = gdk_cursor_new_for_display (display, cursor_type);
-          gdk_window_set_cursor (statusbar->grip_window, cursor);
-          gdk_cursor_unref (cursor);
+            list = NULL;
         }
       else
-        gdk_window_set_cursor (statusbar->grip_window, NULL);
+        {
+          prev = list;
+          list = prev->next;
+        }
     }
 }
 
-static void
-gtk_statusbar_create_window (GtkStatusbar *statusbar)
+/**
+ * gtk_statusbar_get_message_area:
+ * @statusbar: a #GtkStatusbar
+ *
+ * Retrieves the box containing the label widget.
+ *
+ * Returns: (transfer none): a #GtkBox
+ *
+ * Since: 2.20
+ */
+GtkWidget*
+gtk_statusbar_get_message_area (GtkStatusbar *statusbar)
 {
-  GtkWidget *widget;
-  GdkWindowAttr attributes;
-  gint attributes_mask;
-  GdkRectangle rect;
-
-  g_return_if_fail (GTK_WIDGET_REALIZED (statusbar));
-  g_return_if_fail (statusbar->has_resize_grip);
-
-  widget = GTK_WIDGET (statusbar);
-
-  get_grip_rect (statusbar, &rect);
-
-  attributes.x = rect.x;
-  attributes.y = rect.y;
-  attributes.width = rect.width;
-  attributes.height = rect.height;
-  attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.wclass = GDK_INPUT_ONLY;
-  attributes.event_mask = gtk_widget_get_events (widget) |
-    GDK_BUTTON_PRESS_MASK;
-
-  attributes_mask = GDK_WA_X | GDK_WA_Y;
-
-  statusbar->grip_window = gdk_window_new (widget->window,
-                                           &attributes, attributes_mask);
-
-  gdk_window_set_user_data (statusbar->grip_window, widget);
-
-  gdk_window_raise (statusbar->grip_window);
+  GtkStatusbarPrivate *priv;
 
-  set_grip_cursor (statusbar);
-}
+  g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), NULL);
 
-static void
-gtk_statusbar_direction_changed (GtkWidget        *widget,
-                                GtkTextDirection  prev_dir)
-{
-  GtkStatusbar *statusbar = GTK_STATUSBAR (widget);
+  priv = statusbar->priv;
 
-  set_grip_cursor (statusbar);
+  return gtk_bin_get_child (GTK_BIN (priv->frame));
 }
 
 static void
-gtk_statusbar_state_changed (GtkWidget    *widget,
-                            GtkStateType  previous_state)   
+gtk_statusbar_destroy (GtkWidget *widget)
 {
   GtkStatusbar *statusbar = GTK_STATUSBAR (widget);
+  GtkStatusbarPrivate *priv = statusbar->priv;
 
-  set_grip_cursor (statusbar);
-}
-
-static void
-gtk_statusbar_destroy_window (GtkStatusbar *statusbar)
-{
-  gdk_window_set_user_data (statusbar->grip_window, NULL);
-  gdk_window_destroy (statusbar->grip_window);
-  statusbar->grip_window = NULL;
-}
-
-static void
-gtk_statusbar_realize (GtkWidget *widget)
-{
-  GtkStatusbar *statusbar;
-
-  statusbar = GTK_STATUSBAR (widget);
-
-  GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->realize (widget);
-
-  if (statusbar->has_resize_grip)
-    gtk_statusbar_create_window (statusbar);
-}
-
-static void
-gtk_statusbar_unrealize (GtkWidget *widget)
-{
-  GtkStatusbar *statusbar;
-
-  statusbar = GTK_STATUSBAR (widget);
-
-  if (statusbar->grip_window)
-    gtk_statusbar_destroy_window (statusbar);
-
-  GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->unrealize (widget);
-}
-
-static void
-gtk_statusbar_map (GtkWidget *widget)
-{
-  GtkStatusbar *statusbar;
-
-  statusbar = GTK_STATUSBAR (widget);
+  g_slist_free_full (priv->messages, (GDestroyNotify) gtk_statusbar_msg_free);
+  priv->messages = NULL;
 
-  GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->map (widget);
+  g_slist_free_full (priv->keys, g_free);
+  priv->keys = NULL;
 
-  if (statusbar->grip_window)
-    gdk_window_show (statusbar->grip_window);
-}
-
-static void
-gtk_statusbar_unmap (GtkWidget *widget)
-{
-  GtkStatusbar *statusbar;
-
-  statusbar = GTK_STATUSBAR (widget);
-
-  if (statusbar->grip_window)
-    gdk_window_hide (statusbar->grip_window);
-
-  GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->unmap (widget);
-}
-
-static gboolean
-gtk_statusbar_button_press (GtkWidget      *widget,
-                            GdkEventButton *event)
-{
-  GtkStatusbar *statusbar;
-  GtkWidget *ancestor;
-  GdkWindowEdge edge;
-  
-  statusbar = GTK_STATUSBAR (widget);
-  
-  if (!statusbar->has_resize_grip ||
-      event->type != GDK_BUTTON_PRESS ||
-      event->window != statusbar->grip_window)
-    return FALSE;
-  
-  ancestor = gtk_widget_get_toplevel (widget);
-
-  if (!GTK_IS_WINDOW (ancestor))
-    return FALSE;
-
-  edge = get_grip_edge (statusbar);
-
-  if (event->button == 1)
-    gtk_window_begin_resize_drag (GTK_WINDOW (ancestor),
-                                  edge,
-                                  event->button,
-                                  event->x_root, event->y_root,
-                                  event->time);
-  else if (event->button == 2)
-    gtk_window_begin_move_drag (GTK_WINDOW (ancestor),
-                                event->button,
-                                event->x_root, event->y_root,
-                                event->time);
-  else
-    return FALSE;
-  
-  return TRUE;
-}
-
-static gboolean
-gtk_statusbar_expose_event (GtkWidget      *widget,
-                            GdkEventExpose *event)
-{
-  GtkStatusbar *statusbar;
-  GdkRectangle rect;
-  
-  statusbar = GTK_STATUSBAR (widget);
-
-  GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->expose_event (widget, event);
-
-  if (statusbar->has_resize_grip)
-    {
-      GdkWindowEdge edge;
-      
-      edge = get_grip_edge (statusbar);
-
-      get_grip_rect (statusbar, &rect);
-
-      gtk_paint_resize_grip (widget->style,
-                             widget->window,
-                             GTK_WIDGET_STATE (widget),
-                             &event->area,
-                             widget,
-                             "statusbar",
-                             edge,
-                             rect.x, rect.y,
-                             /* don't draw grip over the frame, though you
-                              * can click on the frame.
-                              */
-                             rect.width - widget->style->xthickness,
-                             rect.height - widget->style->ythickness);
-    }
-
-  return FALSE;
-}
-
-static void
-gtk_statusbar_size_request (GtkWidget      *widget,
-                           GtkRequisition *requisition)
-{
-  GtkStatusbar *statusbar;
-  GtkShadowType shadow_type;
-  
-  statusbar = GTK_STATUSBAR (widget);
-
-  gtk_widget_style_get (GTK_WIDGET (statusbar), "shadow-type", &shadow_type, NULL);  
-  gtk_frame_set_shadow_type (GTK_FRAME (statusbar->frame), shadow_type);
-  
-  GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->size_request (widget, requisition);
+  GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->destroy (widget);
 }
 
 /* look for extra children between the frame containing
- * the label and where we want to draw the resize grip 
+ * the label and where we want to draw the resize grip
  */
 static gboolean
 has_extra_children (GtkStatusbar *statusbar)
 {
-  GList *l;
-  GtkBoxChild *child, *frame;
-
-  /* If the internal frame has been modified assume we have extra children */
-  if (gtk_bin_get_child (GTK_BIN (statusbar->frame)) != statusbar->label)
-    return TRUE;
+  GtkStatusbarPrivate *priv = statusbar->priv;
+  GtkPackType child_pack_type, frame_pack_type;
+  GtkWidget *child, *frame;
+  GList *l, *children;
+  gboolean retval = FALSE;
 
   frame = NULL;
-  for (l = GTK_BOX (statusbar)->children; l; l = l->next)
+  children = _gtk_box_get_children (GTK_BOX (statusbar));
+  for (l = children; l; l = l->next)
     {
       frame = l->data;
 
-      if (frame->widget == statusbar->frame)
-       break;
+      if (frame == priv->frame)
+        break;
     }
-  
+
+  gtk_box_query_child_packing (GTK_BOX (statusbar), frame,
+                               NULL, NULL, NULL, &frame_pack_type);
+
   for (l = l->next; l; l = l->next)
     {
       child = l->data;
 
-      if (!GTK_WIDGET_VISIBLE (child->widget))
-       continue;
+      if (!gtk_widget_get_visible (child))
+        continue;
 
-      if (frame->pack == GTK_PACK_START || child->pack == GTK_PACK_END)
-       return TRUE;
+      gtk_box_query_child_packing (GTK_BOX (statusbar), child,
+                                   NULL, NULL, NULL, &child_pack_type);
+
+      if (frame_pack_type == GTK_PACK_START || child_pack_type == GTK_PACK_END)
+        {
+          retval = TRUE;
+          break;
+        }
     }
 
-  return FALSE;
+  g_list_free (children);
+
+  return retval;
 }
 
 static void
-gtk_statusbar_size_allocate  (GtkWidget     *widget,
-                              GtkAllocation *allocation)
+gtk_statusbar_size_allocate (GtkWidget     *widget,
+                             GtkAllocation *allocation)
 {
   GtkStatusbar *statusbar = GTK_STATUSBAR (widget);
+  GtkStatusbarPrivate *priv = statusbar->priv;
   gboolean extra_children = FALSE;
+  gboolean has_resize_grip = FALSE;
   GdkRectangle rect;
+  GtkWidget *window;
+  gint x, y;
+  GdkRectangle translated_rect;
 
-  if (statusbar->has_resize_grip)
-    {
-      get_grip_rect (statusbar, &rect);
-
-      extra_children = has_extra_children (statusbar);
+  window = gtk_widget_get_toplevel (widget);
 
-      /* If there are extra children, we don't want them to occupy
-       * the space where we draw the resize grip, so we temporarily
-       * shrink the allocation.
-       * If there are no extra children, we want the frame to get
-       * the full allocation, and we fix up the allocation of the
-       * label afterwards to make room for the grip.
-       */
-      if (extra_children)
-       {
-         allocation->width -= rect.width;
-         if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) 
-           allocation->x += rect.width;
-       }
+  if (GTK_IS_WINDOW (window) &&
+      gtk_window_resize_grip_is_visible (GTK_WINDOW (window)))
+    {
+      gtk_window_get_resize_grip_area (GTK_WINDOW (window), &rect);
+      if (gtk_widget_translate_coordinates (widget, window, 0, 0, &x, &y))
+        {
+          translated_rect.x = x;
+          translated_rect.y = y;
+          translated_rect.width = allocation->width;
+          translated_rect.height = allocation->height;
+
+          if (gdk_rectangle_intersect (&rect, &translated_rect, NULL))
+            {
+              has_resize_grip = TRUE;
+              extra_children = has_extra_children (statusbar);
+
+              /* If there are extra children, we don't want them to occupy
+               * the space where we draw the resize grip, so we temporarily
+               * shrink the allocation.
+               * If there are no extra children, we want the frame to get
+               * the full allocation, and we fix up the allocation of the
+               * label afterwards to make room for the grip.
+               */
+              if (extra_children)
+                {
+                  allocation->width -= rect.width;
+                  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+                    allocation->x += rect.width;
+                }
+            }
+        }
     }
 
   /* chain up normally */
   GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->size_allocate (widget, allocation);
 
-  if (statusbar->has_resize_grip)
+  if (has_resize_grip)
     {
-      if (extra_children) 
-       {
-         allocation->width += rect.width;
-         if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) 
-           allocation->x -= rect.width;
-         
-         widget->allocation = *allocation;
-       }
-      else
-       {
-         GtkWidget *child;
+      if (extra_children)
+        {
+          allocation->width += rect.width;
+          if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+            allocation->x -= rect.width;
 
-         /* Use the frame's child instead of statusbar->label directly, in case
-          * the label has been replaced by a container as the frame's child
-          * (and the label reparented into that container).
-          */
-         child = gtk_bin_get_child (GTK_BIN (statusbar->frame));
+          gtk_widget_set_allocation (widget, allocation);
+        }
+      else
+        {
+          GtkAllocation child_allocation, frame_allocation;
+          GtkWidget *child;
+
+          /* Use the frame's child instead of statusbar->label directly, in case
+           * the label has been replaced by a container as the frame's child
+           * (and the label reparented into that container).
+           */
+          child = gtk_bin_get_child (GTK_BIN (priv->frame));
+
+          gtk_widget_get_allocation (child, &child_allocation);
+          gtk_widget_get_allocation (priv->frame, &frame_allocation);
+          if (child_allocation.width + rect.width > frame_allocation.width)
+            {
+              /* shrink the label to make room for the grip */
+              *allocation = child_allocation;
+              allocation->width = MAX (1, allocation->width - rect.width);
+              if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+                allocation->x += child_allocation.width - allocation->width;
+
+              gtk_widget_size_allocate (child, allocation);
+            }
+        }
+    }
+}
 
-         if (child->allocation.width + rect.width > statusbar->frame->allocation.width)
-           {
-             /* shrink the label to make room for the grip */
-             *allocation = child->allocation;
-             allocation->width = MAX (1, allocation->width - rect.width);
-             if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-               allocation->x += child->allocation.width - allocation->width;
+static void
+resize_grip_visible_changed (GObject    *object,
+                             GParamSpec *pspec,
+                             gpointer    user_data)
+{
+  GtkStatusbar *statusbar = GTK_STATUSBAR (user_data);
+  GtkStatusbarPrivate *priv = statusbar->priv;
 
-             gtk_widget_size_allocate (child, allocation);
-           }
-       }
+  gtk_widget_queue_resize (priv->label);
+  gtk_widget_queue_resize (priv->frame);
+  gtk_widget_queue_resize (GTK_WIDGET (statusbar));
+}
 
-      if (statusbar->grip_window)
-       {
-          get_grip_rect (statusbar, &rect);
+static void
+gtk_statusbar_hierarchy_changed (GtkWidget *widget,
+                                 GtkWidget *previous_toplevel)
+{
+  GtkWidget *window;
 
-         gdk_window_raise (statusbar->grip_window);
-         gdk_window_move_resize (statusbar->grip_window,
-                                 rect.x, rect.y,
-                                 rect.width, rect.height);
-       }
+  if (previous_toplevel)
+    g_signal_handlers_disconnect_by_func (previous_toplevel,
+                                          G_CALLBACK (resize_grip_visible_changed),
+                                          widget);
+  window = gtk_widget_get_toplevel (widget);
+  if (GTK_IS_WINDOW (window))
+    g_signal_connect (window, "notify::resize-grip-visible",
+                      G_CALLBACK (resize_grip_visible_changed), widget);
 
-    }
+  resize_grip_visible_changed (NULL, NULL, widget);
 }
 
 static void
-label_selectable_changed (GtkWidget  *label,
-                         GParamSpec *pspec,
-                         gpointer    data)
+gtk_statusbar_realize (GtkWidget *widget)
 {
-  GtkStatusbar *statusbar = GTK_STATUSBAR (data);
+  GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->realize (widget);
 
-  if (statusbar && 
-      statusbar->has_resize_grip && statusbar->grip_window)
-    gdk_window_raise (statusbar->grip_window);
+  resize_grip_visible_changed (NULL, NULL, widget);
 }
-
-#define __GTK_STATUSBAR_C__
-#include "gtkaliasdef.c"