From 00527196c6d204ac83a215582e2f1c5e993f50da Mon Sep 17 00:00:00 2001 From: David PIROTTE Date: Sat, 25 Oct 2014 15:16:37 -0200 Subject: [PATCH 6/6] fix clutter_actor_get_margin needs a special wrapper * clutter/gnome/gw/clutter-support.c: * clutter/gnome/gw/clutter-support.h: * clutter/gnome/overrides/clutter.defs: get-margin method overridden, now calling wrap_clutter_actor_get_margin. Removing eol white space and reorganizing clutter.defs a little, grouping methods, alphabetival order, per object class name, method name. --- clutter/gnome/gw/clutter-support.c | 10 +++- clutter/gnome/gw/clutter-support.h | 1 + clutter/gnome/overrides/clutter.defs | 105 +++++++++++++++++++---------------- 3 files changed, 67 insertions(+), 49 deletions(-) diff --git a/clutter/gnome/gw/clutter-support.c b/clutter/gnome/gw/clutter-support.c index 3db6184..4de11c8 100644 --- a/clutter/gnome/gw/clutter-support.c +++ b/clutter/gnome/gw/clutter-support.c @@ -156,6 +156,14 @@ scm_scm_to_clutter_margin (SCM scm) } SCM +wrap_clutter_actor_get_margin (ClutterActor* actor) +{ + ClutterMargin margin; + clutter_actor_get_margin (actor, &margin); + return scm_clutter_margin_to_scm (&margin); +} + +SCM scm_clutter_actor_box_to_scm (ClutterActorBox *a) { return scm_list_4 (scm_from_double (a->x1), @@ -252,7 +260,7 @@ _wrap_clutter_color_from_string (const char *name) } SCM -wrap_clutter_actor_get_background_color (ClutterActor* actor) +wrap_clutter_actor_get_background_color (ClutterActor* actor) { ClutterColor color; clutter_actor_get_background_color (actor, &color); diff --git a/clutter/gnome/gw/clutter-support.h b/clutter/gnome/gw/clutter-support.h index 1728f48..31a9908 100644 --- a/clutter/gnome/gw/clutter-support.h +++ b/clutter/gnome/gw/clutter-support.h @@ -33,6 +33,7 @@ ClutterPathNode* scm_scm_to_clutter_path_node (SCM scm); SCM scm_clutter_margin_to_scm (ClutterMargin *k); ClutterMargin* scm_scm_to_clutter_margin (SCM scm); +SCM wrap_clutter_actor_get_margin (ClutterActor* actor); SCM scm_clutter_color_to_scm (ClutterColor *c); ClutterColor* scm_scm_to_clutter_color (SCM scm); diff --git a/clutter/gnome/overrides/clutter.defs b/clutter/gnome/overrides/clutter.defs index 7206aae..dd23223 100644 --- a/clutter/gnome/overrides/clutter.defs +++ b/clutter/gnome/overrides/clutter.defs @@ -153,6 +153,20 @@ (return-type "GList*-of-ClutterAction*") ) +(define-method get_background_color + (of-object "ClutterActor") + (c-name "wrap_clutter_actor_get_background_color") + (overrides "clutter_actor_get_background_color") + (return-type "SCM") + (leave-guile-mode #f)) + +(define-method get_children + (of-object "ClutterActor") + (c-name "clutter_actor_get_children") + (overrides "clutter_actor_get_children") + (return-type "GList*-of-ClutterActor*") +) + (define-method get_constraints (of-object "ClutterActor") (c-name "clutter_actor_get_constraints") @@ -167,20 +181,12 @@ (return-type "GList*-of-ClutterEffect*") ) -(define-function clutter_binding_pool_get_for_class - (c-name "clutter_binding_pool_get_for_class") - (overrides "clutter_binding_pool_get_for_class") - (return-type "ClutterBindingPool*") - (parameters - '("GObjectClass*" "klass") - ) -) -(define-method get_children +(define-method get_margin (of-object "ClutterActor") - (c-name "clutter_actor_get_children") - (overrides "clutter_actor_get_children") - (return-type "GList*-of-ClutterActor*") -) + (c-name "wrap_clutter_actor_get_margin") + (overrides "clutter_actor_get_margin") + (return-type "SCM") + (leave-guile-mode #f)) (define-method list_devices (of-object "ClutterDeviceManager") @@ -244,6 +250,44 @@ (return-type "GList*-of-GObject*") ) +(define-method get_perspective + (of-object "ClutterStage") + (c-name "wrap_clutter_stage_get_perspective") + (overrides "clutter_stage_get_perspective") + (return-type "SCM") + (leave-guile-mode #f)) + +(define-method list_timelines + (of-object "ClutterStageManager") + (c-name "clutter_stage_manager_list_stages") + (overrides "clutter_stage_manager_list_stages") + (return-type "GSList*-of-ClutterStage*") +) + +(define-method peek_stages + (of-object "ClutterStageManager") + (c-name "clutter_stage_manager_peek_stages") + (overrides "clutter_stage_manager_peek_stages") + (return-type "const-GSList*-of-ClutterStage*") +) + +(define-function clutter_binding_pool_get_for_class + (c-name "clutter_binding_pool_get_for_class") + (overrides "clutter_binding_pool_get_for_class") + (return-type "ClutterBindingPool*") + (parameters + '("GObjectClass*" "klass") + ) +) + +(define-function clutter_color_from_string + (c-name "_wrap_clutter_color_from_string") + (overrides "clutter_color_from_string") + (return-type "SCM") + (leave-guile-mode #f) + (parameters + '("const-char*" "name"))) + (define-function clutter_units_from_pixels (return-type "ClutterUnits*") (c-name "wrap_clutter_units_from_pixels") @@ -305,41 +349,6 @@ ) ) -(define-method get_perspective - (of-object "ClutterStage") - (c-name "wrap_clutter_stage_get_perspective") - (overrides "clutter_stage_get_perspective") - (return-type "SCM") - (leave-guile-mode #f)) - -(define-method list_timelines - (of-object "ClutterStageManager") - (c-name "clutter_stage_manager_list_stages") - (overrides "clutter_stage_manager_list_stages") - (return-type "GSList*-of-ClutterStage*") -) - -(define-method peek_stages - (of-object "ClutterStageManager") - (c-name "clutter_stage_manager_peek_stages") - (overrides "clutter_stage_manager_peek_stages") - (return-type "const-GSList*-of-ClutterStage*") -) - -(define-function clutter_color_from_string - (c-name "_wrap_clutter_color_from_string") - (overrides "clutter_color_from_string") - (return-type "SCM") - (leave-guile-mode #f) - (parameters - '("const-char*" "name"))) - -(define-method get_background_color - (of-object "ClutterActor") - (c-name "wrap_clutter_actor_get_background_color") - (overrides "clutter_actor_get_background_color") - (return-type "SCM") - (leave-guile-mode #f)) (ignore-glob "*_get_type" "_*" -- 2.1.1