sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

x11: Remove CLUTTER_DISABLE_DEPRECATED usage

Browse source 
Switch to CLUTTER_DEPRECATED and CLUTTER_DEPRECATED_FOR.
This commit is contained in:
Emmanuele Bassi 2012-01-31 10:34:45 +00:00
parent 1d84bf2b04
commit 2ed9e0d557
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clutter/x11/clutter-glx-texture-pixmap.h
View file

@ -28,8 +28,6 @@
#include <clutter/x11/clutter-x11-texture-pixmap.h> #include <clutter/x11/clutter-x11-texture-pixmap.h>
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
G_BEGIN_DECLS G_BEGIN_DECLS
#define CLUTTER_GLX_TYPE_TEXTURE_PIXMAP (clutter_glx_texture_pixmap_get_type ()) #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); GType clutter_glx_texture_pixmap_get_type (void);
CLUTTER_DEPRECATED_FOR(clutter_x11_texture_pixmap_new)
ClutterActor * clutter_glx_texture_pixmap_new (void); 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); 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); 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); gboolean clutter_glx_texture_pixmap_using_extension (ClutterGLXTexturePixmap *texture);
G_END_DECLS G_END_DECLS
#endif /* !CLUTTER_DISABLE_DEPRECATED || !CLUTTER_COMPILATION */
#endif /* __CLUTTER_GLX_TEXTURE_PIXMAP_H__ */ #endif /* __CLUTTER_GLX_TEXTURE_PIXMAP_H__ */

4
clutter/x11/clutter-x11.h
View file

@ -106,10 +106,8 @@ Window clutter_x11_get_root_window (void);
XVisualInfo *clutter_x11_get_visual_info (void); XVisualInfo *clutter_x11_get_visual_info (void);
void clutter_x11_set_display (Display * xdpy); void clutter_x11_set_display (Display * xdpy);
#ifndef CLUTTER_DISABLE_DEPRECATED
CLUTTER_DEPRECATED_FOR(clutter_x11_get_visual_info) CLUTTER_DEPRECATED_FOR(clutter_x11_get_visual_info)
XVisualInfo *clutter_x11_get_stage_visual (ClutterStage *stage); XVisualInfo *clutter_x11_get_stage_visual (ClutterStage *stage);
#endif
Window clutter_x11_get_stage_window (ClutterStage *stage); Window clutter_x11_get_stage_window (ClutterStage *stage);
gboolean clutter_x11_set_stage_foreign (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); ClutterStage *clutter_x11_get_stage_from_window (Window win);
#ifndef CLUTTER_DISABLE_DEPRECATED
CLUTTER_DEPRECATED_FOR(clutter_device_manager_peek_devices) CLUTTER_DEPRECATED_FOR(clutter_device_manager_peek_devices)
const GSList* clutter_x11_get_input_devices (void); const GSList* clutter_x11_get_input_devices (void);
#endif
void clutter_x11_enable_xinput (void); void clutter_x11_enable_xinput (void);
gboolean clutter_x11_has_xinput (void); gboolean clutter_x11_has_xinput (void);