Author: nick Date: 2007-12-14 08:56:23 +0000 (Fri, 14 Dec 2007) New Revision: 26475
Modified: libxfcegui4/trunk/ChangeLog libxfcegui4/trunk/libxfcegui4/preview_filesel.h libxfcegui4/trunk/libxfcegui4/xfce-filechooser.h libxfcegui4/trunk/libxfcegui4/xfce-icontheme.h libxfcegui4/trunk/libxfcegui4/xfce_decorbutton.h libxfcegui4/trunk/libxfcegui4/xfce_decortoggle.h libxfcegui4/trunk/libxfcegui4/xfce_framebox.h libxfcegui4/trunk/libxfcegui4/xfce_iconbutton.h libxfcegui4/trunk/libxfcegui4/xfce_menubutton.h libxfcegui4/trunk/libxfcegui4/xfce_movehandler.h libxfcegui4/trunk/libxfcegui4/xfce_togglebutton.h Log: * libxfcegui4/*: Properly deprecate deprecated interfaces. * libxfcegui4/*: Replace some c++ bracket headers with the G_{BEGIN,END}_DECLS macros. Modified: libxfcegui4/trunk/ChangeLog =================================================================== --- libxfcegui4/trunk/ChangeLog 2007-12-14 08:40:31 UTC (rev 26474) +++ libxfcegui4/trunk/ChangeLog 2007-12-14 08:56:23 UTC (rev 26475) @@ -1,3 +1,9 @@ +2007-12-14 Nick Schermer <[EMAIL PROTECTED]> + + * libxfcegui4/*: Properly deprecate deprecated interfaces. + * libxfcegui4/*: Replace some c++ bracket headers with the + G_{BEGIN,END}_DECLS macros. + 2007-12-13 Nick Schermer <[EMAIL PROTECTED]> * libxfcegui4/{xfce_,netk-}marshal.{c,h}: Remove. Modified: libxfcegui4/trunk/libxfcegui4/preview_filesel.h =================================================================== --- libxfcegui4/trunk/libxfcegui4/preview_filesel.h 2007-12-14 08:40:31 UTC (rev 26474) +++ libxfcegui4/trunk/libxfcegui4/preview_filesel.h 2007-12-14 08:56:23 UTC (rev 26475) @@ -25,6 +25,9 @@ #include <gtk/gtkfilesel.h> G_BEGIN_DECLS + +#ifndef XFCE_DISABLE_DEPRECATED + #define TYPE_PREVIEW_FILE_SELECTION preview_file_selection_get_type () #define PREVIEW_FILE_SELECTION(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREVIEW_FILE_SELECTION, PreviewFileSelection) #define PREVIEW_FILE_SELECTION_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, TYPE_PREVIEW_FILE_SELECTION, PreviewFileSelectionClass) @@ -48,15 +51,13 @@ GType preview_file_selection_get_type (void); -#ifndef XFCE_DISABLE_DEPRECATED - GtkWidget *preview_file_selection_new (const gchar * title, gboolean do_preview); GdkPixbuf *preview_file_selection_intelligent_scale (GdkPixbuf * pixbuf, guint scale); -#endif +#endif /* !XFCE_DISABLE_DEPRECATED */ G_END_DECLS #endif /* __PREVIEW_FILESEL_H__ */ Modified: libxfcegui4/trunk/libxfcegui4/xfce-filechooser.h =================================================================== --- libxfcegui4/trunk/libxfcegui4/xfce-filechooser.h 2007-12-14 08:40:31 UTC (rev 26474) +++ libxfcegui4/trunk/libxfcegui4/xfce-filechooser.h 2007-12-14 08:56:23 UTC (rev 26475) @@ -27,6 +27,8 @@ G_BEGIN_DECLS +#ifndef XFCE_DISABLE_DEPRECATED + #define XFCE_TYPE_FILE_CHOOSER (xfce_file_chooser_get_type()) #define XFCE_FILE_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), XFCE_TYPE_FILE_CHOOSER, XfceFileChooser)) #define XFCE_FILE_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), XFCE_TYPE_FILE_CHOOSER, XfceFileChooserClass)) @@ -50,8 +52,6 @@ #define xfce_file_chooser_get_type() gtk_dialog_get_type() -#ifndef XFCE_DISABLE_DEPRECATED - GtkWidget *xfce_file_chooser_new (const gchar *title, GtkWindow *parent, XfceFileChooserAction action, Modified: libxfcegui4/trunk/libxfcegui4/xfce-icontheme.h =================================================================== --- libxfcegui4/trunk/libxfcegui4/xfce-icontheme.h 2007-12-14 08:40:31 UTC (rev 26474) +++ libxfcegui4/trunk/libxfcegui4/xfce-icontheme.h 2007-12-14 08:56:23 UTC (rev 26475) @@ -30,6 +30,8 @@ G_BEGIN_DECLS +#ifndef XFCE_DISABLE_DEPRECATED + #define XFCE_TYPE_ICON_THEME (xfce_icon_theme_get_type()) #define XFCE_ICON_THEME(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), XFCE_TYPE_ICON_THEME, XfceIconTheme)) #define XFCE_IS_ICON_THEME(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), XFCE_TYPE_ICON_THEME)) @@ -58,8 +60,6 @@ gpointer (*_xfce_reserved2)(); }; -#ifndef XFCE_DISABLE_DEPRECATED - GType xfce_icon_theme_get_type () G_GNUC_CONST; XfceIconTheme *xfce_icon_theme_get_for_screen Modified: libxfcegui4/trunk/libxfcegui4/xfce_decorbutton.h =================================================================== --- libxfcegui4/trunk/libxfcegui4/xfce_decorbutton.h 2007-12-14 08:40:31 UTC (rev 26474) +++ libxfcegui4/trunk/libxfcegui4/xfce_decorbutton.h 2007-12-14 08:56:23 UTC (rev 26475) @@ -23,11 +23,9 @@ #include <gdk/gdk.h> #include <gtk/gtkmisc.h> +G_BEGIN_DECLS -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ +#ifndef XFCE_DISABLE_DEPRECATED #define XFCE_TYPE_DECORBUTTON (xfce_decorbutton_get_type ()) #define XFCE_DECORBUTTON(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, xfce_decorbutton_get_type (), XfceDecorbutton) @@ -66,16 +64,11 @@ }; -#ifndef XFCE_DISABLE_DEPRECATED - GtkType xfce_decorbutton_get_type (void); GtkWidget *xfce_decorbutton_new (XfceDecorbuttonType type); -#endif +#endif /* !XFCE_DISABLE_DEPRECATED */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS - #endif /* __XFCE_DECORBUTTON_H__ */ Modified: libxfcegui4/trunk/libxfcegui4/xfce_decortoggle.h =================================================================== --- libxfcegui4/trunk/libxfcegui4/xfce_decortoggle.h 2007-12-14 08:40:31 UTC (rev 26474) +++ libxfcegui4/trunk/libxfcegui4/xfce_decortoggle.h 2007-12-14 08:56:23 UTC (rev 26475) @@ -24,10 +24,7 @@ #include <gtk/gtkmisc.h> -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ +G_BEGIN_DECLS #define XFCE_TYPE_DECORTOGGLE (xfce_decortoggle_get_type ()) #define XFCE_DECORTOGGLE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, xfce_decortoggle_get_type (), XfceDecortoggle) @@ -83,9 +80,7 @@ #endif -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __XFCE_DECORTOGGLE_H__ */ Modified: libxfcegui4/trunk/libxfcegui4/xfce_framebox.h =================================================================== --- libxfcegui4/trunk/libxfcegui4/xfce_framebox.h 2007-12-14 08:40:31 UTC (rev 26474) +++ libxfcegui4/trunk/libxfcegui4/xfce_framebox.h 2007-12-14 08:56:23 UTC (rev 26475) @@ -25,6 +25,8 @@ G_BEGIN_DECLS +#ifndef XFCE_DISABLE_DEPRECATED + #define XFCE_TYPE_FRAMEBOX (xfce_framebox_get_type()) #define XFCE_FRAMEBOX(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, xfce_framebox_get_type (), XfceFramebox) #define XFCE_FRAMEBOX_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, xfce_framebox_get_type (), XfceFrameboxClass) @@ -45,15 +47,13 @@ GtkFrameClass parent_class; }; -#ifndef XFCE_DISABLE_DEPRECATED - GType xfce_framebox_get_type (void) G_GNUC_CONST; GtkWidget *xfce_framebox_new (const gchar *text, gboolean indent); void xfce_framebox_add (XfceFramebox *framebox, GtkWidget *widget); -#endif +#endif /* !XFCE_DISABLE_DEPRECATED */ G_END_DECLS Modified: libxfcegui4/trunk/libxfcegui4/xfce_iconbutton.h =================================================================== --- libxfcegui4/trunk/libxfcegui4/xfce_iconbutton.h 2007-12-14 08:40:31 UTC (rev 26474) +++ libxfcegui4/trunk/libxfcegui4/xfce_iconbutton.h 2007-12-14 08:56:23 UTC (rev 26475) @@ -25,10 +25,7 @@ #include <gtk/gtkenums.h> -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ +G_BEGIN_DECLS #define XFCE_TYPE_ICONBUTTON (xfce_iconbutton_get_type ()) #define XFCE_ICONBUTTON(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, xfce_iconbutton_get_type (), XfceIconbutton) @@ -62,9 +59,7 @@ void xfce_iconbutton_set_pixbuf (XfceIconbutton * icon_button, GdkPixbuf * pixbuf); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __XFCE_ICONBUTTON_H__ */ Modified: libxfcegui4/trunk/libxfcegui4/xfce_menubutton.h =================================================================== --- libxfcegui4/trunk/libxfcegui4/xfce_menubutton.h 2007-12-14 08:40:31 UTC (rev 26474) +++ libxfcegui4/trunk/libxfcegui4/xfce_menubutton.h 2007-12-14 08:56:23 UTC (rev 26475) @@ -25,10 +25,7 @@ #include <gtk/gtkenums.h> -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ +G_BEGIN_DECLS #define XFCE_TYPE_MENUBUTTON (xfce_menubutton_get_type ()) #define XFCE_MENUBUTTON(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, xfce_menubutton_get_type (), XfceMenubutton) @@ -75,10 +72,9 @@ void xfce_menubutton_set_stock_icon (XfceMenubutton * menubutton, const char *stock); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS + #endif /* __XFCE_MENUBUTTON_H__ */ /* example-end */ Modified: libxfcegui4/trunk/libxfcegui4/xfce_movehandler.h =================================================================== --- libxfcegui4/trunk/libxfcegui4/xfce_movehandler.h 2007-12-14 08:40:31 UTC (rev 26474) +++ libxfcegui4/trunk/libxfcegui4/xfce_movehandler.h 2007-12-14 08:56:23 UTC (rev 26475) @@ -24,10 +24,7 @@ #include <gtk/gtkwidget.h> -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ +G_BEGIN_DECLS #define XFCE_TYPE_MOVEHANDLER (xfce_movehandler_get_type()) #define XFCE_MOVEHANDLER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, xfce_movehandler_get_type (), XfceMovehandler) @@ -77,9 +74,7 @@ XfceMoveFunc move, gpointer data); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __XFCE_MOVEHANDLER_H__ */ Modified: libxfcegui4/trunk/libxfcegui4/xfce_togglebutton.h =================================================================== --- libxfcegui4/trunk/libxfcegui4/xfce_togglebutton.h 2007-12-14 08:40:31 UTC (rev 26474) +++ libxfcegui4/trunk/libxfcegui4/xfce_togglebutton.h 2007-12-14 08:56:23 UTC (rev 26475) @@ -26,10 +26,7 @@ #include <libxfcegui4/xfce_decortoggle.h> -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ +G_BEGIN_DECLS #define XFCE_TYPE_TOGGLEBUTTON (xfce_togglebutton_get_type ()) #define XFCE_TOGGLEBUTTON(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, xfce_togglebutton_get_type (), XfceTogglebutton) @@ -67,10 +64,7 @@ #define xfce_togglebutton_set_relief(togglebutton, newstyle) gtk_button_set_relief(GTK_BUTTON(togglebutton), newstyle) #define xfce_togglebutton_get_relief(togglebutton) gtk_button_get_relief(GTK_BUTTON(togglebutton)) +G_END_DECLS -#ifdef __cplusplus -} -#endif /* __cplusplus */ - #endif /* __XFCE_TOGGLEBUTTON_H__ */ _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits