From 214069caee0661ff0bd30d79726f75e3dccea6e8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 7 Jun 2011 21:40:12 -0400 Subject: [PATCH] Deprecate h/v subclasses of GtkPaned This has been discussed in bug 541009. --- gtk/gtkhpaned.c | 5 +++++ gtk/gtkhpaned.h | 4 ++++ gtk/gtkvpaned.c | 5 +++++ gtk/gtkvpaned.h | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c index e0b864c63e..3ffee8423f 100644 --- a/gtk/gtkhpaned.c +++ b/gtk/gtkhpaned.c @@ -26,6 +26,7 @@ #include "config.h" +#undef GTK_DISABLE_DEPRECATED #include "gtkhpaned.h" #include "gtkorientable.h" @@ -39,6 +40,8 @@ * children arranged horizontally. The division between * the two panes is adjustable by the user by dragging * a handle. See #GtkPaned for details. + * + * GtkHPaned has been deprecated, use #GtkPaned instead. */ @@ -62,6 +65,8 @@ gtk_hpaned_init (GtkHPaned *hpaned) * Create a new #GtkHPaned * * Returns: the new #GtkHPaned + * + * Deprecated: 3.2: Use gtk_paned_new() with %GTK_ORIENTATION_HORIZONTAL instead */ GtkWidget * gtk_hpaned_new (void) diff --git a/gtk/gtkhpaned.h b/gtk/gtkhpaned.h index 3a526b5cb1..5580e1e8bc 100644 --- a/gtk/gtkhpaned.h +++ b/gtk/gtkhpaned.h @@ -31,6 +31,8 @@ #ifndef __GTK_HPANED_H__ #define __GTK_HPANED_H__ +#ifndef GTK_DISABLE_DEPRECATED + #include G_BEGIN_DECLS @@ -62,4 +64,6 @@ GtkWidget * gtk_hpaned_new (void); G_END_DECLS +#endif + #endif /* __GTK_HPANED_H__ */ diff --git a/gtk/gtkvpaned.c b/gtk/gtkvpaned.c index 1719dfd02f..3cc1825a15 100644 --- a/gtk/gtkvpaned.c +++ b/gtk/gtkvpaned.c @@ -27,6 +27,7 @@ #include "config.h" #include "gtkorientable.h" +#undef GTK_DISABLE_DEPRECATED #include "gtkvpaned.h" @@ -39,6 +40,8 @@ * children arranged vertically. The division between * the two panes is adjustable by the user by dragging * a handle. See #GtkPaned for details. + * + * GtkVPaned has been deprecated, use #GtkPaned instead. */ G_DEFINE_TYPE (GtkVPaned, gtk_vpaned, GTK_TYPE_PANED) @@ -61,6 +64,8 @@ gtk_vpaned_init (GtkVPaned *vpaned) * Create a new #GtkVPaned * * Returns: the new #GtkVPaned + * + * Deprecated: 3.2: Use gtk_paned_new() with %GTK_ORIENTATION_VERTICAL instead */ GtkWidget * gtk_vpaned_new (void) diff --git a/gtk/gtkvpaned.h b/gtk/gtkvpaned.h index a42efa3edc..e543f5f712 100644 --- a/gtk/gtkvpaned.h +++ b/gtk/gtkvpaned.h @@ -31,6 +31,8 @@ #ifndef __GTK_VPANED_H__ #define __GTK_VPANED_H__ +#ifndef GTK_DISABLE_DEPRECATED + #include G_BEGIN_DECLS @@ -62,4 +64,6 @@ GtkWidget * gtk_vpaned_new (void); G_END_DECLS +#endif + #endif /* __GTK_VPANED_H__ */