Move wholly deprecated files to a subdirectory

Also install their headers to a subdirectory.
2024-09-29 18:47:38 +00:00 · 2011-11-01 22:52:32 -04:00 · 2011-11-01 22:52:32 -04:00 · 068e1f0390
commit 068e1f0390
parent 98db3dd5dd
40 changed files with 73 additions and 180 deletions
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@ -141,6 +141,25 @@ endif

 # GTK+ header files for public installation (non-generated, or generated
 # by configure)
+
+deprecated_h_sources = 			\
+	deprecated/gtkfontsel.h		\
+	deprecated/gtkhandlebox.h	\
+	deprecated/gtkhbbox.h		\
+	deprecated/gtkhbox.h		\
+	deprecated/gtkhpaned.h		\
+	deprecated/gtkhscale.h		\
+	deprecated/gtkhscrollbar.h	\
+	deprecated/gtkhseparator.h	\
+	deprecated/gtktable.h		\
+	deprecated/gtktearoffmenuitem.h	\
+	deprecated/gtkvbbox.h		\
+	deprecated/gtkvbox.h		\
+	deprecated/gtkvscale.h		\
+	deprecated/gtkvscrollbar.h	\
+	deprecated/gtkvseparator.h	\
+	deprecated/gtkvpaned.h
+
 gtk_public_h_sources = 		\
 	gtk.h			\
 	gtkx.h			\
@ -215,20 +234,12 @@ gtk_public_h_sources = 		\
 	gtkfilefilter.h		\
 	gtkfixed.h		\
 	gtkfontbutton.h		\
-	gtkfontsel.h		\
-	gtkfontchooser.h        \
+	gtkfontchooser.h	\
 	gtkfontchooserdialog.h  \
 	gtkfontchooserwidget.h	\
 	gtkframe.h		\
 	gtkgradient.h		\
 	gtkgrid.h		\
-	gtkhandlebox.h		\
-	gtkhbbox.h		\
-	gtkhbox.h		\
-	gtkhpaned.h		\
-	gtkhscale.h		\
-	gtkhscrollbar.h		\
-	gtkhseparator.h		\
 	gtkhsv.h		\
 	gtkiconfactory.h	\
 	gtkicontheme.h		\
@ -308,8 +319,6 @@ gtk_public_h_sources = 		\
 	gtkstyle.h		\
 	gtkswitch.h		\
 	gtksymboliccolor.h	\
-	gtktable.h		\
-	gtktearoffmenuitem.h	\
 	gtktestutils.h		\
 	gtktextattributes.h	\
 	gtktextbuffer.h		\
@ -342,14 +351,8 @@ gtk_public_h_sources = 		\
 	gtktreeview.h		\
 	gtktreeviewcolumn.h	\
 	gtkuimanager.h		\
-	gtkvbbox.h		\
-	gtkvbox.h		\
 	gtkviewport.h		\
 	gtkvolumebutton.h	\
-	gtkvpaned.h		\
-	gtkvscale.h		\
-	gtkvscrollbar.h		\
-	gtkvseparator.h		\
 	gtkwidget.h		\
 	gtkwidgetpath.h		\
 	gtkwindow.h
@ -466,7 +469,26 @@ gtk_private_h_sources =		\
 	$(gtk_appchooser_impl_h_sources)

 # GTK+ C sources to build the library from
+deprecated_c_sources = 			\
+	deprecated/gtkfontsel.c		\
+	deprecated/gtkhandlebox.c	\
+	deprecated/gtkhbbox.c		\
+	deprecated/gtkhbox.c		\
+	deprecated/gtkhpaned.c		\
+	deprecated/gtkhscale.c		\
+	deprecated/gtkhscrollbar.c	\
+	deprecated/gtkhseparator.c	\
+	deprecated/gtktable.c		\
+	deprecated/gtktearoffmenuitem.c	\
+	deprecated/gtkvbbox.c		\
+	deprecated/gtkvbox.c		\
+	deprecated/gtkvscale.c		\
+	deprecated/gtkvscrollbar.c	\
+	deprecated/gtkvseparator.c	\
+	deprecated/gtkvpaned.c
+
 gtk_base_c_sources = 		\
+	$(deprecated_c_sources)	\
 	gtkquery.c		\
 	gtksearchengine.c	\
 	gtksearchenginesimple.c	\
@ -496,7 +518,7 @@ gtk_base_c_sources = 		\
 	gtkbin.c		\
 	gtkbindings.c		\
 	gtkborder.c		\
-	gtkborderimage.c        \
+	gtkborderimage.c	\
 	gtkbox.c		\
 	gtkbuildable.c		\
 	gtkbuilder.c		\
@ -553,21 +575,13 @@ gtk_base_c_sources = 		\
 	gtkfilesystemmodel.c	\
 	gtkfixed.c		\
 	gtkfontbutton.c		\
-	gtkfontsel.c		\
-	gtkfontchooser.c        \
-	gtkfontchooserdialog.c  \
+	gtkfontchooser.c	\
+	gtkfontchooserdialog.c	\
 	gtkfontchooserutils.c	\
 	gtkfontchooserwidget.c	\
 	gtkframe.c		\
 	gtkgradient.c		\
 	gtkgrid.c		\
-	gtkhandlebox.c		\
-	gtkhbbox.c		\
-	gtkhbox.c		\
-	gtkhpaned.c		\
-	gtkhscale.c		\
-	gtkhscrollbar.c		\
-	gtkhseparator.c		\
 	gtkhsv.c		\
 	gtkiconcache.c		\
 	gtkiconcachevalidator.c	\
@ -661,8 +675,6 @@ gtk_base_c_sources = 		\
 	gtkstyle.c		\
 	gtkswitch.c		\
 	gtksymboliccolor.c	\
-	gtktable.c		\
-	gtktearoffmenuitem.c	\
 	gtktestutils.c		\
 	gtktextattributes.c	\
 	gtktextbtree.c		\
@ -705,14 +717,8 @@ gtk_base_c_sources = 		\
 	gtktreeviewcolumn.c	\
 	gtktypebuiltins.c	\
 	gtkuimanager.c		\
-	gtkvbbox.c		\
-	gtkvbox.c		\
 	gtkvolumebutton.c	\
 	gtkviewport.c		\
-	gtkvpaned.c		\
-	gtkvscale.c		\
-	gtkvscrollbar.c		\
-	gtkvseparator.c		\
 	gtkwidget.c		\
 	gtkwidgetpath.c		\
 	gtkwindow.c		\
@ -920,6 +926,9 @@ lib_LTLIBRARIES = libgtk-3.la
 gtkincludedir = $(includedir)/gtk-3.0/gtk
 gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h

+deprecatedincludedir = $(includedir)/gtk-3.0/gtk/deprecated
+deprecatedinclude_HEADERS= $(deprecated_h_sources)
+
 gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
 gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)

--- a/gtk/deprecated/gtkfontsel.c
+++ b/gtk/deprecated/gtkfontsel.c
@ -37,10 +37,6 @@

 #include <atk/atk.h>

-#define GDK_DISABLE_DEPRECATION_WARNINGS
-
-#include "gtkfontsel.h"
-
 #include "gtkbutton.h"
 #include "gtkcellrenderertext.h"
 #include "gtkentry.h"
@ -58,6 +54,9 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"

+#define GDK_DISABLE_DEPRECATION_WARNINGS
+
+#include "gtkfontsel.h"

 /**
 * SECTION:gtkfontsel
--- a/gtk/deprecated/gtkfontsel.h
+++ b/gtk/deprecated/gtkfontsel.h
@ -42,8 +42,6 @@

 G_BEGIN_DECLS

-#ifndef GTK_DISABLE_DEPRECATED
-
 #define GTK_TYPE_FONT_SELECTION              (gtk_font_selection_get_type ())
 #define GTK_FONT_SELECTION(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FONT_SELECTION, GtkFontSelection))
 #define GTK_FONT_SELECTION_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_SELECTION, GtkFontSelectionClass))
@ -107,13 +105,6 @@ struct _GtkFontSelectionDialogClass
  void (*_gtk_reserved4) (void);
 };

-
-
-/*****************************************************************************
- * GtkFontSelection functions.
- *   see the comments in the GtkFontSelectionDialog functions.
- *****************************************************************************/
-
 GType        gtk_font_selection_get_type          (void) G_GNUC_CONST;
 GDK_DEPRECATED_FOR(GtkFontChooser)
 GtkWidget *  gtk_font_selection_new               (void);
@ -147,11 +138,6 @@ GDK_DEPRECATED_FOR(GtkFontChooser)
 void         gtk_font_selection_set_preview_text  (GtkFontSelection *fontsel,
                                                   const gchar      *text);

-/*****************************************************************************
- * GtkFontSelectionDialog functions.
- *   most of these functions simply call the corresponding function in the
- *   GtkFontSelection.
- *****************************************************************************/

 GType      gtk_font_selection_dialog_get_type          (void) G_GNUC_CONST;
 GDK_DEPRECATED_FOR(GtkFontChooser)
@ -163,38 +149,18 @@ GDK_DEPRECATED_FOR(GtkFontChooser)
 GtkWidget *gtk_font_selection_dialog_get_cancel_button (GtkFontSelectionDialog *fsd);
 GDK_DEPRECATED_FOR(GtkFontChooser)
 GtkWidget *gtk_font_selection_dialog_get_font_selection (GtkFontSelectionDialog *fsd);
-
-/* This returns the X Logical Font Description fontname, or NULL if no font
-   is selected. Note that there is a slight possibility that the font might not
-   have been loaded OK. You should call gtk_font_selection_dialog_get_font()
-   to see if it has been loaded OK.
-   You should g_free() the returned font name after you're done with it. */
 GDK_DEPRECATED_FOR(GtkFontChooser)
 gchar*     gtk_font_selection_dialog_get_font_name     (GtkFontSelectionDialog *fsd);
-
-/* This sets the currently displayed font. It should be a valid X Logical
-   Font Description font name (anything else will be ignored), e.g.
-   "-adobe-courier-bold-o-normal--25-*-*-*-*-*-*-*"
-   It returns TRUE on success. */
 GDK_DEPRECATED_FOR(GtkFontChooser)
 gboolean   gtk_font_selection_dialog_set_font_name     (GtkFontSelectionDialog *fsd,
                                                        const gchar            *fontname);
-
-/* This returns the text in the preview entry. You should copy the returned
-   text if you need it. */
 GDK_DEPRECATED_FOR(GtkFontChooser)
 const gchar*
          gtk_font_selection_dialog_get_preview_text   (GtkFontSelectionDialog *fsd);
-
-/* This sets the text in the preview entry. It will be copied by the entry,
-   so there's no need to g_strdup() it first. */
 GDK_DEPRECATED_FOR(GtkFontChooser)
 void      gtk_font_selection_dialog_set_preview_text   (GtkFontSelectionDialog *fsd,
                                                        const gchar            *text);

-
-#endif /* GTK_DISABLE_DEPRECATED */
-
 G_END_DECLS


--- a/gtk/deprecated/gtkhandlebox.c
+++ b/gtk/deprecated/gtkhandlebox.c
--- a/gtk/deprecated/gtkhandlebox.h
+++ b/gtk/deprecated/gtkhandlebox.h
@ -36,14 +36,10 @@
 #ifndef __GTK_HANDLE_BOX_H__
 #define __GTK_HANDLE_BOX_H__

-
 #include <gtk/gtkbin.h>

-
 G_BEGIN_DECLS

-#ifndef GTK_DISABLE_DEPRECATED
-
 #define GTK_TYPE_HANDLE_BOX            (gtk_handle_box_get_type ())
 #define GTK_HANDLE_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBox))
 #define GTK_HANDLE_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HANDLE_BOX, GtkHandleBoxClass))
@ -101,8 +97,6 @@ GtkPositionType gtk_handle_box_get_snap_edge      (GtkHandleBox    *handle_box);
 GDK_DEPRECATED
 gboolean      gtk_handle_box_get_child_detached   (GtkHandleBox    *handle_box);

-#endif /* GTK_DISABLE_DEPRECATED */
-
 G_END_DECLS

 #endif /* __GTK_HANDLE_BOX_H__ */
--- a/gtk/deprecated/gtkhbbox.c
+++ b/gtk/deprecated/gtkhbbox.c
--- a/gtk/deprecated/gtkhbbox.h
+++ b/gtk/deprecated/gtkhbbox.h
@ -31,8 +31,6 @@
 #ifndef __GTK_HBUTTON_BOX_H__
 #define __GTK_HBUTTON_BOX_H__

-#ifndef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtkbbox.h>


@ -66,6 +64,4 @@ GtkWidget* gtk_hbutton_box_new      (void);

 G_END_DECLS

-#endif
-
 #endif /* __GTK_HBUTTON_BOX_H__ */
--- a/gtk/deprecated/gtkhbox.c
+++ b/gtk/deprecated/gtkhbox.c
--- a/gtk/deprecated/gtkhbox.h
+++ b/gtk/deprecated/gtkhbox.h
@ -37,8 +37,6 @@

 G_BEGIN_DECLS

-#ifndef GTK_DISABLE_DEPRECATED
-
 #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_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HBOX, GtkHBoxClass))
@ -66,8 +64,6 @@ GDK_DEPRECATED_FOR(gtk_box_new)
 GtkWidget * gtk_hbox_new      (gboolean homogeneous,
                               gint     spacing);

-#endif
-
 G_END_DECLS

 #endif /* __GTK_HBOX_H__ */
--- a/gtk/deprecated/gtkhpaned.c
+++ b/gtk/deprecated/gtkhpaned.c
--- a/gtk/deprecated/gtkhpaned.h
+++ b/gtk/deprecated/gtkhpaned.h
@ -31,8 +31,6 @@
 #ifndef __GTK_HPANED_H__
 #define __GTK_HPANED_H__

-#ifndef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtkpaned.h>

 G_BEGIN_DECLS
@ -65,6 +63,4 @@ GtkWidget * gtk_hpaned_new      (void);

 G_END_DECLS

-#endif
-
 #endif /* __GTK_HPANED_H__ */
--- a/gtk/deprecated/gtkhscale.c
+++ b/gtk/deprecated/gtkhscale.c
--- a/gtk/deprecated/gtkhscale.h
+++ b/gtk/deprecated/gtkhscale.h
@ -31,11 +31,8 @@
 #ifndef __GTK_HSCALE_H__
 #define __GTK_HSCALE_H__

-#ifndef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtkscale.h>

-
 G_BEGIN_DECLS

 #define GTK_TYPE_HSCALE            (gtk_hscale_get_type ())
@ -68,9 +65,6 @@ GtkWidget* gtk_hscale_new_with_range (gdouble        min,
                                      gdouble        max,
                                      gdouble        step);

-
 G_END_DECLS

-#endif
-
 #endif /* __GTK_HSCALE_H__ */
--- a/gtk/deprecated/gtkhscrollbar.c
+++ b/gtk/deprecated/gtkhscrollbar.c
--- a/gtk/deprecated/gtkhscrollbar.h
+++ b/gtk/deprecated/gtkhscrollbar.h
@ -31,14 +31,10 @@
 #ifndef __GTK_HSCROLLBAR_H__
 #define __GTK_HSCROLLBAR_H__

-#ifndef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtkscrollbar.h>

-
 G_BEGIN_DECLS

-
 #define GTK_TYPE_HSCROLLBAR            (gtk_hscrollbar_get_type ())
 #define GTK_HSCROLLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSCROLLBAR, GtkHScrollbar))
 #define GTK_HSCROLLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSCROLLBAR, GtkHScrollbarClass))
@ -65,9 +61,6 @@ GType      gtk_hscrollbar_get_type (void) G_GNUC_CONST;
 GDK_DEPRECATED_FOR(gtk_scrollbar_new)
 GtkWidget* gtk_hscrollbar_new      (GtkAdjustment *adjustment);

-
 G_END_DECLS

-#endif
-
 #endif /* __GTK_HSCROLLBAR_H__ */
--- a/gtk/deprecated/gtkhseparator.c
+++ b/gtk/deprecated/gtkhseparator.c
--- a/gtk/deprecated/gtkhseparator.h
+++ b/gtk/deprecated/gtkhseparator.h
@ -31,11 +31,8 @@
 #ifndef __GTK_HSEPARATOR_H__
 #define __GTK_HSEPARATOR_H__

-#ifndef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtkseparator.h>

-
 G_BEGIN_DECLS

 #define GTK_TYPE_HSEPARATOR                  (gtk_hseparator_get_type ())
@ -64,8 +61,6 @@ GType      gtk_hseparator_get_type (void) G_GNUC_CONST;
 GDK_DEPRECATED_FOR(gtk_separator_new)
 GtkWidget* gtk_hseparator_new      (void);

-
 G_END_DECLS

-#endif
 #endif /* __GTK_HSEPARATOR_H__ */
--- a/gtk/deprecated/gtktable.c
+++ b/gtk/deprecated/gtktable.c
--- a/gtk/deprecated/gtktable.h
+++ b/gtk/deprecated/gtktable.h
@ -31,14 +31,10 @@
 #ifndef __GTK_TABLE_H__
 #define __GTK_TABLE_H__

-
 #include <gtk/gtkcontainer.h>

-
 G_BEGIN_DECLS

-#ifndef GTK_DISABLE_DEPRECATED
-
 #define GTK_TYPE_TABLE			(gtk_table_get_type ())
 #define GTK_TABLE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TABLE, GtkTable))
 #define GTK_TABLE_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TABLE, GtkTableClass))
@ -163,8 +159,6 @@ void       gtk_table_get_size         (GtkTable        *table,
                                       guint           *rows,
                                       guint           *columns);

-#endif /* GTK_DISABLE_DEPRECATED */
-
 G_END_DECLS

 #endif /* __GTK_TABLE_H__ */
--- a/gtk/deprecated/gtktearoffmenuitem.c
+++ b/gtk/deprecated/gtktearoffmenuitem.c
--- a/gtk/deprecated/gtktearoffmenuitem.h
+++ b/gtk/deprecated/gtktearoffmenuitem.h
@ -31,14 +31,10 @@
 #ifndef __GTK_TEAROFF_MENU_ITEM_H__
 #define __GTK_TEAROFF_MENU_ITEM_H__

-
 #include <gtk/gtkmenuitem.h>

-
 G_BEGIN_DECLS

-#ifndef GTK_DISABLE_DEPRECATED
-
 #define GTK_TYPE_TEAROFF_MENU_ITEM	      (gtk_tearoff_menu_item_get_type ())
 #define GTK_TEAROFF_MENU_ITEM(obj)	      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEAROFF_MENU_ITEM, GtkTearoffMenuItem))
 #define GTK_TEAROFF_MENU_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEAROFF_MENU_ITEM, GtkTearoffMenuItemClass))
@ -74,8 +70,6 @@ struct _GtkTearoffMenuItemClass
 GType	   gtk_tearoff_menu_item_get_type     (void) G_GNUC_CONST;
 GtkWidget* gtk_tearoff_menu_item_new	      (void);

-#endif /* GTK_DISABLE_DEPRECATED */
-
 G_END_DECLS

 #endif /* __GTK_TEAROFF_MENU_ITEM_H__ */
--- a/gtk/deprecated/gtkvbbox.c
+++ b/gtk/deprecated/gtkvbbox.c
--- a/gtk/deprecated/gtkvbbox.h
+++ b/gtk/deprecated/gtkvbbox.h
@ -31,14 +31,10 @@
 #ifndef __GTK_VBBOX_H__
 #define __GTK_VBBOX_H__

-#ifndef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtkbbox.h>

-
 G_BEGIN_DECLS

-
 #define GTK_TYPE_VBUTTON_BOX            (gtk_vbutton_box_get_type ())
 #define GTK_VBUTTON_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VBUTTON_BOX, GtkVButtonBox))
 #define GTK_VBUTTON_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VBUTTON_BOX, GtkVButtonBoxClass))
@ -66,6 +62,4 @@ GtkWidget *gtk_vbutton_box_new      (void);

 G_END_DECLS

-#endif
-
 #endif /* __GTK_VBBOX_H__ */
--- a/gtk/deprecated/gtkvbox.c
+++ b/gtk/deprecated/gtkvbox.c
--- a/gtk/deprecated/gtkvbox.h
+++ b/gtk/deprecated/gtkvbox.h
@ -31,14 +31,10 @@
 #ifndef __GTK_VBOX_H__
 #define __GTK_VBOX_H__

-
 #include <gtk/gtkbox.h>

-
 G_BEGIN_DECLS

-#ifndef GTK_DISABLE_DEPRECATED
-
 #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_CLASS(klass)	 (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VBOX, GtkVBoxClass))
@ -66,8 +62,6 @@ GDK_DEPRECATED_FOR(gtk_box_new)
 GtkWidget * gtk_vbox_new      (gboolean homogeneous,
                               gint     spacing);

-#endif
-
 G_END_DECLS

 #endif /* __GTK_VBOX_H__ */
--- a/gtk/deprecated/gtkvpaned.c
+++ b/gtk/deprecated/gtkvpaned.c
--- a/gtk/deprecated/gtkvpaned.h
+++ b/gtk/deprecated/gtkvpaned.h
@ -31,8 +31,6 @@
 #ifndef __GTK_VPANED_H__
 #define __GTK_VPANED_H__

-#ifndef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtkpaned.h>

 G_BEGIN_DECLS
@ -64,6 +62,4 @@ GtkWidget * gtk_vpaned_new      (void);

 G_END_DECLS

-#endif
-
 #endif /* __GTK_VPANED_H__ */
--- a/gtk/deprecated/gtkvscale.c
+++ b/gtk/deprecated/gtkvscale.c
--- a/gtk/deprecated/gtkvscale.h
+++ b/gtk/deprecated/gtkvscale.h
@ -31,14 +31,10 @@
 #ifndef __GTK_VSCALE_H__
 #define __GTK_VSCALE_H__

-#ifndef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtkscale.h>

-
 G_BEGIN_DECLS

-
 #define GTK_TYPE_VSCALE            (gtk_vscale_get_type ())
 #define GTK_VSCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VSCALE, GtkVScale))
 #define GTK_VSCALE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSCALE, GtkVScaleClass))
@ -73,9 +69,6 @@ GtkWidget* gtk_vscale_new_with_range (gdouble        min,
                                      gdouble        max,
                                      gdouble        step);

-
 G_END_DECLS

-#endif
-
 #endif /* __GTK_VSCALE_H__ */
--- a/gtk/deprecated/gtkvscrollbar.c
+++ b/gtk/deprecated/gtkvscrollbar.c
--- a/gtk/deprecated/gtkvscrollbar.h
+++ b/gtk/deprecated/gtkvscrollbar.h
@ -31,14 +31,10 @@
 #ifndef __GTK_VSCROLLBAR_H__
 #define __GTK_VSCROLLBAR_H__

-#ifndef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtkscrollbar.h>

-
 G_BEGIN_DECLS

-
 #define GTK_TYPE_VSCROLLBAR            (gtk_vscrollbar_get_type ())
 #define GTK_VSCROLLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VSCROLLBAR, GtkVScrollbar))
 #define GTK_VSCROLLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSCROLLBAR, GtkVScrollbarClass))
@ -70,9 +66,6 @@ struct _GtkVScrollbarClass
 GType      gtk_vscrollbar_get_type (void) G_GNUC_CONST;
 GtkWidget* gtk_vscrollbar_new      (GtkAdjustment *adjustment);

-
 G_END_DECLS

-#endif
-
 #endif /* __GTK_VSCROLLBAR_H__ */
--- a/gtk/deprecated/gtkvseparator.c
+++ b/gtk/deprecated/gtkvseparator.c
--- a/gtk/deprecated/gtkvseparator.h
+++ b/gtk/deprecated/gtkvseparator.h
@ -31,13 +31,10 @@
 #ifndef __GTK_VSEPARATOR_H__
 #define __GTK_VSEPARATOR_H__

-#ifndef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtkseparator.h>

 G_BEGIN_DECLS

-
 #define GTK_TYPE_VSEPARATOR                  (gtk_vseparator_get_type ())
 #define GTK_VSEPARATOR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VSEPARATOR, GtkVSeparator))
 #define GTK_VSEPARATOR_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSEPARATOR, GtkVSeparatorClass))
@ -69,9 +66,6 @@ struct _GtkVSeparatorClass
 GType      gtk_vseparator_get_type (void) G_GNUC_CONST;
 GtkWidget* gtk_vseparator_new      (void);

-
 G_END_DECLS

-#endif
-
 #endif /* __GTK_VSEPARATOR_H__ */
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@ -101,20 +101,12 @@
 #include <gtk/gtkfilechooserwidget.h>
 #include <gtk/gtkfilefilter.h>
 #include <gtk/gtkfontbutton.h>
-#include <gtk/gtkfontsel.h>
 #include <gtk/gtkfontchooser.h>
 #include <gtk/gtkfontchooserdialog.h>
 #include <gtk/gtkfontchooserwidget.h>
 #include <gtk/gtkframe.h>
 #include <gtk/gtkgradient.h>
 #include <gtk/gtkgrid.h>
-#include <gtk/gtkhandlebox.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkhscale.h>
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkhseparator.h>
 #include <gtk/gtkhsv.h>
 #include <gtk/gtkiconfactory.h>
 #include <gtk/gtkicontheme.h>
@ -191,8 +183,6 @@
 #include <gtk/gtkstyle.h>
 #include <gtk/gtkswitch.h>
 #include <gtk/gtksymboliccolor.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktearoffmenuitem.h>
 #include <gtk/gtktextattributes.h>
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktextbufferrichtext.h>
@ -225,19 +215,32 @@
 #include <gtk/gtktreeviewcolumn.h>
 #include <gtk/gtktypebuiltins.h>
 #include <gtk/gtkuimanager.h>
-#include <gtk/gtkvbbox.h>
-#include <gtk/gtkvbox.h>
 #include <gtk/gtkversion.h>
 #include <gtk/gtkviewport.h>
 #include <gtk/gtkvolumebutton.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtkvscale.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkvseparator.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwidgetpath.h>
 #include <gtk/gtkwindow.h>

+#ifndef GTK_DISABLE_DEPRECATED
+#include <gtk/deprecated/gtkfontsel.h>
+#include <gtk/deprecated/gtkhandlebox.h>
+#include <gtk/deprecated/gtkhbbox.h>
+#include <gtk/deprecated/gtkhbox.h>
+#include <gtk/deprecated/gtkhpaned.h>
+#include <gtk/deprecated/gtkhscale.h>
+#include <gtk/deprecated/gtkhscrollbar.h>
+#include <gtk/deprecated/gtkhseparator.h>
+#include <gtk/deprecated/gtktable.h>
+#include <gtk/deprecated/gtktearoffmenuitem.h>
+#include <gtk/deprecated/gtkvbbox.h>
+#include <gtk/deprecated/gtkvbox.h>
+#include <gtk/deprecated/gtkvpaned.h>
+#include <gtk/deprecated/gtkvscale.h>
+#include <gtk/deprecated/gtkvscrollbar.h>
+#include <gtk/deprecated/gtkvseparator.h>
+#endif
+
 #undef __GTK_H_INSIDE__

 #endif /* __GTK_H__ */
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@ -86,7 +86,7 @@
 #include "gtkmarshalers.h"
 #include "gtkmenuitem.h"
 #include "gtkstock.h"
-#include "gtktearoffmenuitem.h"
+#include "deprecated/gtktearoffmenuitem.h"
 #include "gtktoolbutton.h"
 #include "gtktoolbar.h"
 #include "gtkprivate.h"
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@ -35,7 +35,7 @@
 #include "gtkmenushellprivate.h"
 #include "gtkscrolledwindow.h"
 #include "gtkseparatormenuitem.h"
-#include "gtktearoffmenuitem.h"
+#include "deprecated/gtktearoffmenuitem.h"
 #include "gtktogglebutton.h"
 #include "gtktreeselection.h"
 #include "gtkseparator.h"
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@ -113,7 +113,7 @@
 #include "gtkintl.h"
 #include "gtktypebuiltins.h"

-#include "gtktearoffmenuitem.h"
+#include "deprecated/gtktearoffmenuitem.h"


 #include "a11y/gtkmenuaccessible.h"
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@ -53,7 +53,7 @@
 #include "gtkintl.h"
 #include "gtktypebuiltins.h"

-#include "gtktearoffmenuitem.h"
+#include "deprecated/gtktearoffmenuitem.h"

 #include "a11y/gtkmenushellaccessible.h"

--- a/gtk/gtktreemenu.c
+++ b/gtk/gtktreemenu.c
@ -46,7 +46,7 @@
 #include "gtkmenushellprivate.h"
 #include "gtkprivate.h"

-#include "gtktearoffmenuitem.h"
+#include "deprecated/gtktearoffmenuitem.h"

 /* GObjectClass */
 static GObject  *gtk_tree_menu_constructor                    (GType                  type,
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@ -48,7 +48,7 @@
 #include "gtkprivate.h"

 #include "gtkuimanager.h"
-#include "gtktearoffmenuitem.h"
+#include "deprecated/gtktearoffmenuitem.h"

 /**
 * SECTION:gtkuimanager