diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 82ed96392..b6605b18f 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -233,6 +233,7 @@ source_c_priv = \ # deprecated installed headers deprecated_h = \ + $(srcdir)/deprecated/clutter-backend-deprecated.h \ $(srcdir)/deprecated/clutter-behaviour.h \ $(srcdir)/deprecated/clutter-behaviour-depth.h \ $(srcdir)/deprecated/clutter-behaviour-ellipse.h \ diff --git a/clutter/clutter-backend.h b/clutter/clutter-backend.h index 22707fc65..4e5d83e22 100644 --- a/clutter/clutter-backend.h +++ b/clutter/clutter-backend.h @@ -63,33 +63,6 @@ GType clutter_backend_get_type (void) G_GNUC_CONST; ClutterBackend *clutter_get_default_backend (void); -#ifndef CLUTTER_DISABLE_DEPRECATED -CLUTTER_DEPRECATED_FOR(ClutterSettings:font_dpi) -void clutter_backend_set_resolution (ClutterBackend *backend, - gdouble dpi); - -CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_time) -void clutter_backend_set_double_click_time (ClutterBackend *backend, - guint msec); - -CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_time) -guint clutter_backend_get_double_click_time (ClutterBackend *backend); - -CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_distance) -void clutter_backend_set_double_click_distance (ClutterBackend *backend, - guint distance); - -CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_distance) -guint clutter_backend_get_double_click_distance (ClutterBackend *backend); - -CLUTTER_DEPRECATED_FOR(ClutterSettings:font_name) -void clutter_backend_set_font_name (ClutterBackend *backend, - const gchar *font_name); - -CLUTTER_DEPRECATED_FOR(ClutterSettings:font_name) -const gchar * clutter_backend_get_font_name (ClutterBackend *backend); -#endif /* CLUTTER_DISABLE_DEPRECATED */ - gdouble clutter_backend_get_resolution (ClutterBackend *backend); void clutter_backend_set_font_options (ClutterBackend *backend, diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h index 9ac1504f9..686e89ed7 100644 --- a/clutter/clutter-deprecated.h +++ b/clutter/clutter-deprecated.h @@ -3,6 +3,7 @@ #define __CLUTTER_DEPRECATED_H_INSIDE__ +#include "deprecated/clutter-backend-deprecated.h" #include "deprecated/clutter-behaviour.h" #include "deprecated/clutter-behaviour-depth.h" #include "deprecated/clutter-behaviour-ellipse.h" @@ -12,6 +13,7 @@ #include "deprecated/clutter-behaviour-scale.h" #include "deprecated/clutter-fixed.h" #include "deprecated/clutter-frame-source.h" +#include "deprecated/clutter-main-deprecated.h" #include "deprecated/clutter-timeout-pool.h" #include "deprecated/clutter-score.h" #include "deprecated/clutter-shader.h" diff --git a/clutter/deprecated/clutter-backend-deprecated.h b/clutter/deprecated/clutter-backend-deprecated.h new file mode 100644 index 000000000..d4aca207a --- /dev/null +++ b/clutter/deprecated/clutter-backend-deprecated.h @@ -0,0 +1,36 @@ +#ifndef __CLUTTER_BACKEND_DEPRECATED_H__ +#define __CLUTTER_BACKEND_DEPRECATED_H__ + +#include + +G_BEGIN_DECLS + +CLUTTER_DEPRECATED_FOR(ClutterSettings:font_dpi) +void clutter_backend_set_resolution (ClutterBackend *backend, + gdouble dpi); + +CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_time) +void clutter_backend_set_double_click_time (ClutterBackend *backend, + guint msec); + +CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_time) +guint clutter_backend_get_double_click_time (ClutterBackend *backend); + +CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_distance) +void clutter_backend_set_double_click_distance (ClutterBackend *backend, + guint distance); + +CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_distance) +guint clutter_backend_get_double_click_distance (ClutterBackend *backend); + +CLUTTER_DEPRECATED_FOR(ClutterSettings:font_name) +void clutter_backend_set_font_name (ClutterBackend *backend, + const gchar *font_name); + +CLUTTER_DEPRECATED_FOR(ClutterSettings:font_name) +const gchar * clutter_backend_get_font_name (ClutterBackend *backend); + + +G_END_DECLS + +#endif /* __CLUTTER_BACKEND_DEPRECATED_H__ */