diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkactiongroup.h | 4 | ||||
| -rw-r--r-- | gtk/gtkcontainer.c | 6 | ||||
| -rw-r--r-- | gtk/gtkiconhelper.c | 2 | ||||
| -rw-r--r-- | gtk/gtknotebook.h | 4 | ||||
| -rw-r--r-- | gtk/gtkstylecontext.h | 6 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 2 |
6 files changed, 17 insertions, 7 deletions
diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h index eae4bbe3b4..625fe89762 100644 --- a/gtk/gtkactiongroup.h +++ b/gtk/gtkactiongroup.h @@ -178,9 +178,9 @@ gboolean gtk_action_group_get_visible (GtkActionGroup GDK_DEPRECATED_IN_3_10 void gtk_action_group_set_visible (GtkActionGroup *action_group, gboolean visible); -GDK_AVAILABLE_IN_3_6 +GDK_DEPRECATED_IN_3_10 GtkAccelGroup *gtk_action_group_get_accel_group (GtkActionGroup *action_group); -GDK_AVAILABLE_IN_3_6 +GDK_DEPRECATED_IN_3_10 void gtk_action_group_set_accel_group (GtkActionGroup *action_group, GtkAccelGroup *accel_group); diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index 989a36f307..b1be6fe9b5 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -1889,6 +1889,12 @@ gtk_container_real_check_resize (GtkContainer *container) * so we simply need to reallocate and let the allocation * trickle down via GTK_WIDGET_ALLOC_NEEDED flags. */ +/** + * gtk_container_resize_children: + * @container: a #GtkContainer + * + * Deprecated: 3.10 + **/ void gtk_container_resize_children (GtkContainer *container) { diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c index a516d27542..c1af789523 100644 --- a/gtk/gtkiconhelper.c +++ b/gtk/gtkiconhelper.c @@ -748,11 +748,13 @@ _gtk_icon_helper_ensure_surface (GtkIconHelper *self, break; case GTK_IMAGE_STOCK: + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; icon_set = gtk_style_context_lookup_icon_set (context, self->priv->stock_id); if (icon_set != NULL) ensure_surface_for_icon_set (self, context, icon_set); else surface = NULL; + G_GNUC_END_IGNORE_DEPRECATIONS; break; case GTK_IMAGE_ICON_SET: diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h index dd32066df8..febfa9e3b8 100644 --- a/gtk/gtknotebook.h +++ b/gtk/gtknotebook.h @@ -217,9 +217,9 @@ void gtk_notebook_set_scrollable (GtkNotebook *notebook, gboolean scrollable); GDK_AVAILABLE_IN_ALL gboolean gtk_notebook_get_scrollable (GtkNotebook *notebook); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_3_4 guint16 gtk_notebook_get_tab_hborder (GtkNotebook *notebook); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_3_4 guint16 gtk_notebook_get_tab_vborder (GtkNotebook *notebook); /*********************************************************** diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h index 59012edd98..6b9dfd38b2 100644 --- a/gtk/gtkstylecontext.h +++ b/gtk/gtkstylecontext.h @@ -878,10 +878,10 @@ GDK_AVAILABLE_IN_ALL void gtk_style_context_get_style (GtkStyleContext *context, ...); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_3_10_FOR(gtk_icon_theme_lookup_icon) GtkIconSet * gtk_style_context_lookup_icon_set (GtkStyleContext *context, const gchar *stock_id); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_3_10 GdkPixbuf * gtk_icon_set_render_icon_pixbuf (GtkIconSet *icon_set, GtkStyleContext *context, GtkIconSize size); @@ -1087,7 +1087,7 @@ void gtk_render_activity (GtkStyleContext *context, gdouble y, gdouble width, gdouble height); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_3_10_FOR(gtk_icon_theme_load_icon) GdkPixbuf * gtk_render_icon_pixbuf (GtkStyleContext *context, const GtkIconSource *source, GtkIconSize size); diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 9997e578e0..865892a75d 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -9751,12 +9751,14 @@ gtk_widget_render_icon_pixbuf (GtkWidget *widget, g_return_val_if_fail (size > GTK_ICON_SIZE_INVALID || size == -1, NULL); context = gtk_widget_get_style_context (widget); + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; icon_set = gtk_style_context_lookup_icon_set (context, stock_id); if (icon_set == NULL) return NULL; return gtk_icon_set_render_icon_pixbuf (icon_set, context, size); + G_GNUC_END_IGNORE_DEPRECATIONS; } /** |