Deprecate h/v variants of GtkScale

This has been discussed in bug 541009.

diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c
index 84ea86a6b128d437b953f560a2abcbec30ea5f4c..e19a5b6b043330b2650579942726d00c0fa420b2 100644 (file)
--- a/gtk/gtkhscale.c
+++ b/gtk/gtkhscale.c
@@ -29,6 +29,7 @@
 #include <math.h>
 #include <stdlib.h>
 
+#undef GTK_DISABLE_DEPRECATED
 #include "gtkhscale.h"
 #include "gtkorientable.h"
 
@@ -43,6 +44,8 @@
  *
  * The position to show the current value, and the number of decimal places
  * shown can be set using the parent #GtkScale class's functions.
+ *
+ * GtkHScale has been deprecated, use #GtkScale instead.
  */
 
 
@@ -70,6 +73,8 @@ gtk_hscale_init (GtkHScale *hscale)
  * Creates a new #GtkHScale.
  *
  * Returns: a new #GtkHScale.
+ *
+ * Deprecated: 3.2: Use gtk_scale_new() with %GTK_ORIENTATION_HORIZONTAL instead
  */
 GtkWidget *
 gtk_hscale_new (GtkAdjustment *adjustment)
@@ -98,6 +103,8 @@ gtk_hscale_new (GtkAdjustment *adjustment)
  * needs, use gtk_scale_set_digits() to correct it.
  *
  * Return value: a new #GtkHScale
+ *
+ * Deprecated: 3.2: Use gtk_scale_new_with_range() with %GTK_ORIENTATION_HORIZONTAL instead
  **/
 GtkWidget *
 gtk_hscale_new_with_range (gdouble min,

diff --git a/gtk/gtkhscale.h b/gtk/gtkhscale.h
index 9ecfd699fb5e461d6ad6d634e7fbc127c661af7f..863d06520f5cf1b339416404bb78e38b5c8543b1 100644 (file)
--- a/gtk/gtkhscale.h
+++ b/gtk/gtkhscale.h
@@ -31,6 +31,7 @@
 #ifndef __GTK_HSCALE_H__
 #define __GTK_HSCALE_H__
 
+#ifndef GTK_DISABLE_DEPRECATED
 
 #include <gtk/gtkscale.h>
 
@@ -68,4 +69,6 @@ GtkWidget* gtk_hscale_new_with_range (gdouble        min,
 
 G_END_DECLS
 
+#endif
+
 #endif /* __GTK_HSCALE_H__ */

diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c
index af7fa4073ab8b49dc1c51aa600b6888b52b9510f..45b540c2123dc1c7cae68c5e756f0c28134937fe 100644 (file)
--- a/gtk/gtkvscale.c
+++ b/gtk/gtkvscale.c
@@ -29,6 +29,7 @@
 #include <math.h>
 #include <stdlib.h>
 
+#undef GTK_DISABLE_DEPRECATED
 #include "gtkvscale.h"
 #include "gtkorientable.h"
 
@@ -43,6 +44,8 @@
  *
  * The position to show the current value, and the number of decimal places
  * shown can be set using the parent #GtkScale class's functions.
+ *
+ * GtkVScale has been deprecated, use #GtkScale instead.
  */
 
 G_DEFINE_TYPE (GtkVScale, gtk_vscale, GTK_TYPE_SCALE)
@@ -68,6 +71,8 @@ gtk_vscale_init (GtkVScale *vscale)
  * Creates a new #GtkVScale.
  *
  * Returns: a new #GtkVScale.
+ *
+ * Deprecated: 3.2: Use gtk_scale_new() with %GTK_ORIENTATION_VERTICAL instead
  */
 GtkWidget *
 gtk_vscale_new (GtkAdjustment *adjustment)
@@ -96,6 +101,8 @@ gtk_vscale_new (GtkAdjustment *adjustment)
  * needs, use gtk_scale_set_digits() to correct it.
  *
  * Return value: a new #GtkVScale
+ *
+ * Deprecated: 3.2: Use gtk_scale_new_with_range() with %GTK_ORIENTATION_VERTICAL instead
  **/
 GtkWidget *
 gtk_vscale_new_with_range (gdouble min,

diff --git a/gtk/gtkvscale.h b/gtk/gtkvscale.h
index ce4953e5ecf97df4215e2d3fbc5f3645f33016bc..be2ed7904c17b710e1876c1e1ed53065d937a44b 100644 (file)
--- a/gtk/gtkvscale.h
+++ b/gtk/gtkvscale.h
@@ -31,6 +31,7 @@
 #ifndef __GTK_VSCALE_H__
 #define __GTK_VSCALE_H__
 
+#ifndef GTK_DISABLE_DEPRECATED
 
 #include <gtk/gtkscale.h>
 
@@ -75,5 +76,6 @@ GtkWidget* gtk_vscale_new_with_range (gdouble        min,
 
 G_END_DECLS
 
+#endif
 
 #endif /* __GTK_VSCALE_H__ */