gnomemm r1358 - in cluttermm/trunk: . clutter/src

[murrayc svn gnome org]

Author: murrayc
Date: Thu Feb 21 15:45:59 2008
New Revision: 1358
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1358&view=rev

Log:
2008-02-21  Murray Cumming  <murrayc murrayc com>

* configure.in: Depend on clutter-0.6 instead of clutter-0.5.
* clutter/src/clutter_methods.defs: Regenereated with h2defs.py.

* clutter/src/clutter_vfuncs.defs:
* clutter/src/stage.hg: Remove set_offscreen() vfunc because it was 
removed from clutter.

* clutter/src/entry.hg: Renamed set_position() to set_cursor_position(), 
to match the change in clutter.

Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/clutter/src/clutter_methods.defs
   cluttermm/trunk/clutter/src/clutter_vfuncs.defs
   cluttermm/trunk/clutter/src/entry.hg
   cluttermm/trunk/clutter/src/stage.hg
   cluttermm/trunk/configure.in

Modified: cluttermm/trunk/clutter/src/clutter_methods.defs
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_methods.defs	(original)
+++ cluttermm/trunk/clutter/src/clutter_methods.defs	Thu Feb 21 15:45:59 2008
@@ -77,13 +77,6 @@
   (gtype-id "CLUTTER_TYPE_BEHAVIOUR_SCALE")
 )
 
-(define-object Box
-  (in-module "Clutter")
-  (parent "ClutterActor")
-  (c-name "ClutterBox")
-  (gtype-id "CLUTTER_TYPE_BOX")
-)
-
 (define-object CloneTexture
   (in-module "Clutter")
   (parent "ClutterActor")
@@ -118,13 +111,6 @@
   (gtype-id "CLUTTER_TYPE_GROUP")
 )
 
-(define-object HBox
-  (in-module "Clutter")
-  (parent "ClutterBox")
-  (c-name "ClutterHBox")
-  (gtype-id "CLUTTER_TYPE_HBOX")
-)
-
 (define-object Label
   (in-module "Clutter")
   (parent "ClutterActor")
@@ -132,12 +118,6 @@
   (gtype-id "CLUTTER_TYPE_LABEL")
 )
 
-(define-object Layout
-  (in-module "Clutter")
-  (c-name "ClutterLayout")
-  (gtype-id "CLUTTER_TYPE_LAYOUT")
-)
-
 (define-object Model
   (in-module "Clutter")
   (parent "GObject")
@@ -207,13 +187,6 @@
   (gtype-id "CLUTTER_TYPE_TIMELINE")
 )
 
-(define-object VBox
-  (in-module "Clutter")
-  (parent "ClutterBox")
-  (c-name "ClutterVBox")
-  (gtype-id "CLUTTER_TYPE_VBOX")
-)
-
 ;; Enumerations and flags ...
 
 (define-flags ActorFlags
@@ -227,13 +200,24 @@
   )
 )
 
-(define-enum PackType
+(define-flags DebugFlag
   (in-module "Clutter")
-  (c-name "ClutterPackType")
-  (gtype-id "CLUTTER_TYPE_PACK_TYPE")
+  (c-name "ClutterDebugFlag")
+  (gtype-id "CLUTTER_TYPE_DEBUG_FLAG")
   (values
-    '("start" "CLUTTER_PACK_START")
-    '("end" "CLUTTER_PACK_END")
+    '("misc" "CLUTTER_DEBUG_MISC")
+    '("actor" "CLUTTER_DEBUG_ACTOR")
+    '("texture" "CLUTTER_DEBUG_TEXTURE")
+    '("event" "CLUTTER_DEBUG_EVENT")
+    '("paint" "CLUTTER_DEBUG_PAINT")
+    '("gl" "CLUTTER_DEBUG_GL")
+    '("alpha" "CLUTTER_DEBUG_ALPHA")
+    '("behaviour" "CLUTTER_DEBUG_BEHAVIOUR")
+    '("pango" "CLUTTER_DEBUG_PANGO")
+    '("backend" "CLUTTER_DEBUG_BACKEND")
+    '("scheduler" "CLUTTER_DEBUG_SCHEDULER")
+    '("script" "CLUTTER_DEBUG_SCRIPT")
+    '("shader" "CLUTTER_DEBUG_SHADER")
   )
 )
 
@@ -324,19 +308,7 @@
     '("stage-user-resize" "CLUTTER_FEATURE_STAGE_USER_RESIZE")
     '("stage-cursor" "CLUTTER_FEATURE_STAGE_CURSOR")
     '("shaders-glsl" "CLUTTER_FEATURE_SHADERS_GLSL")
-  )
-)
-
-(define-flags LayoutFlags
-  (in-module "Clutter")
-  (c-name "ClutterLayoutFlags")
-  (gtype-id "CLUTTER_TYPE_LAYOUT_FLAGS")
-  (values
-    '("none" "CLUTTER_LAYOUT_NONE")
-    '("width-for-height" "CLUTTER_LAYOUT_WIDTH_FOR_HEIGHT")
-    '("height-for-width" "CLUTTER_LAYOUT_HEIGHT_FOR_WIDTH")
-    '("natural" "CLUTTER_LAYOUT_NATURAL")
-    '("tunable" "CLUTTER_LAYOUT_TUNABLE")
+    '("offscreen" "CLUTTER_FEATURE_OFFSCREEN")
   )
 )
 
@@ -353,6 +325,30 @@
   )
 )
 
+(define-flags PrivateFlags
+  (in-module "Clutter")
+  (c-name "ClutterPrivateFlags")
+  (gtype-id "CLUTTER_TYPE_PRIVATE_FLAGS")
+  (values
+    '("unused-flag" "CLUTTER_ACTOR_UNUSED_FLAG")
+    '("in-destruction" "CLUTTER_ACTOR_IN_DESTRUCTION")
+    '("is-toplevel" "CLUTTER_ACTOR_IS_TOPLEVEL")
+    '("in-reparent" "CLUTTER_ACTOR_IN_REPARENT")
+    '("sync-matrices" "CLUTTER_ACTOR_SYNC_MATRICES")
+  )
+)
+
+(define-enum PickMode
+  (in-module "Clutter")
+  (c-name "ClutterPickMode")
+  (gtype-id "CLUTTER_TYPE_PICK_MODE")
+  (values
+    '("none" "CLUTTER_PICK_NONE")
+    '("reactive" "CLUTTER_PICK_REACTIVE")
+    '("all" "CLUTTER_PICK_ALL")
+  )
+)
+
 (define-enum ScriptError
   (in-module "Clutter")
   (c-name "ClutterScriptError")
@@ -1109,6 +1105,16 @@
   )
 )
 
+(define-method get_relative_vertices
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_relative_vertices")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "ancestor")
+    '("ClutterVertex" "verts[4]")
+  )
+)
+
 (define-method apply_transform_to_point
   (of-object "ClutterActor")
   (c-name "clutter_actor_apply_transform_to_point")
@@ -1119,6 +1125,17 @@
   )
 )
 
+(define-method apply_relative_transform_to_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_apply_relative_transform_to_point")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "ancestor")
+    '("ClutterVertex*" "point")
+    '("ClutterVertex*" "vertex")
+  )
+)
+
 (define-method event
   (of-object "ClutterActor")
   (c-name "clutter_actor_event")
@@ -1143,15 +1160,21 @@
   (return-type "gboolean")
 )
 
-(define-method apply_shader
+(define-method set_shader
   (of-object "ClutterActor")
-  (c-name "clutter_actor_apply_shader")
+  (c-name "clutter_actor_set_shader")
   (return-type "gboolean")
   (parameters
     '("ClutterShader*" "shader")
   )
 )
 
+(define-method get_shader
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_shader")
+  (return-type "ClutterShader*")
+)
+
 (define-method set_shader_param
   (of-object "ClutterActor")
   (c-name "clutter_actor_set_shader_param")
@@ -1172,6 +1195,16 @@
   )
 )
 
+(define-method move_anchor_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_move_anchor_point")
+  (return-type "none")
+  (parameters
+    '("gint" "anchor_x")
+    '("gint" "anchor_y")
+  )
+)
+
 (define-method get_anchor_point
   (of-object "ClutterActor")
   (c-name "clutter_actor_get_anchor_point")
@@ -1192,6 +1225,16 @@
   )
 )
 
+(define-method move_anchor_pointu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_move_anchor_pointu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit" "anchor_x")
+    '("ClutterUnit" "anchor_y")
+  )
+)
+
 (define-method get_anchor_pointu
   (of-object "ClutterActor")
   (c-name "clutter_actor_get_anchor_pointu")
@@ -1211,6 +1254,15 @@
   )
 )
 
+(define-method move_anchor_point_from_gravity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_move_anchor_point_from_gravity")
+  (return-type "none")
+  (parameters
+    '("ClutterGravity" "gravity")
+  )
+)
+
 (define-method transform_stage_point
   (of-object "ClutterActor")
   (c-name "clutter_actor_transform_stage_point")
@@ -1223,6 +1275,27 @@
   )
 )
 
+(define-method is_rotated
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_is_rotated")
+  (return-type "gboolean")
+)
+
+(define-method is_scaled
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_is_scaled")
+  (return-type "gboolean")
+)
+
+(define-function clutter_actor_box_get_from_vertices
+  (c-name "clutter_actor_box_get_from_vertices")
+  (return-type "none")
+  (parameters
+    '("ClutterVertex" "vtx[4]")
+    '("ClutterActorBox*" "box")
+  )
+)
+
 
 
 ;; From clutter-alpha.h
@@ -1568,6 +1641,26 @@
   )
 )
 
+(define-method set_bounds
+  (of-object "ClutterBehaviourDepth")
+  (c-name "clutter_behaviour_depth_set_bounds")
+  (return-type "none")
+  (parameters
+    '("gint" "depth_start")
+    '("gint" "depth_end")
+  )
+)
+
+(define-method get_bounds
+  (of-object "ClutterBehaviourDepth")
+  (c-name "clutter_behaviour_depth_get_bounds")
+  (return-type "none")
+  (parameters
+    '("gint*" "depth_start")
+    '("gint*" "depth_end")
+  )
+)
+
 
 
 ;; From clutter-behaviour-ellipse.h
@@ -2158,7 +2251,6 @@
     '("gdouble" "y_scale_start")
     '("gdouble" "x_scale_end")
     '("gdouble" "y_scale_end")
-    '("ClutterGravity" "gravity")
   )
 )
 
@@ -2171,7 +2263,6 @@
     '("ClutterFixed" "y_scale_start")
     '("ClutterFixed" "x_scale_end")
     '("ClutterFixed" "y_scale_end")
-    '("ClutterGravity" "gravity")
   )
 )
 
@@ -2223,136 +2314,6 @@
   )
 )
 
-(define-method set_gravity
-  (of-object "ClutterBehaviourScale")
-  (c-name "clutter_behaviour_scale_set_gravity")
-  (return-type "none")
-  (parameters
-    '("ClutterGravity" "gravity")
-  )
-)
-
-(define-method get_gravity
-  (of-object "ClutterBehaviourScale")
-  (c-name "clutter_behaviour_scale_get_gravity")
-  (return-type "ClutterGravity")
-)
-
-
-
-;; From clutter-box.h
-
-(define-function clutter_box_get_type
-  (c-name "clutter_box_get_type")
-  (return-type "GType")
-)
-
-(define-method set_color
-  (of-object "ClutterBox")
-  (c-name "clutter_box_set_color")
-  (return-type "none")
-  (parameters
-    '("const-ClutterColor*" "color")
-  )
-)
-
-(define-method get_color
-  (of-object "ClutterBox")
-  (c-name "clutter_box_get_color")
-  (return-type "none")
-  (parameters
-    '("ClutterColor*" "color")
-  )
-)
-
-(define-method set_margin
-  (of-object "ClutterBox")
-  (c-name "clutter_box_set_margin")
-  (return-type "none")
-  (parameters
-    '("const-ClutterMargin*" "margin")
-  )
-)
-
-(define-method get_margin
-  (of-object "ClutterBox")
-  (c-name "clutter_box_get_margin")
-  (return-type "none")
-  (parameters
-    '("ClutterMargin*" "margin")
-  )
-)
-
-(define-method set_default_padding
-  (of-object "ClutterBox")
-  (c-name "clutter_box_set_default_padding")
-  (return-type "none")
-  (parameters
-    '("gint" "padding_top")
-    '("gint" "padding_right")
-    '("gint" "padding_bottom")
-    '("gint" "padding_left")
-  )
-)
-
-(define-method get_default_padding
-  (of-object "ClutterBox")
-  (c-name "clutter_box_get_default_padding")
-  (return-type "none")
-  (parameters
-    '("gint*" "padding_top")
-    '("gint*" "padding_right")
-    '("gint*" "padding_bottom")
-    '("gint*" "padding_left")
-  )
-)
-
-(define-method pack
-  (of-object "ClutterBox")
-  (c-name "clutter_box_pack")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-    '("ClutterPackType" "pack_type")
-    '("const-ClutterPadding*" "padding")
-  )
-)
-
-(define-method pack_defaults
-  (of-object "ClutterBox")
-  (c-name "clutter_box_pack_defaults")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
-)
-
-(define-method remove_all
-  (of-object "ClutterBox")
-  (c-name "clutter_box_remove_all")
-  (return-type "none")
-)
-
-(define-method query_child
-  (of-object "ClutterBox")
-  (c-name "clutter_box_query_child")
-  (return-type "gboolean")
-  (parameters
-    '("ClutterActor*" "actor")
-    '("ClutterBoxChild*" "child")
-  )
-)
-
-(define-method query_nth_child
-  (of-object "ClutterBox")
-  (c-name "clutter_box_query_nth_child")
-  (return-type "gboolean")
-  (parameters
-    '("gint" "index_")
-    '("ClutterBoxChild*" "child")
-  )
-)
-
 
 
 ;; From clutter-clone-texture.h
@@ -2668,6 +2629,10 @@
 
 
 
+;; From clutter-debug.h
+
+
+
 ;; From clutter-deprecated.h
 
 
@@ -2794,7 +2759,6 @@
     '("ClutterActor*" "actor")
     '("gdouble" "x_scale_end")
     '("gdouble" "y_scale_end")
-    '("ClutterGravity" "gravity")
     '("ClutterEffectCompleteFunc" "func")
     '("gpointer" "data")
   )
@@ -2920,18 +2884,18 @@
   (return-type "PangoAlignment")
 )
 
-(define-method set_position
+(define-method set_cursor_position
   (of-object "ClutterEntry")
-  (c-name "clutter_entry_set_position")
+  (c-name "clutter_entry_set_cursor_position")
   (return-type "none")
   (parameters
     '("gint" "position")
   )
 )
 
-(define-method get_position
+(define-method get_cursor_position
   (of-object "ClutterEntry")
-  (c-name "clutter_entry_get_position")
+  (c-name "clutter_entry_get_cursor_position")
   (return-type "gint")
 )
 
@@ -3331,10 +3295,6 @@
 
 
 
-;; From clutter-glx.h
-
-
-
 ;; From clutter-group.h
 
 (define-function clutter_group_get_type
@@ -3430,26 +3390,15 @@
 
 
 
-;; From clutter-hbox.h
-
-(define-function clutter_hbox_get_type
-  (c-name "clutter_hbox_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_hbox_new
-  (c-name "clutter_hbox_new")
-  (is-constructor-of "ClutterHbox")
-  (return-type "ClutterActor*")
-)
+;; From clutter-json.h
 
 
 
-;; From clutter-json.h
+;; From clutter-keysyms.h
 
 
 
-;; From clutter-keysyms.h
+;; From clutter-keysyms-table.h
 
 
 
@@ -3646,63 +3595,6 @@
 
 
 
-;; From clutter-layout.h
-
-(define-function clutter_layout_get_type
-  (c-name "clutter_layout_get_type")
-  (return-type "GType")
-)
-
-(define-method get_layout_flags
-  (of-object "ClutterLayout")
-  (c-name "clutter_layout_get_layout_flags")
-  (return-type "ClutterLayoutFlags")
-)
-
-(define-method width_for_height
-  (of-object "ClutterLayout")
-  (c-name "clutter_layout_width_for_height")
-  (return-type "none")
-  (parameters
-    '("gint*" "width")
-    '("gint" "height")
-  )
-)
-
-(define-method height_for_width
-  (of-object "ClutterLayout")
-  (c-name "clutter_layout_height_for_width")
-  (return-type "none")
-  (parameters
-    '("gint" "width")
-    '("gint*" "height")
-  )
-)
-
-(define-method natural_request
-  (of-object "ClutterLayout")
-  (c-name "clutter_layout_natural_request")
-  (return-type "none")
-  (parameters
-    '("gint*" "width")
-    '("gint*" "height")
-  )
-)
-
-(define-method tune_request
-  (of-object "ClutterLayout")
-  (c-name "clutter_layout_tune_request")
-  (return-type "none")
-  (parameters
-    '("gint" "given_width")
-    '("gint" "given_height")
-    '("gint*" "width")
-    '("gint*" "height")
-  )
-)
-
-
-
 ;; From clutter-list-model.h
 
 (define-function clutter_list_model_get_type
@@ -3791,6 +3683,14 @@
   (return-type "none")
 )
 
+(define-function clutter_do_event
+  (c-name "clutter_do_event")
+  (return-type "none")
+  (parameters
+    '("ClutterEvent*" "event")
+  )
+)
+
 (define-function clutter_get_debug_enabled
   (c-name "clutter_get_debug_enabled")
   (return-type "gboolean")
@@ -3949,6 +3849,10 @@
 
 
 
+;; From clutter-marshal.h
+
+
+
 ;; From clutter-media.h
 
 (define-function clutter_media_get_type
@@ -4045,54 +3949,20 @@
 
 
 
-;; From clutter-model-default.h
-
-(define-function clutter_model_default_iter_get_type
-  (c-name "clutter_model_default_iter_get_type")
-  (return-type "GType")
-)
+;; From clutter-model.h
 
-(define-function clutter_model_default_get_type
-  (c-name "clutter_model_default_get_type")
+(define-function clutter_model_get_type
+  (c-name "clutter_model_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_model_default_new
-  (c-name "clutter_model_default_new")
-  (is-constructor-of "ClutterModelDefault")
-  (return-type "ClutterModel*")
+(define-method set_types
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_types")
+  (return-type "none")
   (parameters
     '("guint" "n_columns")
-  )
-  (varargs #t)
-)
-
-(define-function clutter_model_default_newv
-  (c-name "clutter_model_default_newv")
-  (return-type "ClutterModel*")
-  (parameters
-    '("guint" "n_columns")
-    '("GType*" "types")
-    '("const-gchar*-const[]" "names")
-  )
-)
-
-
-
-;; From clutter-model.h
-
-(define-function clutter_model_get_type
-  (c-name "clutter_model_get_type")
-  (return-type "GType")
-)
-
-(define-method set_types
-  (of-object "ClutterModel")
-  (c-name "clutter_model_set_types")
-  (return-type "none")
-  (parameters
-    '("guint" "n_columns")
-    '("GType*" "types")
+    '("GType*" "types")
   )
 )
 
@@ -4410,6 +4280,58 @@
 
 
 
+;; From clutter-model-private.h
+
+(define-method set_n_columns
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_n_columns")
+  (return-type "none")
+  (parameters
+    '("gint" "n_columns")
+    '("gboolean" "set_types")
+    '("gboolean" "set_names")
+  )
+)
+
+(define-function clutter_model_check_type
+  (c-name "clutter_model_check_type")
+  (return-type "gboolean")
+  (parameters
+    '("GType" "gtype")
+  )
+)
+
+(define-method set_column_type
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_column_type")
+  (return-type "none")
+  (parameters
+    '("gint" "column")
+    '("GType" "gtype")
+  )
+)
+
+(define-method set_column_name
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_column_name")
+  (return-type "none")
+  (parameters
+    '("gint" "column")
+    '("const-gchar*" "name")
+  )
+)
+
+
+
+;; From clutter-private.h
+
+(define-function clutter_context_get_default
+  (c-name "clutter_context_get_default")
+  (return-type "ClutterMainContext*")
+)
+
+
+
 ;; From clutter-rectangle.h
 
 (define-function clutter_rectangle_get_type
@@ -4742,6 +4664,112 @@
 
 
 
+;; From clutter-script-private.h
+
+(define-function object_info_free
+  (c-name "object_info_free")
+  (return-type "none")
+  (parameters
+    '("gpointer" "data")
+  )
+)
+
+(define-function property_info_free
+  (c-name "property_info_free")
+  (return-type "none")
+  (parameters
+    '("gpointer" "data")
+  )
+)
+
+(define-method parse_node
+  (of-object "ClutterScript")
+  (c-name "clutter_script_parse_node")
+  (return-type "gboolean")
+  (parameters
+    '("GValue*" "value")
+    '("const-gchar*" "name")
+    '("JsonNode*" "node")
+    '("GParamSpec*" "pspec")
+  )
+)
+
+(define-function clutter_script_get_type_from_symbol
+  (c-name "clutter_script_get_type_from_symbol")
+  (return-type "GType")
+  (parameters
+    '("const-gchar*" "symbol")
+  )
+)
+
+(define-function clutter_script_get_type_from_class
+  (c-name "clutter_script_get_type_from_class")
+  (return-type "GType")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method construct_object
+  (of-object "ClutterScript")
+  (c-name "clutter_script_construct_object")
+  (return-type "GObject*")
+  (parameters
+    '("ObjectInfo*" "info")
+  )
+)
+
+(define-function clutter_script_enum_from_string
+  (c-name "clutter_script_enum_from_string")
+  (return-type "gboolean")
+  (parameters
+    '("GType" "gtype")
+    '("const-gchar*" "string")
+    '("gint*" "enum_value")
+  )
+)
+
+(define-function clutter_script_flags_from_string
+  (c-name "clutter_script_flags_from_string")
+  (return-type "gboolean")
+  (parameters
+    '("GType" "gtype")
+    '("const-gchar*" "string")
+    '("gint*" "flags_value")
+  )
+)
+
+(define-method parse_knot
+  (of-object "ClutterScript")
+  (c-name "clutter_script_parse_knot")
+  (return-type "gboolean")
+  (parameters
+    '("JsonNode*" "node")
+    '("ClutterKnot*" "knot")
+  )
+)
+
+(define-method parse_geometry
+  (of-object "ClutterScript")
+  (c-name "clutter_script_parse_geometry")
+  (return-type "gboolean")
+  (parameters
+    '("JsonNode*" "node")
+    '("ClutterGeometry*" "geometry")
+  )
+)
+
+(define-method parse_alpha
+  (of-object "ClutterScript")
+  (c-name "clutter_script_parse_alpha")
+  (return-type "GObject*")
+  (parameters
+    '("JsonNode*" "node")
+  )
+)
+
+
+
 ;; From clutter-shader.h
 
 (define-function clutter_shader_error_quark
@@ -5138,6 +5166,14 @@
   )
 )
 
+(define-function clutter_texture_new_from_actor
+  (c-name "clutter_texture_new_from_actor")
+  (return-type "ClutterActor*")
+  (parameters
+    '("ClutterActor*" "actor")
+  )
+)
+
 (define-method set_area_from_rgb_data
   (of-object "ClutterTexture")
   (c-name "clutter_texture_set_area_from_rgb_data")
@@ -5540,640 +5576,14 @@
 
 
 
-;; From clutter-vbox.h
-
-(define-function clutter_vbox_get_type
-  (c-name "clutter_vbox_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_vbox_new
-  (c-name "clutter_vbox_new")
-  (is-constructor-of "ClutterVbox")
-  (return-type "ClutterActor*")
-)
-
-
-
 ;; From clutter-version.h
 
 
 
-;; From clutter-x11.h
-
-(define-function clutter_x11_trap_x_errors
-  (c-name "clutter_x11_trap_x_errors")
-  (return-type "none")
-)
-
-(define-function clutter_x11_untrap_x_errors
-  (c-name "clutter_x11_untrap_x_errors")
-  (return-type "gint")
-)
-
-(define-function clutter_x11_get_default_display
-  (c-name "clutter_x11_get_default_display")
-  (return-type "Display*")
-)
-
-(define-function clutter_x11_get_default_screen
-  (c-name "clutter_x11_get_default_screen")
-  (return-type "int")
-)
-
-(define-function clutter_x11_get_root_window
-  (c-name "clutter_x11_get_root_window")
-  (return-type "Window")
-)
-
-(define-function clutter_x11_get_stage_window
-  (c-name "clutter_x11_get_stage_window")
-  (return-type "Window")
-  (parameters
-    '("ClutterStage*" "stage")
-  )
-)
-
-(define-function clutter_x11_get_stage_visual
-  (c-name "clutter_x11_get_stage_visual")
-  (return-type "XVisualInfo*")
-  (parameters
-    '("ClutterStage*" "stage")
-  )
-)
-
-(define-function clutter_x11_set_stage_foreign
-  (c-name "clutter_x11_set_stage_foreign")
-  (return-type "gboolean")
-  (parameters
-    '("ClutterStage*" "stage")
-    '("Window" "xwindow")
-  )
-)
-
-(define-function clutter_x11_add_filter
-  (c-name "clutter_x11_add_filter")
-  (return-type "none")
-  (parameters
-    '("ClutterX11FilterFunc" "func")
-    '("gpointer" "data")
-  )
-)
-
-(define-function clutter_x11_remove_filter
-  (c-name "clutter_x11_remove_filter")
-  (return-type "none")
-  (parameters
-    '("ClutterX11FilterFunc" "func")
-    '("gpointer" "data")
-  )
-)
-
-
-
-;; From cogl-defines.h
-
-
-
-;; From cogl.h
-
-(define-function cogl_get_proc_address
-  (c-name "cogl_get_proc_address")
-  (return-type "CoglFuncPtr")
-  (parameters
-    '("const-gchar*" "name")
-  )
-)
-
-(define-function cogl_check_extension
-  (c-name "cogl_check_extension")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "name")
-    '("const-gchar*" "ext")
-  )
-)
-
-(define-function cogl_perspective
-  (c-name "cogl_perspective")
-  (return-type "none")
-  (parameters
-    '("ClutterFixed" "fovy")
-    '("ClutterFixed" "aspect")
-    '("ClutterFixed" "zNear")
-    '("ClutterFixed" "zFar")
-  )
-)
-
-(define-function cogl_setup_viewport
-  (c-name "cogl_setup_viewport")
-  (return-type "none")
-  (parameters
-    '("guint" "width")
-    '("guint" "height")
-    '("ClutterFixed" "fovy")
-    '("ClutterFixed" "aspect")
-    '("ClutterFixed" "z_near")
-    '("ClutterFixed" "z_far")
-  )
-)
-
-(define-function cogl_paint_init
-  (c-name "cogl_paint_init")
-  (return-type "none")
-  (parameters
-    '("const-ClutterColor*" "color")
-  )
-)
-
-(define-function cogl_push_matrix
-  (c-name "cogl_push_matrix")
-  (return-type "none")
-)
-
-(define-function cogl_pop_matrix
-  (c-name "cogl_pop_matrix")
-  (return-type "none")
-)
+;; From stamp-clutter-enum-types.h
 
-(define-function cogl_scale
-  (c-name "cogl_scale")
-  (return-type "none")
-  (parameters
-    '("ClutterFixed" "x")
-    '("ClutterFixed" "z")
-  )
-)
 
-(define-function cogl_translatex
-  (c-name "cogl_translatex")
-  (return-type "none")
-  (parameters
-    '("ClutterFixed" "x")
-    '("ClutterFixed" "y")
-    '("ClutterFixed" "z")
-  )
-)
 
-(define-function cogl_translate
-  (c-name "cogl_translate")
-  (return-type "none")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "z")
-  )
-)
-
-(define-function cogl_rotatex
-  (c-name "cogl_rotatex")
-  (return-type "none")
-  (parameters
-    '("ClutterFixed" "angle")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "z")
-  )
-)
-
-(define-function cogl_rotate
-  (c-name "cogl_rotate")
-  (return-type "none")
-  (parameters
-    '("gint" "angle")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "z")
-  )
-)
-
-(define-function cogl_color
-  (c-name "cogl_color")
-  (return-type "none")
-  (parameters
-    '("const-ClutterColor*" "color")
-  )
-)
-
-(define-function cogl_clip_set
-  (c-name "cogl_clip_set")
-  (return-type "none")
-  (parameters
-    '("ClutterFixed" "x_offset")
-    '("ClutterFixed" "y_offset")
-    '("ClutterFixed" "width")
-    '("ClutterFixed" "height")
-  )
-)
-
-(define-function cogl_clip_unset
-  (c-name "cogl_clip_unset")
-  (return-type "none")
-)
-
-(define-function cogl_enable
-  (c-name "cogl_enable")
-  (return-type "none")
-  (parameters
-    '("gulong" "flags")
-  )
-)
-
-(define-function cogl_texture_can_size
-  (c-name "cogl_texture_can_size")
-  (return-type "gboolean")
-  (parameters
-    '("COGLenum" "target")
-    '("COGLenum" "pixel_format")
-    '("COGLenum" "pixel_type")
-    '("int" "width")
-    '("int" "height")
-  )
-)
-
-(define-function cogl_texture_quad
-  (c-name "cogl_texture_quad")
-  (return-type "none")
-  (parameters
-    '("gint" "x1")
-    '("gint" "x2")
-    '("gint" "y1")
-    '("gint" "y2")
-    '("ClutterFixed" "tx1")
-    '("ClutterFixed" "ty1")
-    '("ClutterFixed" "tx2")
-    '("ClutterFixed" "ty2")
-  )
-)
-
-(define-function cogl_textures_create
-  (c-name "cogl_textures_create")
-  (return-type "none")
-  (parameters
-    '("guint" "num")
-    '("COGLuint*" "textures")
-  )
-)
-
-(define-function cogl_textures_destroy
-  (c-name "cogl_textures_destroy")
-  (return-type "none")
-  (parameters
-    '("guint" "num")
-    '("const-COGLuint*" "textures")
-  )
-)
-
-(define-function cogl_texture_bind
-  (c-name "cogl_texture_bind")
-  (return-type "none")
-  (parameters
-    '("COGLenum" "target")
-    '("COGLuint" "texture")
-  )
-)
-
-(define-function cogl_texture_set_alignment
-  (c-name "cogl_texture_set_alignment")
-  (return-type "none")
-  (parameters
-    '("COGLenum" "target")
-    '("guint" "alignment")
-    '("guint" "row_length")
-  )
-)
-
-(define-function cogl_texture_set_filters
-  (c-name "cogl_texture_set_filters")
-  (return-type "none")
-  (parameters
-    '("COGLenum" "target")
-    '("COGLenum" "min_filter")
-    '("COGLenum" "max_filter")
-  )
-)
-
-(define-function cogl_texture_set_wrap
-  (c-name "cogl_texture_set_wrap")
-  (return-type "none")
-  (parameters
-    '("COGLenum" "target")
-    '("COGLenum" "wrap_s")
-    '("COGLenum" "wrap_t")
-  )
-)
-
-(define-function cogl_texture_image_2d
-  (c-name "cogl_texture_image_2d")
-  (return-type "none")
-  (parameters
-    '("COGLenum" "target")
-    '("COGLint" "internal_format")
-    '("gint" "width")
-    '("gint" "height")
-    '("COGLenum" "format")
-    '("COGLenum" "type")
-    '("const-guchar*" "pixels")
-  )
-)
-
-(define-function cogl_texture_sub_image_2d
-  (c-name "cogl_texture_sub_image_2d")
-  (return-type "none")
-  (parameters
-    '("COGLenum" "target")
-    '("gint" "xoff")
-    '("gint" "yoff")
-    '("gint" "width")
-    '("gint" "height")
-    '("COGLenum" "format")
-    '("COGLenum" "type")
-    '("const-guchar*" "pixels")
-  )
-)
-
-(define-function cogl_rectangle
-  (c-name "cogl_rectangle")
-  (return-type "none")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-    '("guint" "width")
-    '("guint" "height")
-  )
-)
-
-(define-function cogl_trapezoid
-  (c-name "cogl_trapezoid")
-  (return-type "none")
-  (parameters
-    '("gint" "y1")
-    '("gint" "x11")
-    '("gint" "x21")
-    '("gint" "y2")
-    '("gint" "x12")
-    '("gint" "x22")
-  )
-)
-
-(define-function cogl_alpha_func
-  (c-name "cogl_alpha_func")
-  (return-type "none")
-  (parameters
-    '("COGLenum" "func")
-    '("ClutterFixed" "ref")
-  )
-)
-
-(define-function cogl_get_features
-  (c-name "cogl_get_features")
-  (return-type "ClutterFeatureFlags")
-  (parameters
-  )
-)
-
-(define-function cogl_get_modelview_matrix
-  (c-name "cogl_get_modelview_matrix")
-  (return-type "none")
-  (parameters
-    '("ClutterFixed" "m[16]")
-  )
-)
-
-(define-function cogl_get_projection_matrix
-  (c-name "cogl_get_projection_matrix")
-  (return-type "none")
-  (parameters
-    '("ClutterFixed" "m[16]")
-  )
-)
-
-(define-function cogl_get_viewport
-  (c-name "cogl_get_viewport")
-  (return-type "none")
-  (parameters
-    '("ClutterFixed" "v[4]")
-  )
-)
-
-(define-function cogl_get_bitmasks
-  (c-name "cogl_get_bitmasks")
-  (return-type "none")
-  (parameters
-    '("gint*" "red")
-    '("gint*" "green")
-    '("gint*" "blue")
-    '("gint*" "alpha")
-  )
-)
-
-(define-function cogl_fog_set
-  (c-name "cogl_fog_set")
-  (return-type "none")
-  (parameters
-    '("const-ClutterColor*" "fog_color")
-    '("ClutterFixed" "density")
-    '("ClutterFixed" "z_near")
-    '("ClutterFixed" "z_far")
-  )
-)
-
-(define-function cogl_create_shader
-  (c-name "cogl_create_shader")
-  (return-type "COGLhandle")
-  (parameters
-    '("COGLenum" "shaderType")
-  )
-)
-
-(define-function cogl_shader_destroy
-  (c-name "cogl_shader_destroy")
-  (return-type "none")
-  (parameters
-    '("COGLhandle" "handle")
-  )
-)
-
-(define-function cogl_shader_source
-  (c-name "cogl_shader_source")
-  (return-type "none")
-  (parameters
-    '("COGLhandle" "shader")
-    '("const-gchar*" "source")
-  )
-)
-
-(define-function cogl_shader_compile
-  (c-name "cogl_shader_compile")
-  (return-type "none")
-  (parameters
-    '("COGLhandle" "shader_handle")
-  )
-)
-
-(define-function cogl_shader_get_info_log
-  (c-name "cogl_shader_get_info_log")
-  (return-type "none")
-  (parameters
-    '("COGLhandle" "handle")
-    '("guint" "size")
-    '("gchar*" "buffer")
-  )
-)
-
-(define-function cogl_shader_get_parameteriv
-  (c-name "cogl_shader_get_parameteriv")
-  (return-type "none")
-  (parameters
-    '("COGLhandle" "handle")
-    '("COGLenum" "pname")
-    '("COGLint*" "dest")
-  )
-)
-
-(define-function cogl_create_program
-  (c-name "cogl_create_program")
-  (return-type "COGLhandle")
-)
-
-(define-function cogl_program_destroy
-  (c-name "cogl_program_destroy")
-  (return-type "none")
-  (parameters
-    '("COGLhandle" "handle")
-  )
-)
-
-(define-function cogl_program_attach_shader
-  (c-name "cogl_program_attach_shader")
-  (return-type "none")
-  (parameters
-    '("COGLhandle" "program_handle")
-    '("COGLhandle" "shader_handle")
-  )
-)
-
-(define-function cogl_program_link
-  (c-name "cogl_program_link")
-  (return-type "none")
-  (parameters
-    '("COGLhandle" "program_handle")
-  )
-)
-
-(define-function cogl_program_use
-  (c-name "cogl_program_use")
-  (return-type "none")
-  (parameters
-    '("COGLhandle" "program_handle")
-  )
-)
-
-(define-function cogl_program_get_uniform_location
-  (c-name "cogl_program_get_uniform_location")
-  (return-type "COGLint")
-  (parameters
-    '("COGLhandle" "program_int")
-    '("const-gchar*" "uniform_name")
-  )
-)
-
-(define-function cogl_program_uniform_1f
-  (c-name "cogl_program_uniform_1f")
-  (return-type "none")
-  (parameters
-    '("COGLint" "uniform_no")
-    '("gfloat" "value")
-  )
-)
-
-
-
-;; From pangoclutter.h
-
-(define-function pango_clutter_font_map_get_type
-  (c-name "pango_clutter_font_map_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_clutter_font_map_new
-  (c-name "pango_clutter_font_map_new")
-  (is-constructor-of "PangoClutterFontMap")
-  (return-type "PangoFontMap*")
-)
-
-(define-method set_default_substitute
-  (of-object "PangoClutterFontMap")
-  (c-name "pango_clutter_font_map_set_default_substitute")
-  (return-type "none")
-  (parameters
-    '("PangoClutterSubstituteFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
-  )
-)
-
-(define-method set_resolution
-  (of-object "PangoClutterFontMap")
-  (c-name "pango_clutter_font_map_set_resolution")
-  (return-type "none")
-  (parameters
-    '("double" "dpi")
-  )
-)
-
-(define-method substitute_changed
-  (of-object "PangoClutterFontMap")
-  (c-name "pango_clutter_font_map_substitute_changed")
-  (return-type "none")
-)
-
-(define-method create_context
-  (of-object "PangoClutterFontMap")
-  (c-name "pango_clutter_font_map_create_context")
-  (return-type "PangoContext*")
-)
-
-(define-function pango_clutter_render_layout_subpixel
-  (c-name "pango_clutter_render_layout_subpixel")
-  (return-type "none")
-  (parameters
-    '("PangoLayout*" "layout")
-    '("int" "x")
-    '("int" "y")
-    '("ClutterColor*" "color")
-    '("int" "flags")
-  )
-)
-
-(define-function pango_clutter_render_layout
-  (c-name "pango_clutter_render_layout")
-  (return-type "none")
-  (parameters
-    '("PangoLayout*" "layout")
-    '("int" "x")
-    '("int" "y")
-    '("ClutterColor*" "color")
-    '("int" "flags")
-  )
-)
-
-(define-function pango_clutter_render_layout_line
-  (c-name "pango_clutter_render_layout_line")
-  (return-type "none")
-  (parameters
-    '("PangoLayoutLine*" "line")
-    '("int" "x")
-    '("int" "y")
-    '("ClutterColor*" "color")
-  )
-)
-
-(define-function pango_clutter_render_clear_caches
-  (c-name "pango_clutter_render_clear_caches")
-  (return-type "none")
-  (parameters
-  )
-)
+;; From stamp-clutter-marshal.h
 
 

Modified: cluttermm/trunk/clutter/src/clutter_vfuncs.defs
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_vfuncs.defs	(original)
+++ cluttermm/trunk/clutter/src/clutter_vfuncs.defs	Thu Feb 21 15:45:59 2008
@@ -148,14 +148,6 @@
   )
 )
 
-(define-vfunc set_offscreen
-  (of-object "ClutterStage")
-  (return-type "void")
-  (parameters
-    '("gboolean" "offscreen")
-  )
-)
-
 (define-vfunc draw_to_pixbuf
   (of-object "ClutterStage")
   (return-type "GdkPixbuf*")

Modified: cluttermm/trunk/clutter/src/entry.hg
==============================================================================
--- cluttermm/trunk/clutter/src/entry.hg	(original)
+++ cluttermm/trunk/clutter/src/entry.hg	Thu Feb 21 15:45:59 2008
@@ -59,8 +59,8 @@
   _WRAP_METHOD(Pango::Alignment get_alignment() const, clutter_entry_get_alignment)
   _WRAP_METHOD(void set_alignment(Pango::Alignment wrap_mode), clutter_entry_set_alignment)
 
-  _WRAP_METHOD(int get_position() const, clutter_entry_get_position)
-  _WRAP_METHOD(void set_position(int position), clutter_entry_set_position)
+  _WRAP_METHOD(int get_cursor_position() const, clutter_entry_get_cursor_position)
+  _WRAP_METHOD(void set_cursor_position(int position), clutter_entry_set_cursor_position)
 
   _WRAP_METHOD(void insert(gunichar wc), clutter_entry_insert_unichar)
   _WRAP_METHOD(void insert(const Glib::ustring& text, gssize position), clutter_entry_insert_text)

Modified: cluttermm/trunk/clutter/src/stage.hg
==============================================================================
--- cluttermm/trunk/clutter/src/stage.hg	(original)
+++ cluttermm/trunk/clutter/src/stage.hg	Thu Feb 21 15:45:59 2008
@@ -90,7 +90,6 @@
 protected:
   _WRAP_VFUNC(void set_fullscreen(bool fullscreen), set_fullscreen)
   _WRAP_VFUNC(void set_cursor_visible(bool visible), set_cursor_visible)
-  _WRAP_VFUNC(void set_offscreen(bool offscreen), set_offscreen)
   _WRAP_VFUNC(Glib::RefPtr<Gdk::Pixbuf> draw_to_pixbuf(int x, int y, int width, int height), draw_to_pixbuf)
 
 #m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)

Modified: cluttermm/trunk/configure.in
==============================================================================
--- cluttermm/trunk/configure.in	(original)
+++ cluttermm/trunk/configure.in	Thu Feb 21 15:45:59 2008
@@ -82,7 +82,7 @@
 #########################################################################
 #  Dependancy checks
 #########################################################################
-PKG_CHECK_MODULES(CLUTTERMM, gtkmm-2.4 >= 2.10.9 clutter-0.5 )
+PKG_CHECK_MODULES(CLUTTERMM, gtkmm-2.4 >= 2.10.9 clutter-0.6 )
 AC_SUBST(CLUTTERMM_CFLAGS)
 AC_SUBST(CLUTTERMM_LIBS)