widget: Remove show-all property

Doesn't make sense anymore now that gtk_widget_show_all is gone.

32 files changed, 34 insertions, 139 deletions

diff --git a/demos/gtk-demo/application.ui b/demos/gtk-demo/application.ui
index 1ff1b4b965..fa6798ddbe 100644
--- a/demos/gtk-demo/application.ui
+++ b/demos/gtk-demo/application.ui
@@ -48,7 +48,7 @@
         </child>
         <child>
           <object class="GtkInfoBar" id="infobar">
-            <property name="no-show-all">1</property>
+            <property name="visible">0</property>
             <property name="hexpand">1</property>
             <child internal-child="content_area">
               <object class="GtkBox" id="content_area">
diff --git a/demos/gtk-demo/toolpalette.c b/demos/gtk-demo/toolpalette.c
index b0f474e360..4dfacd393b 100644
--- a/demos/gtk-demo/toolpalette.c
+++ b/demos/gtk-demo/toolpalette.c
@@ -781,7 +781,7 @@ load_special_items (GtkToolPalette *palette)
   gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "edit-delete");
   gtk_tool_item_set_tooltip_text (item, "Do not show at all");
   gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_widget_set_no_show_all (GTK_WIDGET (item), TRUE);
+  gtk_widget_hide (GTK_WIDGET (item));
 
   item = gtk_tool_button_new (NULL, NULL);
   gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "view-fullscreen");
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 34547d47df..dad8e90775 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -2317,7 +2317,6 @@ microphone-sensitivity-medium-symbolic</property>
                                   <object class="GtkInfoBar" id="infobar">
                                     <property name="visible">0</property>
                                     <property name="show-close-button">1</property>
-                                    <property name="no-show-all">1</property>
                                     <child internal-child="content_area">
                                       <object class="GtkBox">
                                         <child>
@@ -2347,7 +2346,7 @@ microphone-sensitivity-medium-symbolic</property>
                                 </child>
                                 <child>
                                   <object class="GtkStatusbar" id="statusbar">
-                                    <property name="no-show-all">1</property>
+                                    <property name="visible">0</property>
                                   </object>
                                 </child>
                               </object>
@@ -3036,7 +3035,6 @@ microphone-sensitivity-medium-symbolic</property>
                         <child type="overlay">
                           <object class="GtkToolbar" id="totem_like_osd">
                             <property name="visible">0</property>
-                            <property name="no-show-all">1</property>
                             <property name="opacity">0.9</property>
                             <property name="margin">20</property>
                             <property name="valign">end</property>
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 6afd7663ab..892980d1c8 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -4583,8 +4583,6 @@ gtk_widget_get_size_request
 gtk_widget_set_child_visible
 gtk_widget_set_size_request
 gtk_widget_thaw_child_notify
-gtk_widget_set_no_show_all
-gtk_widget_get_no_show_all
 gtk_widget_list_mnemonic_labels
 gtk_widget_add_mnemonic_label
 gtk_widget_remove_mnemonic_label
diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 9625ed3901..8ec4e2d51c 100644
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -282,7 +282,7 @@ create_accel_label (void)
 
   button = gtk_button_new_with_label ("Quit");
   gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (widget), button);
-  gtk_widget_set_no_show_all (button, TRUE);
+  gtk_widget_hide (button);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (box), widget);
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index eb9eea70fc..a9bf9d17c1 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -1693,9 +1693,7 @@ gtk_assistant_insert_page (GtkAssistant *assistant,
   page_info->page  = page;
   page_info->regular_title = gtk_label_new (NULL);
   page_info->has_padding = TRUE;
-  gtk_widget_set_no_show_all (page_info->regular_title, TRUE);
   page_info->current_title = gtk_label_new (NULL);
-  gtk_widget_set_no_show_all (page_info->current_title, TRUE);
 
   gtk_label_set_xalign (GTK_LABEL (page_info->regular_title), 0.0);
   gtk_label_set_xalign (GTK_LABEL (page_info->current_title), 0.0);
diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
index c7e8e671d9..d2e80fa825 100644
--- a/gtk/gtkcolorchooserwidget.c
+++ b/gtk/gtkcolorchooserwidget.c
@@ -594,9 +594,7 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc)
     gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (cc), &color);
 
   gtk_widget_hide (GTK_WIDGET (cc->priv->editor));
-
-  gtk_widget_set_no_show_all (cc->priv->palette, TRUE);
-  gtk_widget_set_no_show_all (cc->priv->editor, TRUE);
+  gtk_widget_hide (GTK_WIDGET (cc->priv->palette));
 
   cc->priv->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
   gtk_size_group_add_widget (cc->priv->size_group, cc->priv->palette);
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 589693a7a6..78e4fe846f 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -443,7 +443,6 @@ add_cb (GtkContainer *container,
     g_warning ("Content added to the action area of a dialog using header bars");
 
   gtk_widget_set_visible (priv->action_box, TRUE);
-  gtk_widget_set_no_show_all (priv->action_box, FALSE);
 }
 
 static void
@@ -495,7 +494,6 @@ gtk_dialog_constructed (GObject *object)
     }
 
   gtk_widget_set_visible (priv->action_box, !priv->use_header_bar);
-  gtk_widget_set_no_show_all (priv->action_box, priv->use_header_bar);
 }
 
 static void
diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index a90d6dfafa..83d890f4dd 100644
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -191,7 +191,6 @@ create_title_box (const char *title,
   gtk_label_set_single_line_mode (GTK_LABEL (subtitle_label), TRUE);
   gtk_label_set_ellipsize (GTK_LABEL (subtitle_label), PANGO_ELLIPSIZE_END);
   gtk_box_pack_start (GTK_BOX (label_box), subtitle_label, FALSE, FALSE);
-  gtk_widget_set_no_show_all (subtitle_label, TRUE);
   gtk_widget_set_visible (subtitle_label, subtitle && subtitle[0]);
 
   if (ret_title_label)
@@ -340,7 +339,6 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
           t = g_strsplit (tokens[i], ",", -1);
 
           separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
-          gtk_widget_set_no_show_all (separator, TRUE);
           gtk_style_context_add_class (gtk_widget_get_style_context (separator), "titlebutton");
 
           box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, priv->spacing);
diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index 65f49afe0f..fbd6640c37 100644
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -83,7 +83,6 @@
  * widget = gtk_info_bar_new ();
  * bar = GTK_INFO_BAR (bar);
  *
- * gtk_widget_set_no_show_all (widget, TRUE);
  * message_label = gtk_label_new ("");
  * gtk_widget_show (message_label);
  * content_area = gtk_info_bar_get_content_area (bar);
@@ -443,7 +442,6 @@ gtk_info_bar_init (GtkInfoBar *info_bar)
 
   gtk_widget_init_template (widget);
 
-  gtk_widget_set_no_show_all (priv->close_button, TRUE);
   g_signal_connect (priv->close_button, "clicked",
                     G_CALLBACK (close_button_clicked_cb), info_bar);
 }
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index 1cd9959f83..c013d5630c 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -417,7 +417,7 @@ gtk_message_dialog_constructed (GObject *object)
       gtk_widget_show (box);
       gtk_widget_set_size_request (box, -1, 16);
       label = gtk_label_new ("");
-      gtk_widget_set_no_show_all (label, TRUE);
+      gtk_widget_hide (label);
       gtk_widget_set_margin_top (label, 6);
       gtk_widget_set_margin_bottom (label, 6);
       gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
index 21dceeccdc..8109079f47 100644
--- a/gtk/gtkmodelbutton.c
+++ b/gtk/gtkmodelbutton.c
@@ -1143,9 +1143,9 @@ gtk_model_button_init (GtkModelButton *button)
   gtk_widget_set_halign (button->box, GTK_ALIGN_FILL);
   gtk_widget_show (button->box);
   button->image = gtk_image_new ();
-  gtk_widget_set_no_show_all (button->image, TRUE);
+  gtk_widget_hide (button->image);
   button->label = gtk_label_new ("");
-  gtk_widget_set_no_show_all (button->label, TRUE);
+  gtk_widget_hide (button->label);
   gtk_container_add (GTK_CONTAINER (button->box), button->image);
   gtk_container_add (GTK_CONTAINER (button->box), button->label);
   gtk_container_add (GTK_CONTAINER (button), button->box);
diff --git a/gtk/gtkrecentchoosermenu.c b/gtk/gtkrecentchoosermenu.c
index 4d30091917..8f84c2836a 100644
--- a/gtk/gtkrecentchoosermenu.c
+++ b/gtk/gtkrecentchoosermenu.c
@@ -320,7 +320,6 @@ gtk_recent_chooser_menu_constructed (GObject *object)
                      GINT_TO_POINTER (TRUE));
 
   gtk_menu_shell_insert (GTK_MENU_SHELL (menu), priv->placeholder, 0);
-  gtk_widget_set_no_show_all (priv->placeholder, TRUE);
   gtk_widget_show (priv->placeholder);
 
   /* (re)populate the menu */
diff --git a/gtk/gtksearchbar.c b/gtk/gtksearchbar.c
index a290e92844..8f11969f77 100644
--- a/gtk/gtksearchbar.c
+++ b/gtk/gtksearchbar.c
@@ -445,7 +445,6 @@ gtk_search_bar_init (GtkSearchBar *bar)
   g_signal_connect (priv->revealer, "notify::child-revealed",
                     G_CALLBACK (child_revealed_changed_cb), bar);
 
-  gtk_widget_set_no_show_all (priv->close_button, TRUE);
   g_signal_connect (priv->close_button, "clicked",
                     G_CALLBACK (close_button_clicked_cb), bar);
 };
diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c
index ad3fc55d2a..b8bef99ca1 100644
--- a/gtk/gtkshortcutssection.c
+++ b/gtk/gtkshortcutssection.c
@@ -443,14 +443,12 @@ gtk_shortcuts_section_init (GtkShortcutsSection *self)
                                  "stack", self->stack,
                                  "spacing", 12,
                                  "visible", FALSE,
-                                 "no-show-all", TRUE,
                                  NULL);
 
   gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (self->switcher)), GTK_STYLE_CLASS_LINKED);
 
   self->show_all = gtk_button_new_with_mnemonic (_("_Show All"));
-  gtk_widget_set_no_show_all (self->show_all, TRUE);
-  gtk_widget_set_visible (self->show_all, FALSE);
+  gtk_widget_hide (self->show_all);
   g_signal_connect_swapped (self->show_all, "clicked",
                             G_CALLBACK (gtk_shortcuts_section_show_all), self);
 
diff --git a/gtk/gtkshortcutsshortcut.c b/gtk/gtkshortcutsshortcut.c
index f463b7a628..6815c0d985 100644
--- a/gtk/gtkshortcutsshortcut.c
+++ b/gtk/gtkshortcutsshortcut.c
@@ -280,13 +280,11 @@ update_visible_from_direction (GtkShortcutsShortcut *self)
   if (self->direction == GTK_TEXT_DIR_NONE ||
       self->direction == gtk_widget_get_direction (GTK_WIDGET (self)))
     {
-      gtk_widget_set_visible (GTK_WIDGET (self), TRUE);
-      gtk_widget_set_no_show_all (GTK_WIDGET (self), FALSE);
+      gtk_widget_show (GTK_WIDGET (self));
     }
   else
     {
-      gtk_widget_set_visible (GTK_WIDGET (self), FALSE);
-      gtk_widget_set_no_show_all (GTK_WIDGET (self), TRUE);
+      gtk_widget_hide (GTK_WIDGET (self));
     }
 }
 
@@ -735,14 +733,12 @@ gtk_shortcuts_shortcut_init (GtkShortcutsShortcut *self)
   self->image = g_object_new (GTK_TYPE_IMAGE,
                               "visible", FALSE,
                               "valign", GTK_ALIGN_CENTER,
-                              "no-show-all", TRUE,
                               NULL);
   gtk_container_add (GTK_CONTAINER (self->box), GTK_WIDGET (self->image));
 
   self->accelerator = g_object_new (GTK_TYPE_SHORTCUT_LABEL,
                                     "visible", TRUE,
                                     "valign", GTK_ALIGN_CENTER,
-                                    "no-show-all", TRUE,
                                     NULL);
   gtk_container_add (GTK_CONTAINER (self->box), GTK_WIDGET (self->accelerator));
 
@@ -762,7 +758,6 @@ gtk_shortcuts_shortcut_init (GtkShortcutsShortcut *self)
 
   self->subtitle = g_object_new (GTK_TYPE_LABEL,
                                  "visible", FALSE,
-                                 "no-show-all", TRUE,
                                  "xalign", 0.0f,
                                  NULL);
   gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (self->subtitle)),
diff --git a/gtk/gtkstacksidebar.c b/gtk/gtkstacksidebar.c
index ec50fc4090..5a4a3014a2 100644
--- a/gtk/gtkstacksidebar.c
+++ b/gtk/gtkstacksidebar.c
@@ -196,8 +196,6 @@ gtk_stack_sidebar_init (GtkStackSidebar *sidebar)
   priv = gtk_stack_sidebar_get_instance_private (sidebar);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (sw);
-  gtk_widget_set_no_show_all (sw, TRUE);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_NEVER,
                                   GTK_POLICY_AUTOMATIC);
@@ -205,7 +203,6 @@ gtk_stack_sidebar_init (GtkStackSidebar *sidebar)
   gtk_container_add (GTK_CONTAINER (sidebar), sw);
 
   priv->list = GTK_LIST_BOX (gtk_list_box_new ());
-  gtk_widget_show (GTK_WIDGET (priv->list));
 
   gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (priv->list));
 
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 7811a0ab40..d216298f81 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -576,7 +576,6 @@ enum {
   PROP_HAS_DEFAULT,
   PROP_RECEIVES_DEFAULT,
   PROP_EVENTS,
-  PROP_NO_SHOW_ALL,
   PROP_HAS_TOOLTIP,
   PROP_TOOLTIP_MARKUP,
   PROP_TOOLTIP_TEXT,
@@ -1172,13 +1171,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                           GDK_STRUCTURE_MASK,
                           GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
 
-  widget_props[PROP_NO_SHOW_ALL] =
-      g_param_spec_boolean ("no-show-all",
-                            P_("No show all"),
-                            P_("Whether gtk_widget_show_all() should not affect this widget"),
-                            FALSE,
-                            GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
-
 /**
  * GtkWidget:has-tooltip:
  *
@@ -3228,9 +3220,6 @@ gtk_widget_set_property (GObject         *object,
       if (!_gtk_widget_get_realized (widget) && _gtk_widget_get_has_window (widget))
 	gtk_widget_set_events (widget, g_value_get_flags (value));
       break;
-    case PROP_NO_SHOW_ALL:
-      gtk_widget_set_no_show_all (widget, g_value_get_boolean (value));
-      break;
     case PROP_HAS_TOOLTIP:
       gtk_widget_real_set_has_tooltip (widget,
 				       g_value_get_boolean (value), FALSE);
@@ -3403,9 +3392,6 @@ gtk_widget_get_property (GObject         *object,
       eventp = g_object_get_qdata (G_OBJECT (widget), quark_event_mask);
       g_value_set_flags (value, GPOINTER_TO_INT (eventp));
       break;
-    case PROP_NO_SHOW_ALL:
-      g_value_set_boolean (value, gtk_widget_get_no_show_all (widget));
-      break;
     case PROP_HAS_TOOLTIP:
       g_value_set_boolean (value, gtk_widget_get_has_tooltip (widget));
       break;
@@ -13272,56 +13258,6 @@ gtk_widget_remove_mnemonic_label (GtkWidget *widget,
 			     new_list, (GDestroyNotify) g_slist_free);
 }
 
-/**
- * gtk_widget_get_no_show_all:
- * @widget: a #GtkWidget
- *
- * Returns the current value of the #GtkWidget:no-show-all property,
- * which determines whether calls to gtk_widget_show_all()
- * will affect this widget.
- *
- * Returns: the current value of the “no-show-all” property.
- *
- * Since: 2.4
- **/
-gboolean
-gtk_widget_get_no_show_all (GtkWidget *widget)
-{
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-
-  return widget->priv->no_show_all;
-}
-
-/**
- * gtk_widget_set_no_show_all:
- * @widget: a #GtkWidget
- * @no_show_all: the new value for the “no-show-all” property
- *
- * Sets the #GtkWidget:no-show-all property, which determines whether
- * calls to gtk_widget_show_all() will affect this widget.
- *
- * This is mostly for use in constructing widget hierarchies with externally
- * controlled visibility.
- *
- * Since: 2.4
- **/
-void
-gtk_widget_set_no_show_all (GtkWidget *widget,
-			    gboolean   no_show_all)
-{
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  no_show_all = (no_show_all != FALSE);
-
-  if (widget->priv->no_show_all != no_show_all)
-    {
-      widget->priv->no_show_all = no_show_all;
-
-      g_object_notify_by_pspec (G_OBJECT (widget), widget_props[PROP_NO_SHOW_ALL]);
-    }
-}
-
-
 static void
 gtk_widget_real_set_has_tooltip (GtkWidget *widget,
 			         gboolean   has_tooltip,
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 8e6e1dd3b6..f9045c05e9 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -509,11 +509,6 @@ void       gtk_widget_hide                (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
 void       gtk_widget_show_now            (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
-void       gtk_widget_set_no_show_all     (GtkWidget           *widget,
-                                           gboolean             no_show_all);
-GDK_AVAILABLE_IN_ALL
-gboolean   gtk_widget_get_no_show_all     (GtkWidget           *widget);
-GDK_AVAILABLE_IN_ALL
 void	   gtk_widget_map		  (GtkWidget	       *widget);
 GDK_AVAILABLE_IN_ALL
 void	   gtk_widget_unmap		  (GtkWidget	       *widget);
diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index c19dd2a966..ba46211453 100644
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -67,7 +67,6 @@ struct _GtkWidgetPrivate
   guint has_grab              : 1;
   guint shadowed              : 1;
   guint redraw_on_alloc       : 1;
-  guint no_show_all           : 1;
   guint child_visible         : 1;
   guint multidevice           : 1;
   guint has_shape_mask        : 1;
diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
index 3a2729668c..681d89b98b 100644
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -14,8 +14,8 @@
         <property name="show-close-button">1</property>
         <child type="title">
           <object class="GtkStackSwitcher" id="stack_switcher">
+            <property name="visible">0</property>
             <property name="stack">stack</property>
-            <property name="no-show-all">1</property>
           </object>
         </child>
       </object>
@@ -67,10 +67,10 @@
                     <property name="spacing">8</property>
                     <child>
                       <object class="GtkLabel" id="version_label">
+                        <property name="visible">0</property>
                         <property name="label">version 1.0</property>
                         <property name="justify">center</property>
                         <property name="selectable">1</property>
-                        <property name="no-show-all">1</property>
                       </object>
                       <packing>
                         <property name="fill">0</property>
@@ -78,11 +78,11 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="comments_label">
+                        <property name="visible">0</property>
                         <property name="label">comments</property>
                         <property name="justify">center</property>
                         <property name="wrap">1</property>
                         <property name="selectable">1</property>
-                        <property name="no-show-all">1</property>
                         <property name="max-width-chars">60</property>
                       </object>
                       <packing>
@@ -91,7 +91,7 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="website_label">
-                        <property name="no-show-all">1</property>
+                        <property name="visible">0</property>
                         <property name="label">http://website.com</property>
                         <property name="selectable">1</property>
                         <signal name="activate-link" handler="emit_activate_link" object="GtkAboutDialog" swapped="yes"/>
@@ -102,11 +102,11 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="copyright_label">
+                        <property name="visible">0</property>
                         <property name="label">copyright</property>
                         <property name="justify">center</property>
                         <property name="wrap">1</property>
                         <property name="selectable">1</property>
-                        <property name="no-show-all">1</property>
                         <property name="max-width-chars">60</property>
                       </object>
                       <packing>
@@ -115,12 +115,12 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="license_label">
+                        <property name="visible">0</property>
                         <property name="label">license</property>
                         <property name="use-markup">1</property>
                         <property name="justify">center</property>
                         <property name="wrap">1</property>
                         <property name="selectable">1</property>
-                        <property name="no-show-all">1</property>
                         <property name="max-width-chars">60</property>
                       </object>
                       <packing>
@@ -135,7 +135,7 @@
                 </child>
                 <child>
                   <object class="GtkBox" id="credits_page">
-                    <property name="no-show-all">1</property>
+                    <property name="visible">0</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">8</property>
                     <child>
@@ -175,7 +175,7 @@
                 </child>
                 <child>
                   <object class="GtkBox" id="license_page">
-                    <property name="no-show-all">1</property>
+                    <property name="visible">0</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">8</property>
                     <child>
@@ -208,7 +208,7 @@
                 </child>
                 <child>
                   <object class="GtkBox" id="system_page">
-                    <property name="no-show-all">1</property>
+                    <property name="visible">0</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">8</property>
                     <child>
diff --git a/gtk/ui/gtkappchooserwidget.ui b/gtk/ui/gtkappchooserwidget.ui
index 6e158ec4d5..0e77ca2296 100644
--- a/gtk/ui/gtkappchooserwidget.ui
+++ b/gtk/ui/gtkappchooserwidget.ui
@@ -96,8 +96,8 @@
         </child>
         <child type="overlay">
           <object class="GtkBox" id="no_apps">
+            <property name="visible">0</property>
             <property name="orientation">vertical</property>
-            <property name="no-show-all">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <child>
diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui
index feed24c897..719fa69f6f 100644
--- a/gtk/ui/gtkassistant.ui
+++ b/gtk/ui/gtkassistant.ui
@@ -47,11 +47,11 @@
                 <property name="margin">6</property>
                 <child>
                   <object class="GtkButton" id="apply">
+                    <property name="visible">0</property>
                     <property name="label" translatable="yes">_Apply</property>
                     <property name="can-focus">1</property>
                     <property name="can-default">1</property>
                     <property name="receives-default">1</property>
-                    <property name="no-show-all">1</property>
                     <property name="use-underline">1</property>
                     <style>
                       <class name="text-button"/>
@@ -70,7 +70,6 @@
                     <property name="can-focus">1</property>
                     <property name="can-default">1</property>
                     <property name="receives-default">1</property>
-                    <property name="no-show-all">1</property>
                     <property name="use-underline">1</property>
                     <style>
                       <class name="text-button"/>
@@ -89,7 +88,6 @@
                     <property name="visible">1</property>
                     <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
-                    <property name="no-show-all">1</property>
                     <property name="use-underline">1</property>
                     <style>
                       <class name="text-button"/>
@@ -104,10 +102,10 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="last">
+                    <property name="visible">0</property>
                     <property name="label" translatable="yes">_Finish</property>
                     <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
-                    <property name="no-show-all">1</property>
                     <property name="use-underline">1</property>
                     <style>
                       <class name="text-button"/>
@@ -122,11 +120,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="cancel">
+                    <property name="visible">0</property>
                     <property name="label" translatable="yes">_Cancel</property>
                     <property name="visible">1</property>
                     <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
-                    <property name="no-show-all">1</property>
                     <property name="use-underline">1</property>
                     <style>
                       <class name="text-button"/>
@@ -141,11 +139,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="close">
+                    <property name="visible">0</property>
                     <property name="label" translatable="yes">_Close</property>
                     <property name="can-focus">1</property>
                     <property name="can-default">1</property>
                     <property name="receives-default">1</property>
-                    <property name="no-show-all">1</property>
                     <property name="use-underline">1</property>
                     <style>
                       <class name="text-button"/>
diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui
index 6bc078e556..fbef1e7cbb 100644
--- a/gtk/ui/gtkcoloreditor.ui
+++ b/gtk/ui/gtkcoloreditor.ui
@@ -135,7 +135,6 @@
   </template>
   <object class="GtkBox" id="a_popup">
     <property name="visible">0</property>
-    <property name="no-show-all">1</property>
     <style>
       <class name="popover"/>
       <class name="osd"/>
@@ -182,7 +181,6 @@
   </object>
   <object class="GtkBox" id="h_popup">
     <property name="visible">0</property>
-    <property name="no-show-all">1</property>
     <style>
       <class name="popover"/>
       <class name="osd"/>
@@ -229,7 +227,6 @@
   </object>
   <object class="GtkBox" id="sv_popup">
     <property name="visible">0</property>
-    <property name="no-show-all">1</property>
     <style>
       <class name="popover"/>
       <class name="osd"/>
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 4772a1187a..3b72c71b3a 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -77,7 +77,7 @@
                             </child>
                             <child>
                               <object class="GtkBox" id="location_entry_box">
-                                <property name="no-show-all">1</property>
+                                <property name="visible">0</property>
                                 <property name="spacing">6</property>
                                 <property name="margin">6</property>
                               </object>
@@ -87,7 +87,7 @@
                             </child>
                             <child>
                               <object class="GtkBox" id="search_entry_box">
-                                <property name="no-show-all">1</property>
+                                <property name="visible">0</property>
                                 <property name="spacing">6</property>
                                 <property name="margin">6</property>
                                 <child type="center">
@@ -352,7 +352,6 @@
     <child>
       <object class="GtkActionBar" id="extra_and_filters">
         <property name="visible">0</property>
-        <property name="no-show-all">1</property>
         <child>
           <object class="GtkBox" id="extra_align">
             <property name="spacing">12</property>
diff --git a/gtk/ui/gtkfontbutton.ui b/gtk/ui/gtkfontbutton.ui
index ac72a85519..bf6a59cb36 100644
--- a/gtk/ui/gtkfontbutton.ui
+++ b/gtk/ui/gtkfontbutton.ui
@@ -20,7 +20,6 @@
         <child>
           <object class="GtkBox" id="font_size_box">
             <property name="visible">1</property>
-            <property name="no-show-all">1</property>
             <child>
               <object class="GtkSeparator" id="separator">
                 <property name="visible">1</property>
diff --git a/gtk/ui/gtkinfobar.ui b/gtk/ui/gtkinfobar.ui
index 6bdc31b419..d49833eb6e 100644
--- a/gtk/ui/gtkinfobar.ui
+++ b/gtk/ui/gtkinfobar.ui
@@ -33,6 +33,7 @@
             </child>
             <child>
               <object class="GtkButton" id="close_button">
+                <property name="visible">0</property>
                 <property name="can-focus">1</property>
                 <property name="relief">none</property>
                 <property name="margin">6</property>
diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui
index ed0626c781..e0b311cef0 100644
--- a/gtk/ui/gtkmessagedialog.ui
+++ b/gtk/ui/gtkmessagedialog.ui
@@ -40,7 +40,7 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="secondary_label">
-                    <property name="no-show-all">1</property>
+                    <property name="visible">0</property>
                     <property name="margin-bottom">2</property>
                     <property name="halign">center</property>
                     <property name="valign">start</property>
diff --git a/gtk/ui/gtksearchbar.ui b/gtk/ui/gtksearchbar.ui
index 7b520bd74a..05dde48fd8 100644
--- a/gtk/ui/gtksearchbar.ui
+++ b/gtk/ui/gtksearchbar.ui
@@ -40,7 +40,7 @@
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkButton" id="close_button">
-                    <property name="visible">1</property>
+                    <property name="visible">0</property>
                     <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
                     <property name="relief">none</property>
diff --git a/gtk/ui/gtksidebarrow.ui b/gtk/ui/gtksidebarrow.ui
index 3e66797a19..66b23ba920 100644
--- a/gtk/ui/gtksidebarrow.ui
+++ b/gtk/ui/gtksidebarrow.ui
@@ -45,7 +45,6 @@
                     <property name="halign">center</property>
                     <property name="valign">center</property>
                     <property name="margin-start">4px</property>
-                    <property name="no-show-all">1</property>
                     <property name="icon-name">media-eject-symbolic</property>
                     <style>
                       <class name="sidebar-button"/>
diff --git a/tests/selectionmode.ui b/tests/selectionmode.ui
index e5799e3070..abe79d185e 100644
--- a/tests/selectionmode.ui
+++ b/tests/selectionmode.ui
@@ -20,7 +20,6 @@
         <child>
           <object class="GtkButton" id="headerbutton">
             <property name="visible">True</property>
-            <property name="no-show-all">True</property>
             <style>
               <class name="image-button"/>
             </style>
@@ -48,7 +47,7 @@
               <packing>
                 <property name="name">title</property>
               </packing>
-            </child> 
+            </child>
             <child>
               <object class="GtkMenuButton">
                 <property name="visible">True</property>
@@ -83,7 +82,6 @@
         <child>
           <object class="GtkButton" id="select-button">
             <property name="visible">True</property>
-            <property name="no-show-all">True</property>
             <style>
               <class name="image-button"/>
             </style>
@@ -101,7 +99,7 @@
         </child>
         <child>
           <object class="GtkButton" id="cancel-button">
-            <property name="no-show-all">True</property>
+            <property name="visible">0</property>
             <property name="label">Cancel</property>
           </object>
           <packing>
@@ -120,7 +118,7 @@
             <property name="visible">True</property>
             <property name="selection-mode">none</property>
             <property name="activate-on-single-click">True</property>
-          </object> 
+          </object>
         </child>
       </object>
     </child>
diff --git a/tests/testscrolledge.c b/tests/testscrolledge.c
index a55939831a..3844575e62 100644
--- a/tests/testscrolledge.c
+++ b/tests/testscrolledge.c
@@ -114,7 +114,7 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (popup), spinner);
 
   gtk_overlay_add_overlay (GTK_OVERLAY (overlay), popup);
-  gtk_widget_set_no_show_all (popup, TRUE);
+  gtk_widget_hide (popup);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);