Deprecate h/v subclasses of GtkScrollbar

This has been discussed in bug 541009.

diff --git a/gtk/gtkhscrollbar.c b/gtk/gtkhscrollbar.c
index 5b1f1fb9aec62800fb1076cc92d372d400bfe90c..0b0ad64718164bf046e4ef8ab2f59ed25f1eb2e7 100644 (file)
--- a/gtk/gtkhscrollbar.c
+++ b/gtk/gtkhscrollbar.c
@@ -27,6 +27,8 @@
 
 #include "config.h"
 
+#include "gtkscrollbar.h"
+#undef GTK_DISABLE_DEPRECATED
 #include "gtkhscrollbar.h"
 #include "gtkorientable.h"
 #include "gtkintl.h"
@@ -44,6 +46,8 @@
  * adjustment of the scrollbar or it may be left %NULL in which case one
  * will be created for you. See #GtkScrollbar for a description of what the
  * fields in an adjustment represent for a scrollbar.
+ *
+ * GtkHScrollbar has been deprecated, use #GtkScrollbar instead.
  */
 
 
@@ -69,6 +73,8 @@ gtk_hscrollbar_init (GtkHScrollbar *hscrollbar)
  * Creates a new horizontal scrollbar.
  *
  * Returns: the new #GtkHScrollbar
+ *
+ * Deprecated: 3.2: Use gtk_scrollbar_new() with %GTK_ORIENTATION_HORIZONTAL instead
  */
 GtkWidget *
 gtk_hscrollbar_new (GtkAdjustment *adjustment)

diff --git a/gtk/gtkhscrollbar.h b/gtk/gtkhscrollbar.h
index 2246c74dc57aa547b24b90b5933aa275a1c14df1..68f529b478462dd784e3fb3009f1cbcf608703d7 100644 (file)
--- a/gtk/gtkhscrollbar.h
+++ b/gtk/gtkhscrollbar.h
@@ -31,6 +31,7 @@
 #ifndef __GTK_HSCROLLBAR_H__
 #define __GTK_HSCROLLBAR_H__
 
+#ifndef GTK_DISABLE_DEPRECATED
 
 #include <gtk/gtkscrollbar.h>
 
@@ -66,5 +67,6 @@ GtkWidget* gtk_hscrollbar_new      (GtkAdjustment *adjustment);
 
 G_END_DECLS
 
+#endif
 
 #endif /* __GTK_HSCROLLBAR_H__ */

diff --git a/gtk/gtkvscrollbar.c b/gtk/gtkvscrollbar.c
index 59d0664ae579f12c0b73367f9b73a836447ee783..f8443e37d1f30bf1c961e95cbd2b903ec86daf4d 100644 (file)
--- a/gtk/gtkvscrollbar.c
+++ b/gtk/gtkvscrollbar.c
@@ -28,6 +28,8 @@
 #include "config.h"
 
 #include "gtkorientable.h"
+#include "gtkscrollbar.h"
+#undef GTK_DISABLE_DEPRECATED
 #include "gtkvscrollbar.h"
 #include "gtkintl.h"
 
@@ -44,6 +46,8 @@
  * adjustment of the scrollbar or it may be left %NULL in which case one
  * will be created for you. See #GtkScrollbar for a description of what the
  * fields in an adjustment represent for a scrollbar.
+ *
+ * GtkVScrollbar has been deprecated, use #GtkScrollbar instead.
  */
 
 G_DEFINE_TYPE (GtkVScrollbar, gtk_vscrollbar, GTK_TYPE_SCROLLBAR)
@@ -68,6 +72,8 @@ gtk_vscrollbar_init (GtkVScrollbar *vscrollbar)
  * Creates a new vertical scrollbar.
  *
  * Returns: the new #GtkVScrollbar
+ *
+ * Deprecated: 3.2: Use gtk_scrollbar_new() with %GTK_ORIENTATION_VERTICAL instead
  */
 GtkWidget *
 gtk_vscrollbar_new (GtkAdjustment *adjustment)

diff --git a/gtk/gtkvscrollbar.h b/gtk/gtkvscrollbar.h
index ca2179075b151a71397aa53592f8361420fee3fc..4929f87fadb8dc055f5afabfa7211cc96b7faa91 100644 (file)
--- a/gtk/gtkvscrollbar.h
+++ b/gtk/gtkvscrollbar.h
@@ -31,6 +31,7 @@
 #ifndef __GTK_VSCROLLBAR_H__
 #define __GTK_VSCROLLBAR_H__
 
+#ifndef GTK_DISABLE_DEPRECATED
 
 #include <gtk/gtkscrollbar.h>
 
@@ -72,5 +73,6 @@ GtkWidget* gtk_vscrollbar_new      (GtkAdjustment *adjustment);
 
 G_END_DECLS
 
+#endif
 
 #endif /* __GTK_VSCROLLBAR_H__ */