diff options
| author | Emmanuele Bassi <ebassi@linux.intel.com> | 2009-02-19 12:05:20 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2009-02-19 12:05:20 +0000 |
| commit | a0800b44ad81861539264ddd0ff3297b29980d46 (patch) | |
| tree | bd31bd48e7d13b4113fc83a3d5af84af9888226c /clutter/clutter-texture.h | |
| parent | 3c073d82c79c6d2c109d14c1b44d8c4c707c2bb6 (diff) | |
| download | clutter-a0800b44ad81861539264ddd0ff3297b29980d46.tar.gz | |
[texture] Use COGL_TYPE_HANDLE for the handle properties
The :texture and :material properties of ClutterTexture use a
Clutter-provided GType shielding from CoglHandle. Since CoglHandle
now has a GType we can use COGL_TYPE_HANDLE instead.
This commit also removes the conditional compilation of the
:material property, as it makes little sense now that the
Materials API has landed.
Diffstat (limited to 'clutter/clutter-texture.h')
| -rw-r--r-- | clutter/clutter-texture.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/clutter/clutter-texture.h b/clutter/clutter-texture.h index c0b513453..fff5a991f 100644 --- a/clutter/clutter-texture.h +++ b/clutter/clutter-texture.h @@ -40,9 +40,6 @@ G_BEGIN_DECLS #define CLUTTER_IS_TEXTURE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_TEXTURE)) #define CLUTTER_TEXTURE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_TEXTURE, ClutterTextureClass)) -#define CLUTTER_TYPE_TEXTURE_HANDLE (clutter_texture_handle_get_type ()) -#define CLUTTER_TYPE_MATERIAL_HANDLE (clutter_material_handle_get_type ()) - /** * ClutterTextureError: * @CLUTTER_TEXTURE_ERROR_OUT_OF_MEMORY: OOM condition |