diff options
| -rw-r--r-- | gtk/Makefile.am | 81 | ||||
| -rw-r--r-- | gtk/deprecated/gtkfontsel.c (renamed from gtk/gtkfontsel.c) | 7 | ||||
| -rw-r--r-- | gtk/deprecated/gtkfontsel.h (renamed from gtk/gtkfontsel.h) | 34 | ||||
| -rw-r--r-- | gtk/deprecated/gtkhandlebox.c (renamed from gtk/gtkhandlebox.c) | 0 | ||||
| -rw-r--r-- | gtk/deprecated/gtkhandlebox.h (renamed from gtk/gtkhandlebox.h) | 6 | ||||
| -rw-r--r-- | gtk/deprecated/gtkhbbox.c (renamed from gtk/gtkhbbox.c) | 0 | ||||
| -rw-r--r-- | gtk/deprecated/gtkhbbox.h (renamed from gtk/gtkhbbox.h) | 4 | ||||
| -rw-r--r-- | gtk/deprecated/gtkhbox.c (renamed from gtk/gtkhbox.c) | 0 | ||||
| -rw-r--r-- | gtk/deprecated/gtkhbox.h (renamed from gtk/gtkhbox.h) | 4 | ||||
| -rw-r--r-- | gtk/deprecated/gtkhpaned.c (renamed from gtk/gtkhpaned.c) | 0 | ||||
| -rw-r--r-- | gtk/deprecated/gtkhpaned.h (renamed from gtk/gtkhpaned.h) | 4 | ||||
| -rw-r--r-- | gtk/deprecated/gtkhscale.c (renamed from gtk/gtkhscale.c) | 0 | ||||
| -rw-r--r-- | gtk/deprecated/gtkhscale.h (renamed from gtk/gtkhscale.h) | 6 | ||||
| -rw-r--r-- | gtk/deprecated/gtkhscrollbar.c (renamed from gtk/gtkhscrollbar.c) | 0 | ||||
| -rw-r--r-- | gtk/deprecated/gtkhscrollbar.h (renamed from gtk/gtkhscrollbar.h) | 7 | ||||
| -rw-r--r-- | gtk/deprecated/gtkhseparator.c (renamed from gtk/gtkhseparator.c) | 0 | ||||
| -rw-r--r-- | gtk/deprecated/gtkhseparator.h (renamed from gtk/gtkhseparator.h) | 5 | ||||
| -rw-r--r-- | gtk/deprecated/gtktable.c (renamed from gtk/gtktable.c) | 0 | ||||
| -rw-r--r-- | gtk/deprecated/gtktable.h (renamed from gtk/gtktable.h) | 6 | ||||
| -rw-r--r-- | gtk/deprecated/gtktearoffmenuitem.c (renamed from gtk/gtktearoffmenuitem.c) | 0 | ||||
| -rw-r--r-- | gtk/deprecated/gtktearoffmenuitem.h (renamed from gtk/gtktearoffmenuitem.h) | 6 | ||||
| -rw-r--r-- | gtk/deprecated/gtkvbbox.c (renamed from gtk/gtkvbbox.c) | 0 | ||||
| -rw-r--r-- | gtk/deprecated/gtkvbbox.h (renamed from gtk/gtkvbbox.h) | 6 | ||||
| -rw-r--r-- | gtk/deprecated/gtkvbox.c (renamed from gtk/gtkvbox.c) | 0 | ||||
| -rw-r--r-- | gtk/deprecated/gtkvbox.h (renamed from gtk/gtkvbox.h) | 6 | ||||
| -rw-r--r-- | gtk/deprecated/gtkvpaned.c (renamed from gtk/gtkvpaned.c) | 0 | ||||
| -rw-r--r-- | gtk/deprecated/gtkvpaned.h (renamed from gtk/gtkvpaned.h) | 4 | ||||
| -rw-r--r-- | gtk/deprecated/gtkvscale.c (renamed from gtk/gtkvscale.c) | 0 | ||||
| -rw-r--r-- | gtk/deprecated/gtkvscale.h (renamed from gtk/gtkvscale.h) | 7 | ||||
| -rw-r--r-- | gtk/deprecated/gtkvscrollbar.c (renamed from gtk/gtkvscrollbar.c) | 0 | ||||
| -rw-r--r-- | gtk/deprecated/gtkvscrollbar.h (renamed from gtk/gtkvscrollbar.h) | 7 | ||||
| -rw-r--r-- | gtk/deprecated/gtkvseparator.c (renamed from gtk/gtkvseparator.c) | 0 | ||||
| -rw-r--r-- | gtk/deprecated/gtkvseparator.h (renamed from gtk/gtkvseparator.h) | 6 | ||||
| -rw-r--r-- | gtk/gtk.h | 35 | ||||
| -rw-r--r-- | gtk/gtkaction.c | 2 | ||||
| -rw-r--r-- | gtk/gtkcombobox.c | 2 | ||||
| -rw-r--r-- | gtk/gtkmenu.c | 2 | ||||
| -rw-r--r-- | gtk/gtkmenushell.c | 2 | ||||
| -rw-r--r-- | gtk/gtktreemenu.c | 2 | ||||
| -rw-r--r-- | gtk/gtkuimanager.c | 2 |
40 files changed, 73 insertions, 180 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 303f783c31..cbf5690a1a 100644 --- 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) diff --git a/gtk/gtkfontsel.c b/gtk/deprecated/gtkfontsel.c index 873af183c0..10625fb4e5 100644 --- a/gtk/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 diff --git a/gtk/gtkfontsel.h b/gtk/deprecated/gtkfontsel.h index f0bd8ef69f..628f883363 100644 --- a/gtk/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 diff --git a/gtk/gtkhandlebox.c b/gtk/deprecated/gtkhandlebox.c index 2c6c1e3be3..2c6c1e3be3 100644 --- a/gtk/gtkhandlebox.c +++ b/gtk/deprecated/gtkhandlebox.c diff --git a/gtk/gtkhandlebox.h b/gtk/deprecated/gtkhandlebox.h index 1c82d197d8..4ec13bc041 100644 --- a/gtk/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__ */ diff --git a/gtk/gtkhbbox.c b/gtk/deprecated/gtkhbbox.c index 2a47deb23d..2a47deb23d 100644 --- a/gtk/gtkhbbox.c +++ b/gtk/deprecated/gtkhbbox.c diff --git a/gtk/gtkhbbox.h b/gtk/deprecated/gtkhbbox.h index 9a9656f88a..9b64a5a9a4 100644 --- a/gtk/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__ */ diff --git a/gtk/gtkhbox.c b/gtk/deprecated/gtkhbox.c index 503fe2458b..503fe2458b 100644 --- a/gtk/gtkhbox.c +++ b/gtk/deprecated/gtkhbox.c diff --git a/gtk/gtkhbox.h b/gtk/deprecated/gtkhbox.h index d443aa3818..2387b83c0e 100644 --- a/gtk/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__ */ diff --git a/gtk/gtkhpaned.c b/gtk/deprecated/gtkhpaned.c index ddf2be0ef8..ddf2be0ef8 100644 --- a/gtk/gtkhpaned.c +++ b/gtk/deprecated/gtkhpaned.c diff --git a/gtk/gtkhpaned.h b/gtk/deprecated/gtkhpaned.h index 2306aae989..4d2ed7c03e 100644 --- a/gtk/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__ */ diff --git a/gtk/gtkhscale.c b/gtk/deprecated/gtkhscale.c index b7f540c5f0..b7f540c5f0 100644 --- a/gtk/gtkhscale.c +++ b/gtk/deprecated/gtkhscale.c diff --git a/gtk/gtkhscale.h b/gtk/deprecated/gtkhscale.h index 7f472bd842..d977932adc 100644 --- a/gtk/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__ */ diff --git a/gtk/gtkhscrollbar.c b/gtk/deprecated/gtkhscrollbar.c index 62434145db..62434145db 100644 --- a/gtk/gtkhscrollbar.c +++ b/gtk/deprecated/gtkhscrollbar.c diff --git a/gtk/gtkhscrollbar.h b/gtk/deprecated/gtkhscrollbar.h index 56969efe02..f7d04e913a 100644 --- a/gtk/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__ */ diff --git a/gtk/gtkhseparator.c b/gtk/deprecated/gtkhseparator.c index 4dea4b6d25..4dea4b6d25 100644 --- a/gtk/gtkhseparator.c +++ b/gtk/deprecated/gtkhseparator.c diff --git a/gtk/gtkhseparator.h b/gtk/deprecated/gtkhseparator.h index c802723c3a..615d092766 100644 --- a/gtk/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__ */ diff --git a/gtk/gtktable.c b/gtk/deprecated/gtktable.c index 689cb268ea..689cb268ea 100644 --- a/gtk/gtktable.c +++ b/gtk/deprecated/gtktable.c diff --git a/gtk/gtktable.h b/gtk/deprecated/gtktable.h index 132b458cbb..121447c8c3 100644 --- a/gtk/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__ */ diff --git a/gtk/gtktearoffmenuitem.c b/gtk/deprecated/gtktearoffmenuitem.c index 340062c83a..340062c83a 100644 --- a/gtk/gtktearoffmenuitem.c +++ b/gtk/deprecated/gtktearoffmenuitem.c diff --git a/gtk/gtktearoffmenuitem.h b/gtk/deprecated/gtktearoffmenuitem.h index 8521d9b6a1..c51bd14341 100644 --- a/gtk/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__ */ diff --git a/gtk/gtkvbbox.c b/gtk/deprecated/gtkvbbox.c index 5e92f73a6c..5e92f73a6c 100644 --- a/gtk/gtkvbbox.c +++ b/gtk/deprecated/gtkvbbox.c diff --git a/gtk/gtkvbbox.h b/gtk/deprecated/gtkvbbox.h index af2fd0a369..f53a09d01d 100644 --- a/gtk/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__ */ diff --git a/gtk/gtkvbox.c b/gtk/deprecated/gtkvbox.c index 514dff3eb5..514dff3eb5 100644 --- a/gtk/gtkvbox.c +++ b/gtk/deprecated/gtkvbox.c diff --git a/gtk/gtkvbox.h b/gtk/deprecated/gtkvbox.h index 9407432b97..734b60f6e4 100644 --- a/gtk/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__ */ diff --git a/gtk/gtkvpaned.c b/gtk/deprecated/gtkvpaned.c index eeb0200572..eeb0200572 100644 --- a/gtk/gtkvpaned.c +++ b/gtk/deprecated/gtkvpaned.c diff --git a/gtk/gtkvpaned.h b/gtk/deprecated/gtkvpaned.h index e543f5f712..a42efa3edc 100644 --- a/gtk/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__ */ diff --git a/gtk/gtkvscale.c b/gtk/deprecated/gtkvscale.c index e348cfcf20..e348cfcf20 100644 --- a/gtk/gtkvscale.c +++ b/gtk/deprecated/gtkvscale.c diff --git a/gtk/gtkvscale.h b/gtk/deprecated/gtkvscale.h index be2ed7904c..c2fea59e3c 100644 --- a/gtk/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__ */ diff --git a/gtk/gtkvscrollbar.c b/gtk/deprecated/gtkvscrollbar.c index 402398831b..402398831b 100644 --- a/gtk/gtkvscrollbar.c +++ b/gtk/deprecated/gtkvscrollbar.c diff --git a/gtk/gtkvscrollbar.h b/gtk/deprecated/gtkvscrollbar.h index 4929f87fad..b1ac109d2e 100644 --- a/gtk/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__ */ diff --git a/gtk/gtkvseparator.c b/gtk/deprecated/gtkvseparator.c index 162a62c127..162a62c127 100644 --- a/gtk/gtkvseparator.c +++ b/gtk/deprecated/gtkvseparator.c diff --git a/gtk/gtkvseparator.h b/gtk/deprecated/gtkvseparator.h index 0ff262fea2..5a0e3df847 100644 --- a/gtk/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__ */ @@ -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__ */ diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index b1e4957609..ad69d4f163 100644 --- 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" diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index a7948c9d96..3f2b2636dd 100644 --- 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" diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index dd8d9aad17..bb52807b53 100644 --- 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" diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 0e613b2010..c901814574 100644 --- 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" diff --git a/gtk/gtktreemenu.c b/gtk/gtktreemenu.c index d76faa37f0..5448958369 100644 --- 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, diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 42f00d0cc2..2339a34d86 100644 --- 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 |