mirror of
https://github.com/brl/mutter.git
synced 2024-11-22 16:10:41 -05:00
Expose deprecated symbols whilst building Clutter
Don't use ugly "#undef CLUTTER_DISABLE_DEPRECATED" inside source code using deprecated symbols; we have the handy CLUTTER_COMPILATION define that we can use as part of the "disable deprecated" conditional.
This commit is contained in:
parent
cd96e631f1
commit
ef78104227
@ -291,6 +291,7 @@
|
||||
#include "clutter-action.h"
|
||||
#include "clutter-actor-meta-private.h"
|
||||
#include "clutter-animatable.h"
|
||||
#include "clutter-behaviour.h"
|
||||
#include "clutter-constraint.h"
|
||||
#include "clutter-container.h"
|
||||
#include "clutter-debug.h"
|
||||
@ -307,9 +308,6 @@
|
||||
#include "clutter-stage-private.h"
|
||||
#include "clutter-units.h"
|
||||
|
||||
#undef CLUTTER_DISABLE_DEPRECATED
|
||||
#include "clutter-behaviour.h"
|
||||
|
||||
typedef struct _ShaderData ShaderData;
|
||||
typedef struct _AnchorCoord AnchorCoord;
|
||||
|
||||
|
@ -27,7 +27,6 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#undef CLUTTER_DISABLE_DEPRECATED
|
||||
#include "clutter-behaviour-depth.h"
|
||||
|
||||
#include "clutter-enum-types.h"
|
||||
|
@ -35,7 +35,7 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#ifndef CLUTTER_DISABLE_DEPRECATED
|
||||
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
|
||||
|
||||
#define CLUTTER_TYPE_BEHAVIOUR_DEPTH (clutter_behaviour_depth_get_type ())
|
||||
#define CLUTTER_BEHAVIOUR_DEPTH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_DEPTH, ClutterBehaviourDepth))
|
||||
|
@ -47,7 +47,6 @@
|
||||
#include <math.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#undef CLUTTER_DISABLE_DEPRECATED
|
||||
#include "clutter-behaviour-ellipse.h"
|
||||
|
||||
#include "clutter-debug.h"
|
||||
|
@ -35,7 +35,7 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#ifndef CLUTTER_DISABLE_DEPRECATED
|
||||
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
|
||||
|
||||
#define CLUTTER_TYPE_BEHAVIOUR_ELLIPSE (clutter_behaviour_ellipse_get_type ())
|
||||
|
||||
|
@ -38,7 +38,6 @@
|
||||
|
||||
#include <math.h>
|
||||
|
||||
#undef CLUTTER_DISABLE_DEPRECATED
|
||||
#include "clutter-behaviour-opacity.h"
|
||||
|
||||
#include "clutter-private.h"
|
||||
|
@ -35,7 +35,7 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#ifndef CLUTTER_DISABLE_DEPRECATED
|
||||
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
|
||||
|
||||
#define CLUTTER_TYPE_BEHAVIOUR_OPACITY (clutter_behaviour_opacity_get_type ())
|
||||
|
||||
|
@ -64,7 +64,6 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#undef CLUTTER_DISABLE_DEPRECATED
|
||||
#include "clutter-behaviour-path.h"
|
||||
|
||||
#include "clutter-bezier.h"
|
||||
|
@ -36,7 +36,7 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#ifndef CLUTTER_DISABLE_DEPRECATED
|
||||
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
|
||||
|
||||
#define CLUTTER_TYPE_BEHAVIOUR_PATH (clutter_behaviour_path_get_type ())
|
||||
|
||||
|
@ -35,7 +35,6 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#undef CLUTTER_DISABLE_DEPRECATED
|
||||
#include "clutter-behaviour-rotate.h"
|
||||
|
||||
#include <math.h>
|
||||
|
@ -34,7 +34,7 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#ifndef CLUTTER_DISABLE_DEPRECATED
|
||||
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
|
||||
|
||||
#define CLUTTER_TYPE_BEHAVIOUR_ROTATE (clutter_behaviour_rotate_get_type ())
|
||||
#define CLUTTER_BEHAVIOUR_ROTATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_ROTATE, ClutterBehaviourRotate))
|
||||
|
@ -37,7 +37,6 @@
|
||||
|
||||
#include <math.h>
|
||||
|
||||
#undef CLUTTER_DISABLE_DEPRECATED
|
||||
#include "clutter-behaviour-scale.h"
|
||||
|
||||
#include "clutter-debug.h"
|
||||
|
@ -34,7 +34,7 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#ifndef CLUTTER_DISABLE_DEPRECATED
|
||||
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
|
||||
|
||||
#define CLUTTER_TYPE_BEHAVIOUR_SCALE (clutter_behaviour_scale_get_type ())
|
||||
#define CLUTTER_BEHAVIOUR_SCALE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScale))
|
||||
|
@ -71,7 +71,6 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#undef CLUTTER_DISABLE_DEPRECATED
|
||||
#include "clutter-behaviour.h"
|
||||
|
||||
#include "clutter-debug.h"
|
||||
|
@ -36,7 +36,7 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#ifndef CLUTTER_DISABLE_DEPRECATED
|
||||
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
|
||||
|
||||
#define CLUTTER_TYPE_BEHAVIOUR clutter_behaviour_get_type()
|
||||
|
||||
@ -159,7 +159,7 @@ void clutter_behaviour_set_alpha (ClutterBehaviour *beh
|
||||
gboolean clutter_behaviour_is_applied (ClutterBehaviour *behave,
|
||||
ClutterActor *actor);
|
||||
|
||||
#endif /* CLUTTER_DISABLE_DEPRECATED */
|
||||
#endif /* !CLUTTER_DISABLE_DEPRECATED || CLUTTER_COMPILATION */
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#ifndef CLUTTER_DISABLE_DEPRECATED
|
||||
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
|
||||
|
||||
guint clutter_frame_source_add (guint fps,
|
||||
GSourceFunc func,
|
||||
|
@ -34,7 +34,6 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#undef CLUTTER_DISABLE_DEPRECATED
|
||||
#include "clutter-timeout-pool.h"
|
||||
|
||||
#include "clutter-debug.h"
|
||||
|
@ -39,7 +39,7 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#ifndef CLUTTER_DISABLE_DEPRECATED
|
||||
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
|
||||
|
||||
/**
|
||||
* ClutterTimeoutPool: (skip)
|
||||
|
Loading…
Reference in New Issue
Block a user