summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--demos/gtk-demo/builder.c4
-rw-r--r--demos/widget-factory/widget-factory.c2
-rw-r--r--docs/reference/gtk/migrating-4to5.md5
-rw-r--r--gtk/deprecated/gtklockbutton.c (renamed from gtk/gtklockbutton.c)0
-rw-r--r--gtk/deprecated/gtklockbutton.h (renamed from gtk/gtklockbutton.h)0
-rw-r--r--gtk/deprecated/gtklockbuttonprivate.h (renamed from gtk/gtklockbuttonprivate.h)0
-rw-r--r--gtk/deprecated/gtkstatusbar.c (renamed from gtk/gtkstatusbar.c)2
-rw-r--r--gtk/deprecated/gtkstatusbar.h (renamed from gtk/gtkstatusbar.h)12
-rw-r--r--gtk/deprecated/meson.build2
-rw-r--r--gtk/gtk.h2
-rw-r--r--gtk/meson.build2
-rw-r--r--tests/testcolumnview.c2
-rw-r--r--tests/testlistview.c2
-rw-r--r--testsuite/reftests/statusbar-remove-all.c1
14 files changed, 27 insertions, 9 deletions
diff --git a/demos/gtk-demo/builder.c b/demos/gtk-demo/builder.c
index 54e777d8c3..126ea9c9b8 100644
--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -37,6 +37,8 @@ remove_timeout (gpointer data)
g_source_remove (id);
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
static gboolean
pop_status (gpointer data)
{
@@ -57,6 +59,8 @@ status_message (GtkStatusbar *status,
g_object_set_data_full (G_OBJECT (status), "timeout", GUINT_TO_POINTER (id), remove_timeout);
}
+G_GNUC_END_IGNORE_DEPRECATIONS
+
static void
help_activate (GSimpleAction *action,
GVariant *parameter,
diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index 146ecfab26..58cbae10d0 100644
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -2252,11 +2252,13 @@ activate (GApplication *app)
for (i = 0; i < G_N_ELEMENTS (accels); i++)
gtk_application_set_accels_for_action (GTK_APPLICATION (app), accels[i].action_and_target, accels[i].accelerators);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
widget = (GtkWidget *)gtk_builder_get_object (builder, "statusbar");
gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "All systems are operating normally.");
action = G_ACTION (g_property_action_new ("statusbar", widget, "visible"));
g_action_map_add_action (G_ACTION_MAP (window), action);
g_object_unref (G_OBJECT (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbar");
action = G_ACTION (g_property_action_new ("toolbar", widget, "visible"));
diff --git a/docs/reference/gtk/migrating-4to5.md b/docs/reference/gtk/migrating-4to5.md
index 04a8b19c5f..54f35906f5 100644
--- a/docs/reference/gtk/migrating-4to5.md
+++ b/docs/reference/gtk/migrating-4to5.md
@@ -109,3 +109,8 @@ Other libraries, such as libadwaita, may provide replacements as well.
## gtk_show_uri is being replaced
Instead of gtk_show_uri(), you should use GtkUriLauncher or GtkFileLauncher.
+
+## GtkStatusbar is going away
+
+This is an oldfashioned widget that does not do all that much anymore, since
+it no longer has a resize handle for the window.
diff --git a/gtk/gtklockbutton.c b/gtk/deprecated/gtklockbutton.c
index 5f94cfa372..5f94cfa372 100644
--- a/gtk/gtklockbutton.c
+++ b/gtk/deprecated/gtklockbutton.c
diff --git a/gtk/gtklockbutton.h b/gtk/deprecated/gtklockbutton.h
index 5d24b06f38..5d24b06f38 100644
--- a/gtk/gtklockbutton.h
+++ b/gtk/deprecated/gtklockbutton.h
diff --git a/gtk/gtklockbuttonprivate.h b/gtk/deprecated/gtklockbuttonprivate.h
index f029bf8b67..f029bf8b67 100644
--- a/gtk/gtklockbuttonprivate.h
+++ b/gtk/deprecated/gtklockbuttonprivate.h
diff --git a/gtk/gtkstatusbar.c b/gtk/deprecated/gtkstatusbar.c
index 5cbea341d2..a5bb70de54 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/deprecated/gtkstatusbar.c
@@ -36,6 +36,8 @@
#include "gtktypebuiltins.h"
#include "gtkwidgetprivate.h"
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
/**
* GtkStatusbar:
*
diff --git a/gtk/gtkstatusbar.h b/gtk/deprecated/gtkstatusbar.h
index 39b710b227..d1a2356515 100644
--- a/gtk/gtkstatusbar.h
+++ b/gtk/deprecated/gtkstatusbar.h
@@ -42,23 +42,23 @@ typedef struct _GtkStatusbar GtkStatusbar;
GDK_AVAILABLE_IN_ALL
GType gtk_statusbar_get_type (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
GtkWidget* gtk_statusbar_new (void);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
guint gtk_statusbar_get_context_id (GtkStatusbar *statusbar,
const char *context_description);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
guint gtk_statusbar_push (GtkStatusbar *statusbar,
guint context_id,
const char *text);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
void gtk_statusbar_pop (GtkStatusbar *statusbar,
guint context_id);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
void gtk_statusbar_remove (GtkStatusbar *statusbar,
guint context_id,
guint message_id);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
void gtk_statusbar_remove_all (GtkStatusbar *statusbar,
guint context_id);
diff --git a/gtk/deprecated/meson.build b/gtk/deprecated/meson.build
index dd6c8ade9d..84f6f11d04 100644
--- a/gtk/deprecated/meson.build
+++ b/gtk/deprecated/meson.build
@@ -33,6 +33,7 @@ gtk_deprecated_sources = [
'deprecated/gtkliststore.c',
'deprecated/gtkrender.c',
'deprecated/gtkshow.c',
+ 'deprecated/gtkstatusbar.c',
'deprecated/gtkstylecontext.c',
'deprecated/gtktreedatalist.c',
'deprecated/gtktreednd.c',
@@ -90,6 +91,7 @@ gtk_deprecated_headers = [
'deprecated/gtkmessagedialog.h',
'deprecated/gtkrender.h',
'deprecated/gtkshow.h',
+ 'deprecated/gtkstatusbar.h',
'deprecated/gtkstylecontext.h',
'deprecated/gtktreednd.h',
'deprecated/gtktreemodel.h',
diff --git a/gtk/gtk.h b/gtk/gtk.h
index ccb9c98fa3..6d14c88ded 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -252,7 +252,7 @@
#include <gtk/gtkspinner.h>
#include <gtk/gtkstack.h>
#include <gtk/gtkstackswitcher.h>
-#include <gtk/gtkstatusbar.h>
+#include <gtk/deprecated/gtkstatusbar.h>
#include <gtk/gtkstringfilter.h>
#include <gtk/gtkstringlist.h>
#include <gtk/gtkstringsorter.h>
diff --git a/gtk/meson.build b/gtk/meson.build
index 13d2404630..281c652f3d 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -360,7 +360,6 @@ gtk_public_sources = files([
'gtkstack.c',
'gtkstacksidebar.c',
'gtkstackswitcher.c',
- 'gtkstatusbar.c',
'gtkstringfilter.c',
'gtkstringlist.c',
'gtkstringsorter.c',
@@ -593,7 +592,6 @@ gtk_public_headers = files([
'gtkstack.h',
'gtkstacksidebar.h',
'gtkstackswitcher.h',
- 'gtkstatusbar.h',
'gtkstringfilter.h',
'gtkstringlist.h',
'gtkstringsorter.h',
diff --git a/tests/testcolumnview.c b/tests/testcolumnview.c
index 6b85251b50..4039e9ec79 100644
--- a/tests/testcolumnview.c
+++ b/tests/testcolumnview.c
@@ -1,5 +1,7 @@
#include <gtk/gtk.h>
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
GSList *pending = NULL;
guint active = 0;
diff --git a/tests/testlistview.c b/tests/testlistview.c
index 2ceb672169..f0f172f98f 100644
--- a/tests/testlistview.c
+++ b/tests/testlistview.c
@@ -1,5 +1,7 @@
#include <gtk/gtk.h>
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
#define FILE_INFO_TYPE_SELECTION (file_info_selection_get_type ())
G_DECLARE_FINAL_TYPE (FileInfoSelection, file_info_selection, FILE_INFO, SELECTION, GObject)
diff --git a/testsuite/reftests/statusbar-remove-all.c b/testsuite/reftests/statusbar-remove-all.c
index 6960fd1625..2a4ac7cbdb 100644
--- a/testsuite/reftests/statusbar-remove-all.c
+++ b/testsuite/reftests/statusbar-remove-all.c
@@ -17,6 +17,7 @@
#include <gtk/gtk.h>
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
G_MODULE_EXPORT void
statusbar_remove_all (GtkStatusbar *s)
View Lorry Controller Status