diff --git a/clutter/x11/clutter-glx-texture-pixmap.h b/clutter/x11/clutter-glx-texture-pixmap.h index 5479510d2..1563f92de 100644 --- a/clutter/x11/clutter-glx-texture-pixmap.h +++ b/clutter/x11/clutter-glx-texture-pixmap.h @@ -28,8 +28,6 @@ #include -#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) - G_BEGIN_DECLS #define CLUTTER_GLX_TYPE_TEXTURE_PIXMAP (clutter_glx_texture_pixmap_get_type ()) @@ -77,16 +75,18 @@ struct _ClutterGLXTexturePixmap GType clutter_glx_texture_pixmap_get_type (void); +CLUTTER_DEPRECATED_FOR(clutter_x11_texture_pixmap_new) ClutterActor * clutter_glx_texture_pixmap_new (void); +CLUTTER_DEPRECATED_FOR(clutter_x11_texture_pixmap_new_with_pixmap) ClutterActor * clutter_glx_texture_pixmap_new_with_pixmap (Pixmap pixmap); +CLUTTER_DEPRECATED_FOR(clutter_x11_texture_pixmap_new_with_window) ClutterActor * clutter_glx_texture_pixmap_new_with_window (Window window); +CLUTTER_DEPRECATED_FOR(cogl_texture_pixmap_x11_is_using_tfp_extension) gboolean clutter_glx_texture_pixmap_using_extension (ClutterGLXTexturePixmap *texture); G_END_DECLS -#endif /* !CLUTTER_DISABLE_DEPRECATED || !CLUTTER_COMPILATION */ - #endif /* __CLUTTER_GLX_TEXTURE_PIXMAP_H__ */ diff --git a/clutter/x11/clutter-x11.h b/clutter/x11/clutter-x11.h index 7c50f31cc..f641982c4 100644 --- a/clutter/x11/clutter-x11.h +++ b/clutter/x11/clutter-x11.h @@ -106,10 +106,8 @@ Window clutter_x11_get_root_window (void); XVisualInfo *clutter_x11_get_visual_info (void); void clutter_x11_set_display (Display * xdpy); -#ifndef CLUTTER_DISABLE_DEPRECATED CLUTTER_DEPRECATED_FOR(clutter_x11_get_visual_info) XVisualInfo *clutter_x11_get_stage_visual (ClutterStage *stage); -#endif Window clutter_x11_get_stage_window (ClutterStage *stage); gboolean clutter_x11_set_stage_foreign (ClutterStage *stage, @@ -127,10 +125,8 @@ gboolean clutter_x11_has_event_retrieval (void); ClutterStage *clutter_x11_get_stage_from_window (Window win); -#ifndef CLUTTER_DISABLE_DEPRECATED CLUTTER_DEPRECATED_FOR(clutter_device_manager_peek_devices) const GSList* clutter_x11_get_input_devices (void); -#endif void clutter_x11_enable_xinput (void); gboolean clutter_x11_has_xinput (void);