diff options
| -rw-r--r-- | docs/reference/gtk/gtk-docs.sgml | 2 | ||||
| -rw-r--r-- | gtk/Makefile.am | 4 | ||||
| -rw-r--r-- | gtk/deprecated/gtkarrow.c (renamed from gtk/gtkarrow.c) | 9 | ||||
| -rw-r--r-- | gtk/deprecated/gtkarrow.h (renamed from gtk/gtkarrow.h) | 6 | ||||
| -rw-r--r-- | gtk/gtk.h | 2 |
5 files changed, 16 insertions, 7 deletions
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index 8e749b464b..dc0b970466 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -240,7 +240,6 @@ <chapter id="MiscObjects"> <title>Miscellaneous</title> <xi:include href="xml/gtkadjustment.xml" /> - <xi:include href="xml/gtkarrow.xml" /> <xi:include href="xml/gtkcalendar.xml" /> <xi:include href="xml/gtkdrawingarea.xml" /> <xi:include href="xml/gtkeventbox.xml" /> @@ -324,6 +323,7 @@ <xi:include href="xml/gtkstock.xml" /> <xi:include href="xml/gtkiconfactory.xml" /> <xi:include href="xml/gtknumerableicon.xml" /> + <xi:include href="xml/gtkarrow.xml" /> </chapter> </part> diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 2ad225f0b8..25691226b0 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -157,6 +157,7 @@ deprecated_h_sources = \ deprecated/gtkactivatable.h \ deprecated/gtkaction.h \ deprecated/gtkactiongroup.h \ + deprecated/gtkarrow.h \ deprecated/gtkcolorsel.h \ deprecated/gtkcolorseldialog.h \ deprecated/gtkfontsel.h \ @@ -214,7 +215,6 @@ gtk_public_h_sources = \ gtkappchooserwidget.h \ gtkapplication.h \ gtkapplicationwindow.h \ - gtkarrow.h \ gtkaspectframe.h \ gtkassistant.h \ gtkbbox.h \ @@ -584,6 +584,7 @@ deprecated_c_sources = \ deprecated/gtkactivatable.c \ deprecated/gtkaction.c \ deprecated/gtkactiongroup.c \ + deprecated/gtkarrow.c \ deprecated/gtkcolorsel.c \ deprecated/gtkcolorseldialog.c \ deprecated/gtkfontsel.c \ @@ -646,7 +647,6 @@ gtk_base_c_sources = \ gtkapplication.c \ gtkapplicationimpl.c \ gtkapplicationwindow.c \ - gtkarrow.c \ gtkaspectframe.c \ gtkassistant.c \ gtkbbox.c \ diff --git a/gtk/gtkarrow.c b/gtk/deprecated/gtkarrow.c index 0b09097648..b4c14d1c28 100644 --- a/gtk/gtkarrow.c +++ b/gtk/deprecated/gtkarrow.c @@ -40,6 +40,9 @@ * * Arrows are created with a call to gtk_arrow_new(). The direction or * style of an arrow can be changed after creation by using gtk_arrow_set(). + * + * GtkArrow has been deprecated; you can simply use a #GtkImage with a + * suitable icon name, such as “pan-down-symbolic“. */ #include "config.h" @@ -52,6 +55,8 @@ #include "a11y/gtkarrowaccessible.h" +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + #define MIN_ARROW_SIZE 15 struct _GtkArrowPrivate @@ -232,6 +237,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS * Creates a new #GtkArrow widget. * * Returns: the new #GtkArrow widget. + * + * Deprecated: 3.14: Use a #GtkImage with a suitable icon. */ GtkWidget* gtk_arrow_new (GtkArrowType arrow_type, @@ -257,6 +264,8 @@ gtk_arrow_new (GtkArrowType arrow_type, * @shadow_type: a valid #GtkShadowType. * * Sets the direction and style of the #GtkArrow, @arrow. + * + * Deprecated: 3.14: Use a #GtkImage with a suitable icon. */ void gtk_arrow_set (GtkArrow *arrow, diff --git a/gtk/gtkarrow.h b/gtk/deprecated/gtkarrow.h index 3d19336786..faf67bc399 100644 --- a/gtk/gtkarrow.h +++ b/gtk/deprecated/gtkarrow.h @@ -67,12 +67,12 @@ struct _GtkArrowClass }; -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_3_14 GType gtk_arrow_get_type (void) G_GNUC_CONST; -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_3_14 GtkWidget* gtk_arrow_new (GtkArrowType arrow_type, GtkShadowType shadow_type); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_3_14 void gtk_arrow_set (GtkArrow *arrow, GtkArrowType arrow_type, GtkShadowType shadow_type); @@ -43,7 +43,6 @@ #include <gtk/gtkappchooserbutton.h> #include <gtk/gtkapplication.h> #include <gtk/gtkapplicationwindow.h> -#include <gtk/gtkarrow.h> #include <gtk/gtkaspectframe.h> #include <gtk/gtkassistant.h> #include <gtk/gtkbbox.h> @@ -223,6 +222,7 @@ #include <gtk/gtkwindow.h> #ifndef GTK_DISABLE_DEPRECATED +#include <gtk/deprecated/gtkarrow.h> #include <gtk/deprecated/gtkactivatable.h> #include <gtk/deprecated/gtkaction.h> #include <gtk/deprecated/gtkactiongroup.h> |