Merge branch 'less-invisible' into 'master'

Less invisible

See merge request GNOME/gtk!562

docs/reference/gtk/gtk4-docs.xml

@@ -71,7 +71,6 @@
       <xi:include href="xml/gtkmessagedialog.xml" />
       <xi:include href="xml/gtkaboutdialog.xml" />
       <xi:include href="xml/gtkassistant.xml" />
-      <xi:include href="xml/gtkinvisible.xml" />
       <xi:include href="xml/gtkwindowgroup.xml" />
     </chapter>
 

docs/reference/gtk/gtk4-sections.txt

@@ -1586,23 +1586,6 @@ gtk_im_multicontext_get_type
 GtkIMMulticontextPrivate
 </SECTION>
 
-<SECTION>
-<FILE>gtkinvisible</FILE>
-<TITLE>GtkInvisible</TITLE>
-GtkInvisible
-gtk_invisible_new
-<SUBSECTION Standard>
-GTK_INVISIBLE
-GTK_IS_INVISIBLE
-GTK_TYPE_INVISIBLE
-GTK_INVISIBLE_CLASS
-GTK_IS_INVISIBLE_CLASS
-GTK_INVISIBLE_GET_CLASS
-<SUBSECTION Private>
-gtk_invisible_get_type
-GtkInvisiblePrivate
-</SECTION>
-
 <SECTION>
 <FILE>gtklabel</FILE>
 <TITLE>GtkLabel</TITLE>

docs/reference/gtk/gtk4.types.in

@@ -90,7 +90,6 @@ gtk_im_context_get_type
 gtk_im_context_simple_get_type
 gtk_im_multicontext_get_type
 gtk_info_bar_get_type
-gtk_invisible_get_type
 gtk_label_get_type
 gtk_layout_get_type
 gtk_link_button_get_type

gtk/gtk-autocleanups.h

@@ -101,7 +101,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkIconTheme, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkIconView, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkImage, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkInfoBar, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkInvisible, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLayout, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLevelBar, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLinkButton, g_object_unref)

gtk/gtk.h

@@ -132,7 +132,6 @@
 #include <gtk/gtkimcontextsimple.h>
 #include <gtk/gtkimmulticontext.h>
 #include <gtk/gtkinfobar.h>
-#include <gtk/gtkinvisible.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtklayout.h>
 #include <gtk/gtklevelbar.h>

gtk/gtkfilechoosernativeportal.c

@@ -39,7 +39,6 @@
 #include "gtkheaderbar.h"
 #include "gtklabel.h"
 #include "gtkmain.h"
-#include "gtkinvisible.h"
 #include "gtkfilechooserentry.h"
 #include "gtkfilefilterprivate.h"
 #include "gtkwindowprivate.h"
@@ -391,9 +390,7 @@ window_handle_exported (GtkWindow  *window,
 
   if (data->modal)
     {
-      GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (window));
+      data->grab_widget = gtk_label_new ("");
-
-      data->grab_widget = gtk_invisible_new_for_display (display);
       gtk_grab_add (GTK_WIDGET (data->grab_widget));
     }
 

gtk/gtkinvisible.c

@@ -24,7 +24,7 @@
 
 #include "config.h"
 #include <gdk/gdk.h>
-#include "gtkinvisible.h"
+#include "gtkinvisibleprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"

gtk/gtkprintoperation-win32.c

@@ -41,7 +41,7 @@
 #include "gtkprintoperation-private.h"
 #include "gtkprint-win32.h"
 #include "gtkintl.h"
-#include "gtkinvisible.h"
+#include "gtkwindow.h"
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
 
@@ -1719,7 +1719,7 @@ gtk_print_operation_run_with_dialog (GtkPrintOperation *op,
   
   if (parent == NULL)
     {
-      invisible = gtk_invisible_new ();
+      invisible = gtk_window_new (GTK_WINDOW_POPUP);
       parentHWnd = get_parent_hwnd (invisible);
     }
   else 

gtk/gtktextbuffer.c

@@ -28,7 +28,6 @@
 #include <stdarg.h>
 
 #include "gtkdnd.h"
-#include "gtkinvisible.h"
 #include "gtkmarshalers.h"
 #include "gtktextbuffer.h"
 #include "gtktextbufferprivate.h"

gtk/gtkwidget.c

@@ -46,7 +46,6 @@
 #include "gtkgesturesingle.h"
 #include "gtkgestureswipe.h"
 #include "gtkintl.h"
-#include "gtkinvisible.h"
 #include "gtkmarshalers.h"
 #include "gtkmain.h"
 #include "gtkmenu.h"
@@ -11984,6 +11983,7 @@ static gboolean
 gtk_widget_class_get_visible_by_default (GtkWidgetClass *widget_class)
 {
   return !(GTK_IS_WINDOW_CLASS (widget_class) ||
+           GTK_IS_INVISIBLE_CLASS (widget_class) ||
            GTK_IS_POPOVER_CLASS (widget_class));
 }
 

gtk/gtkwidgetprivate.h

@@ -34,7 +34,7 @@
 #include "gtklistlistmodelprivate.h"
 #include "gtksizerequestcacheprivate.h"
 #include "gtkwindowprivate.h"
-#include "gtkinvisible.h"
+#include "gtkinvisibleprivate.h"
 #include "gtkgesture.h"
 
 G_BEGIN_DECLS

gtk/inspector/inspect-button.c

@@ -31,7 +31,7 @@
 
 #include "gtkstack.h"
 #include "gtkmain.h"
-#include "gtkinvisible.h"
+#include "gtkinvisibleprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkgesturemultipress.h"
 #include "gtkeventcontrollermotion.h"

gtk/meson.build

@@ -505,7 +505,6 @@ gtk_public_headers = files([
   'gtkimmodule.h',
   'gtkimmulticontext.h',
   'gtkinfobar.h',
-  'gtkinvisible.h',
   'gtklabel.h',
   'gtklayout.h',
   'gtklevelbar.h',

testsuite/gtk/objects-finalize.c

@@ -84,7 +84,7 @@ test_finalize_object (gconstpointer data)
   g_object_weak_ref (object, check_finalized, &finalized);
 
   /* Toplevels are owned by GTK+, just tell GTK+ to destroy it */
-  if (GTK_IS_WINDOW (object) || GTK_IS_INVISIBLE (object))
+  if (GTK_IS_WINDOW (object))
     gtk_widget_destroy (GTK_WIDGET (object));
   else
     g_object_unref (object);