AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Deprecate h/v variants of GtkBox

Browse Source 
This has been discussed in bug 541009.
This commit is contained in:
Matthias Clasen 2011-06-07 21:44:24 -04:00
parent 12d3f26d66
commit 4cbbe565b9
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkhbox.c
View File

@ -26,6 +26,7 @@
#include "config.h" #include "config.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkhbox.h" #include "gtkhbox.h"
#include "gtkorientable.h" #include "gtkorientable.h"
@ -42,6 +43,8 @@
* spacing, width, and alignment of #GtkHBox children. * spacing, width, and alignment of #GtkHBox children.
* *
* All children are allocated the same height. * All children are allocated the same height.
*
* GtkHBox has been deprecated, use #GtkBox instead.
*/ */
@ -69,6 +72,8 @@ gtk_hbox_init (GtkHBox *hbox)
* Creates a new #GtkHBox. * Creates a new #GtkHBox.
* *
* Returns: a new #GtkHBox. * Returns: a new #GtkHBox.
*
* Deprecated: 3.2: Use gtk_box_new() with %GTK_ORIENTATION_HORIZONTAL instead
*/ */
GtkWidget * GtkWidget *
gtk_hbox_new (gboolean homogeneous, gtk_hbox_new (gboolean homogeneous,

4
gtk/gtkhbox.h
View File

@ -37,6 +37,8 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#ifndef GTK_DISABLE_DEPRECATED
#define GTK_TYPE_HBOX (gtk_hbox_get_type ()) #define GTK_TYPE_HBOX (gtk_hbox_get_type ())
#define GTK_HBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HBOX, GtkHBox)) #define GTK_HBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HBOX, GtkHBox))
#define GTK_HBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HBOX, GtkHBoxClass)) #define GTK_HBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HBOX, GtkHBoxClass))
@ -63,6 +65,8 @@ GType gtk_hbox_get_type (void) G_GNUC_CONST;
GtkWidget * gtk_hbox_new (gboolean homogeneous, GtkWidget * gtk_hbox_new (gboolean homogeneous,
gint spacing); gint spacing);
#endif
G_END_DECLS G_END_DECLS
#endif /* __GTK_HBOX_H__ */ #endif /* __GTK_HBOX_H__ */

5
gtk/gtkvbox.c
View File

@ -27,6 +27,7 @@
#include "config.h" #include "config.h"
#include "gtkorientable.h" #include "gtkorientable.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkvbox.h" #include "gtkvbox.h"
@ -42,6 +43,8 @@
* spacing, height, and alignment of #GtkVBox children. * spacing, height, and alignment of #GtkVBox children.
* *
* All children are allocated the same width. * All children are allocated the same width.
*
* GtkVBox has been deprecated, use #GtkBox instead.
*/ */
G_DEFINE_TYPE (GtkVBox, gtk_vbox, GTK_TYPE_BOX) G_DEFINE_TYPE (GtkVBox, gtk_vbox, GTK_TYPE_BOX)
@ -68,6 +71,8 @@ gtk_vbox_init (GtkVBox *vbox)
* Creates a new #GtkVBox. * Creates a new #GtkVBox.
* *
* Returns: a new #GtkVBox. * Returns: a new #GtkVBox.
*
* Deprecated: 3.2: Use gtk_box_new() with %GTK_ORIENTATION_VERTICAL instead
*/ */
GtkWidget * GtkWidget *
gtk_vbox_new (gboolean homogeneous, gtk_vbox_new (gboolean homogeneous,

4
gtk/gtkvbox.h
View File

@ -37,6 +37,8 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#ifndef GTK_DISABLE_DEPRECATED
#define GTK_TYPE_VBOX (gtk_vbox_get_type ()) #define GTK_TYPE_VBOX (gtk_vbox_get_type ())
#define GTK_VBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VBOX, GtkVBox)) #define GTK_VBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VBOX, GtkVBox))
#define GTK_VBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VBOX, GtkVBoxClass)) #define GTK_VBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VBOX, GtkVBoxClass))
@ -63,6 +65,8 @@ GType gtk_vbox_get_type (void) G_GNUC_CONST;
GtkWidget * gtk_vbox_new (gboolean homogeneous, GtkWidget * gtk_vbox_new (gboolean homogeneous,
gint spacing); gint spacing);
#endif
G_END_DECLS G_END_DECLS
#endif /* __GTK_VBOX_H__ */ #endif /* __GTK_VBOX_H__ */