[cluttermm] Use clutter-1.0.



commit 52f95ec4ebabc1ae4616bbac960b95dcb693c740
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Aug 26 11:28:24 2009 +0200

    Use clutter-1.0.
    
    	* configure.in: Use clutter-1.0 instead of clutter-0.9.
    	* clutter/src/clutter_methods.defs:
    	* clutter/src/clutter_enums.defs: Regenerated.

 ChangeLog                        |    6 +++
 clutter/src/clutter_enums.defs   |   31 +++++++------
 clutter/src/clutter_methods.defs |   90 +++++++++++++++++++++-----------------
 configure.in                     |    2 +-
 4 files changed, 73 insertions(+), 56 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a220dca..cef5f34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-26  Murray Cumming  <murrayc murrayc com>
+
+	* configure.in: Use clutter-1.0 instead of clutter-0.9.
+	* clutter/src/clutter_methods.defs:
+	* clutter/src/clutter_enums.defs: Regenerated.
+
 2009-07-29  Siavash Safi  <siavashs siavashs org>
 
 	patch by: Milosz Derezynski <internalerror gmail com>
diff --git a/clutter/src/clutter_enums.defs b/clutter/src/clutter_enums.defs
index 29e2eaa..b9183ad 100644
--- a/clutter/src/clutter_enums.defs
+++ b/clutter/src/clutter_enums.defs
@@ -1,4 +1,4 @@
-;; From /home/murrayc/svn/gnome220/clutter/clutter/clutter-actor.h
+;; From clutter-actor.h
 
 (define-flags-extended ActorFlags
   (in-module "Clutter")
@@ -20,7 +20,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/clutter/clutter/clutter-debug.h
+;; From clutter-debug.h
 
 (define-flags-extended DebugFlag
   (in-module "Clutter")
@@ -42,10 +42,11 @@
     '("multistage" "CLUTTER_DEBUG_MULTISTAGE" "1 << 13")
     '("animation" "CLUTTER_DEBUG_ANIMATION" "1 << 14")
     '("layout" "CLUTTER_DEBUG_LAYOUT" "1 << 15")
+    '("nop-picking" "CLUTTER_DEBUG_NOP_PICKING" "1 << 16")
   )
 )
 
-;; From /home/murrayc/svn/gnome220/clutter/clutter/clutter-event.h
+;; From clutter-event.h
 
 (define-flags-extended ModifierType
   (in-module "Clutter")
@@ -133,7 +134,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/clutter/clutter/clutter-feature.h
+;; From clutter-feature.h
 
 (define-flags-extended FeatureFlags
   (in-module "Clutter")
@@ -152,7 +153,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/clutter/clutter/clutter-main.h
+;; From clutter-main.h
 
 (define-enum-extended InitError
   (in-module "Clutter")
@@ -166,7 +167,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/clutter/clutter/clutter-path.h
+;; From clutter-path.h
 
 (define-enum-extended PathNodeType
   (in-module "Clutter")
@@ -182,7 +183,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/clutter/clutter/clutter-private.h
+;; From clutter-private.h
 
 (define-flags-extended PrivateFlags
   (in-module "Clutter")
@@ -194,11 +195,11 @@
     '("actor-in-reparent" "CLUTTER_ACTOR_IN_REPARENT" "1 << 2")
     '("actor-in-paint" "CLUTTER_ACTOR_IN_PAINT" "1 << 4")
     '("actor-in-relayout" "CLUTTER_ACTOR_IN_RELAYOUT" "1 << 5")
-    '("texture-in-clone-paint" "CLUTTER_TEXTURE_IN_CLONE_PAINT" "1 << 6")
+    '("stage-in-resize" "CLUTTER_STAGE_IN_RESIZE" "1 << 6")
   )
 )
 
-;; From /home/murrayc/svn/gnome220/clutter/clutter/clutter-script.h
+;; From clutter-script.h
 
 (define-enum-extended ScriptError
   (in-module "Clutter")
@@ -210,7 +211,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/clutter/clutter/clutter-shader.h
+;; From clutter-shader.h
 
 (define-enum-extended ShaderError
   (in-module "Clutter")
@@ -222,7 +223,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/clutter/clutter/clutter-stage.h
+;; From clutter-stage.h
 
 (define-enum-extended PickMode
   (in-module "Clutter")
@@ -234,7 +235,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/clutter/clutter/clutter-texture.h
+;; From clutter-texture.h
 
 (define-enum-extended TextureError
   (in-module "Clutter")
@@ -267,7 +268,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/clutter/clutter/clutter-timeline.h
+;; From clutter-timeline.h
 
 (define-enum-extended TimelineDirection
   (in-module "Clutter")
@@ -278,7 +279,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/clutter/clutter/clutter-types.h
+;; From clutter-types.h
 
 (define-enum-extended Gravity
   (in-module "Clutter")
@@ -374,7 +375,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/clutter/clutter/clutter-units.h
+;; From clutter-units.h
 
 (define-enum-extended UnitType
   (in-module "Clutter")
diff --git a/clutter/src/clutter_methods.defs b/clutter/src/clutter_methods.defs
index 844a000..3872352 100644
--- a/clutter/src/clutter_methods.defs
+++ b/clutter/src/clutter_methods.defs
@@ -271,6 +271,7 @@
     '("multistage" "CLUTTER_DEBUG_MULTISTAGE")
     '("animation" "CLUTTER_DEBUG_ANIMATION")
     '("layout" "CLUTTER_DEBUG_LAYOUT")
+    '("nop-picking" "CLUTTER_DEBUG_NOP_PICKING")
   )
 )
 
@@ -424,7 +425,7 @@
     '("actor-sync-matrices" "CLUTTER_ACTOR_SYNC_MATRICES")
     '("actor-in-paint" "CLUTTER_ACTOR_IN_PAINT")
     '("actor-in-relayout" "CLUTTER_ACTOR_IN_RELAYOUT")
-    '("texture-in-clone-paint" "CLUTTER_TEXTURE_IN_CLONE_PAINT")
+    '("stage-in-resize" "CLUTTER_STAGE_IN_RESIZE")
   )
 )
 
@@ -703,15 +704,6 @@
   (return-type "none")
 )
 
-(define-method pick
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_pick")
-  (return-type "none")
-  (parameters
-    '("const-ClutterColor*" "color")
-  )
-)
-
 (define-method queue_redraw
   (of-object "ClutterActor")
   (c-name "clutter_actor_queue_redraw")
@@ -796,18 +788,6 @@
   )
 )
 
-(define-method get_allocation_coords
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_allocation_coords")
-  (return-type "none")
-  (parameters
-    '("gint*" "x_1")
-    '("gint*" "y_1")
-    '("gint*" "x_2")
-    '("gint*" "y_2")
-  )
-)
-
 (define-method get_allocation_box
   (of-object "ClutterActor")
   (c-name "clutter_actor_get_allocation_box")
@@ -832,7 +812,7 @@
   (return-type "none")
   (parameters
     '("ClutterActor*" "ancestor")
-    '("ClutterVertex" "verts[4]")
+    '("ClutterVertex[]" "verts")
   )
 )
 
@@ -1431,7 +1411,7 @@
   (c-name "clutter_actor_get_abs_allocation_vertices")
   (return-type "none")
   (parameters
-    '("ClutterVertex" "verts[4]")
+    '("ClutterVertex[]" "verts")
   )
 )
 
@@ -1483,6 +1463,21 @@
   )
 )
 
+(define-method get_transformation_matrix
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_transformation_matrix")
+  (return-type "none")
+  (parameters
+    '("CoglMatrix*" "matrix")
+  )
+)
+
+(define-method is_in_clone_paint
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_is_in_clone_paint")
+  (return-type "gboolean")
+)
+
 
 
 ;; From clutter-alpha.h
@@ -5764,6 +5759,21 @@
   (return-type "none")
 )
 
+(define-method set_throttle_motion_events
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_throttle_motion_events")
+  (return-type "none")
+  (parameters
+    '("gboolean" "throttle")
+  )
+)
+
+(define-method get_throttle_motion_events
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_throttle_motion_events")
+  (return-type "gboolean")
+)
+
 
 
 ;; From clutter-stage-manager.h
@@ -6987,27 +6997,27 @@
   (return-type "none")
 )
 
-(define-method pixels
+(define-method from_pixels
   (of-object "ClutterUnits")
-  (c-name "clutter_units_pixels")
+  (c-name "clutter_units_from_pixels")
   (return-type "none")
   (parameters
     '("gint" "px")
   )
 )
 
-(define-method em
+(define-method from_em
   (of-object "ClutterUnits")
-  (c-name "clutter_units_em")
+  (c-name "clutter_units_from_em")
   (return-type "none")
   (parameters
     '("gfloat" "em")
   )
 )
 
-(define-method em_for_font
+(define-method from_em_for_font
   (of-object "ClutterUnits")
-  (c-name "clutter_units_em_for_font")
+  (c-name "clutter_units_from_em_for_font")
   (return-type "none")
   (parameters
     '("const-gchar*" "font_name")
@@ -7015,18 +7025,18 @@
   )
 )
 
-(define-method mm
+(define-method from_mm
   (of-object "ClutterUnits")
-  (c-name "clutter_units_mm")
+  (c-name "clutter_units_from_mm")
   (return-type "none")
   (parameters
     '("gfloat" "mm")
   )
 )
 
-(define-method pt
+(define-method from_pt
   (of-object "ClutterUnits")
-  (c-name "clutter_units_pt")
+  (c-name "clutter_units_from_pt")
   (return-type "none")
   (parameters
     '("gfloat" "pt")
@@ -7039,12 +7049,6 @@
   (return-type "gfloat")
 )
 
-(define-method to_string
-  (of-object "ClutterUnits")
-  (c-name "clutter_units_to_string")
-  (return-type "gchar*")
-)
-
 (define-method from_string
   (of-object "ClutterUnits")
   (c-name "clutter_units_from_string")
@@ -7054,6 +7058,12 @@
   )
 )
 
+(define-method to_string
+  (of-object "ClutterUnits")
+  (c-name "clutter_units_to_string")
+  (return-type "gchar*")
+)
+
 (define-function clutter_param_units_get_type
   (c-name "clutter_param_units_get_type")
   (return-type "GType")
diff --git a/configure.in b/configure.in
index 6f8a146..09de6cf 100644
--- a/configure.in
+++ b/configure.in
@@ -74,7 +74,7 @@ AC_CHECK_PROGS(PERL, perl5 perl)
 # Note: We depend on cairomm only because pangomm depends on it
 # (but it was not in the pangomm .pc file until recently).
 PKG_CHECK_MODULES(CLUTTERMM,
-                  [clutter-0.9 >= 0.9.4
+                  [clutter-1.0 >= 1.0.0
                    glibmm-2.4 >= 2.14
                    pangomm-1.4 >= 2.12
                    cairomm-1.0])



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]