]> Pileus Git - ~andy/gtk/commitdiff
treeviewcolumn: always hide button widget if the header is not shown
authorCarl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
Wed, 16 Jan 2013 23:36:04 +0000 (00:36 +0100)
committerBenjamin Otte <otte@redhat.com>
Wed, 16 Jan 2013 23:45:33 +0000 (00:45 +0100)
Fixes the following warning from appearing:
Gtk-WARNING **: GtkTreeView 0xb44010 is mapped but visible child
GtkButton 0xad9320 is not mapped

gtk/gtktreeviewcolumn.c

index 3f32c8131262412b290028fa3959ef520d5bf28e..e9b0ac6e9c444c5948a1499c55d61215bb927c14 100644 (file)
@@ -1035,10 +1035,10 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
       priv->tree_view != NULL &&
       gtk_widget_get_realized (priv->tree_view))
     {
-      if (priv->visible)
+      if (priv->visible &&
+          gdk_window_is_visible (_gtk_tree_view_get_header_window (GTK_TREE_VIEW (priv->tree_view))))
        {
-          if (gdk_window_is_visible (_gtk_tree_view_get_header_window (GTK_TREE_VIEW (priv->tree_view))))
-            gtk_widget_show_now (priv->button);
+          gtk_widget_show (priv->button);
 
          if (priv->window)
            {