diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c index 58cbae10d0..45406086b2 100644 --- a/demos/widget-factory/widget-factory.c +++ b/demos/widget-factory/widget-factory.c @@ -2432,6 +2432,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS widget = (GtkWidget *)gtk_builder_get_object (builder, "record_button"); g_object_set_data (G_OBJECT (window), "record_button", widget); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS widget = (GtkWidget *)gtk_builder_get_object (builder, "lockbox"); widget2 = (GtkWidget *)gtk_builder_get_object (builder, "lockbutton"); g_object_set_data (G_OBJECT (window), "lockbutton", widget2); @@ -2449,6 +2450,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS G_BINDING_SYNC_CREATE); gtk_lock_button_set_permission (GTK_LOCK_BUTTON (widget2), permission); g_object_unref (permission); +G_GNUC_END_IGNORE_DEPRECATIONS widget = (GtkWidget *)gtk_builder_get_object (builder, "iconview1"); widget2 = (GtkWidget *)gtk_builder_get_object (builder, "increase_button"); diff --git a/docs/reference/gtk/migrating-4to5.md b/docs/reference/gtk/migrating-4to5.md index 54f35906f5..ebec512d4a 100644 --- a/docs/reference/gtk/migrating-4to5.md +++ b/docs/reference/gtk/migrating-4to5.md @@ -114,3 +114,8 @@ Instead of gtk_show_uri(), you should use GtkUriLauncher or GtkFileLauncher. This is an oldfashioned widget that does not do all that much anymore, since it no longer has a resize handle for the window. + +## GtkLockButton is going away + +This is an very specialized widget that should better live with the application +where it is used. diff --git a/gtk/deprecated/gtklockbutton.c b/gtk/deprecated/gtklockbutton.c index 5f94cfa372..39a0741e3b 100644 --- a/gtk/deprecated/gtklockbutton.c +++ b/gtk/deprecated/gtklockbutton.c @@ -28,6 +28,8 @@ #include "gtkstack.h" #include "gtkprivate.h" +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + /** * GtkLockButton: * diff --git a/gtk/deprecated/gtklockbutton.h b/gtk/deprecated/gtklockbutton.h index 5d24b06f38..a6a9203fca 100644 --- a/gtk/deprecated/gtklockbutton.h +++ b/gtk/deprecated/gtklockbutton.h @@ -32,11 +32,11 @@ typedef struct _GtkLockButton GtkLockButton; GDK_AVAILABLE_IN_ALL GType gtk_lock_button_get_type (void) G_GNUC_CONST; -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 GtkWidget *gtk_lock_button_new (GPermission *permission); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 GPermission *gtk_lock_button_get_permission (GtkLockButton *button); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_lock_button_set_permission (GtkLockButton *button, GPermission *permission); diff --git a/gtk/deprecated/meson.build b/gtk/deprecated/meson.build index 84f6f11d04..1e7c5c14f8 100644 --- a/gtk/deprecated/meson.build +++ b/gtk/deprecated/meson.build @@ -31,6 +31,7 @@ gtk_deprecated_sources = [ 'deprecated/gtkiconview.c', 'deprecated/gtkinfobar.c', 'deprecated/gtkliststore.c', + 'deprecated/gtklockbutton.c', 'deprecated/gtkrender.c', 'deprecated/gtkshow.c', 'deprecated/gtkstatusbar.c', @@ -88,6 +89,7 @@ gtk_deprecated_headers = [ 'deprecated/gtkiconview.h', 'deprecated/gtkinfobar.h', 'deprecated/gtkliststore.h', + 'deprecated/gtklockbutton.h', 'deprecated/gtkmessagedialog.h', 'deprecated/gtkrender.h', 'deprecated/gtkshow.h', diff --git a/gtk/gtk.h b/gtk/gtk.h index 6d14c88ded..91215e6de0 100644 --- a/gtk/gtk.h +++ b/gtk/gtk.h @@ -177,7 +177,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/gtk/meson.build b/gtk/meson.build index 281c652f3d..322909a947 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -276,7 +276,6 @@ gtk_public_sources = files([ 'gtklistitemwidget.c', 'gtklistlistmodel.c', 'gtklistview.c', - 'gtklockbutton.c', 'gtkmain.c', 'gtkmaplistmodel.c', 'gtkmediacontrols.c', @@ -520,7 +519,6 @@ gtk_public_headers = files([ 'gtklistitem.h', 'gtklistitemfactory.h', 'gtklistview.h', - 'gtklockbutton.h', 'gtkmain.h', 'gtkmaplistmodel.h', 'gtkmediacontrols.h',