[cluttermm] Wrapped clutter_bin_layout_get_alignment.
- From: Chris Kühl <chriskuehl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cluttermm] Wrapped clutter_bin_layout_get_alignment.
- Date: Fri, 14 Jan 2011 01:07:26 +0000 (UTC)
commit 2bf54f48182fb59924f03f27f5b21a78ff01ce3b
Author: Chris Kühl <chrisk openismus com>
Date: Thu Jan 13 23:14:58 2011 +0100
Wrapped clutter_bin_layout_get_alignment.
* clutter/src/bin-layout.hg: Wrapped clutter_bin_layout_get_alignment.
* codegen/m4/convert_clutter.m4 Added conversion for ClutterBinAlignment.
ChangeLog | 9 ++++++++-
clutter/src/bin-layout.hg | 2 +-
clutter/src/layout-manager.hg | 6 +++---
codegen/m4/convert_clutter.m4 | 1 +
4 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index def741c..0bfa9a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2010-01-13 Chris Kühl <chrisk openismus com>
+2011-01-13 Chris Kühl <chrisk openismus com>
+
+ Wrapped clutter_bin_layout_get_alignment.
+
+ * clutter/src/bin-layout.hg: Wrapped clutter_bin_layout_get_alignment.
+ * codegen/m4/convert_clutter.m4 Added conversion for ClutterBinAlignment.
+
+2011-01-13 Chris Kühl <chrisk openismus com>
Initial wrapping of ClutterBinLayout.
diff --git a/clutter/src/bin-layout.hg b/clutter/src/bin-layout.hg
index 04629f8..a3066d5 100644
--- a/clutter/src/bin-layout.hg
+++ b/clutter/src/bin-layout.hg
@@ -37,7 +37,7 @@ public:
_WRAP_CREATE(BinAlignment x_align, BinAlignment y_align)
_WRAP_METHOD(void set_alignment(const Glib::RefPtr<Actor>& child, BinAlignment x_align, BinAlignment y_align), clutter_bin_layout_set_alignment)
- // _WRAP_METHOD(void get_alignment(const Glib::RefPtr<Actor>& child, BinAlignment &x_align, BinAlignment &y_align), clutter_bin_layout_get_alignment)
+ _WRAP_METHOD(void get_alignment(const Glib::RefPtr<Actor>& child, BinAlignment &x_align, BinAlignment &y_align), clutter_bin_layout_get_alignment)
_WRAP_METHOD(void add(const Glib::RefPtr<Actor>& child, BinAlignment x_align, BinAlignment y_align), clutter_bin_layout_add)
_WRAP_PROPERTY("x-align", BinAlignment)
diff --git a/clutter/src/layout-manager.hg b/clutter/src/layout-manager.hg
index 602c34b..e8df5d7 100644
--- a/clutter/src/layout-manager.hg
+++ b/clutter/src/layout-manager.hg
@@ -65,13 +65,13 @@ public:
_WRAP_VFUNC(void get_preferred_width(const Glib::RefPtr<Container>& container, float for_height, float& min_width_p, float& natural_width_p) const, "get_preferred_width")
_WRAP_VFUNC(void get_preferred_height(const Glib::RefPtr<Container>& container, float for_width, float& min_height_p, float& natural_height_p) const, "get_preferred_height")
-
+
#m4 _CONVERSION(`const ClutterActorBox*', `const ActorBox&', `ActorBox($3)')
_WRAP_VFUNC(void allocate(const Glib::RefPtr<Container>& container, const ActorBox& box, AllocationFlags absolute_origin_changed), "allocate")
-
+
_WRAP_VFUNC(void set_container(const Glib::RefPtr<Container>& container), "set_container")
_WRAP_VFUNC(GType get_child_meta_type() const, "get_child_meta_type")
-
+
#m4 _CONVERSION(`ClutterActor*', `const Glib::RefPtr<Actor>&', `Glib::wrap($3, true)')
_WRAP_VFUNC(Glib::RefPtr<LayoutMeta> create_child_meta(const Glib::RefPtr<Container>& container, const Glib::RefPtr<Actor>& actor), "create_child_meta")
diff --git a/codegen/m4/convert_clutter.m4 b/codegen/m4/convert_clutter.m4
index 1a1d708..9a3af35 100644
--- a/codegen/m4/convert_clutter.m4
+++ b/codegen/m4/convert_clutter.m4
@@ -134,5 +134,6 @@ _CONV_ENUM(Pango,WrapMode)
_CONVERSION(`guint32', `ActorFlags', `static_cast<ActorFlags>($3)')
_CONVERSION(`const gchar*', `const Glib::ustring&',__GCHARP_TO_USTRING)
+_CONVERSION(`BinAlignment&',`ClutterBinAlignment*',`(($2) &($3))')
_CONVERSION(`PangoContext*',`Glib::RefPtr<const Pango::Context>',Glib::wrap($3))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]