diff options
author | Matthias Clasen <mclasen@redhat.com> | 2019-02-06 02:06:19 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2019-02-06 02:06:19 -0500 |
commit | e91144f6c95fc7f5b1b2f3064808387207380f4d (patch) | |
tree | 01a2f50960b53b7b545b9f8892de31007309f205 | |
parent | a75dcce70736490c5404297a1a1f50f653343ec6 (diff) | |
download | gtk+-e91144f6c95fc7f5b1b2f3064808387207380f4d.tar.gz |
Make GtkInvisible private
We can't quite get rid of its use in the inspector,
but we can make it private.
-rw-r--r-- | docs/reference/gtk/gtk4-docs.xml | 1 | ||||
-rw-r--r-- | docs/reference/gtk/gtk4-sections.txt | 17 | ||||
-rw-r--r-- | docs/reference/gtk/gtk4.types.in | 1 | ||||
-rw-r--r-- | gtk/gtk-autocleanups.h | 1 | ||||
-rw-r--r-- | gtk/gtk.h | 1 | ||||
-rw-r--r-- | gtk/gtkinvisible.c | 2 | ||||
-rw-r--r-- | gtk/gtkinvisibleprivate.h (renamed from gtk/gtkinvisible.h) | 0 | ||||
-rw-r--r-- | gtk/gtkwidgetprivate.h | 2 | ||||
-rw-r--r-- | gtk/inspector/inspect-button.c | 2 | ||||
-rw-r--r-- | gtk/meson.build | 1 | ||||
-rw-r--r-- | testsuite/gtk/objects-finalize.c | 2 |
11 files changed, 4 insertions, 26 deletions
diff --git a/docs/reference/gtk/gtk4-docs.xml b/docs/reference/gtk/gtk4-docs.xml index 7c1a4a0247..a5e25803fa 100644 --- a/docs/reference/gtk/gtk4-docs.xml +++ b/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> diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index 9893562527..0e72ba604c 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -1587,23 +1587,6 @@ 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> GtkLabel diff --git a/docs/reference/gtk/gtk4.types.in b/docs/reference/gtk/gtk4.types.in index d2bd9d704f..26c78079cf 100644 --- a/docs/reference/gtk/gtk4.types.in +++ b/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 diff --git a/gtk/gtk-autocleanups.h b/gtk/gtk-autocleanups.h index 8966a3dca1..5ccb245539 100644 --- a/gtk/gtk-autocleanups.h +++ b/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) @@ -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> diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c index 340780481e..37821039a6 100644 --- a/gtk/gtkinvisible.c +++ b/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" diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisibleprivate.h index f625a35684..f625a35684 100644 --- a/gtk/gtkinvisible.h +++ b/gtk/gtkinvisibleprivate.h diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h index f658811358..c70a5e9e62 100644 --- a/gtk/gtkwidgetprivate.h +++ b/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 diff --git a/gtk/inspector/inspect-button.c b/gtk/inspector/inspect-button.c index 489acb3286..7297db3043 100644 --- a/gtk/inspector/inspect-button.c +++ b/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" diff --git a/gtk/meson.build b/gtk/meson.build index 8b43e7deef..d81a5ef923 100644 --- a/gtk/meson.build +++ b/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', diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c index cced1ccd46..3e64c2ff22 100644 --- a/testsuite/gtk/objects-finalize.c +++ b/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); |