Commit d3e24868 authored by Jürg Billeter's avatar Jürg Billeter Committed by Jürg Billeter
Browse files

update to Clutter 0.4.1, patch by Alberto Ruiz, fixes bug 470763

2007-08-27  Juerg Billeter  <j@bitron.ch>

	* vapi/Makefile.am, vapi/clutter-0.3.deps, vapi/clutter-0.3.vala,
	  vapi/clutter-0.4.deps, vapi/clutter-0.4.vala,
	  vapi/packages/clutter-0.3/, vapi/packages/clutter-0.4/: update to
	  Clutter 0.4.1, patch by Alberto Ruiz, fixes bug 470763

svn path=/trunk/; revision=510
parent 1f762ddf
2007-08-27 Jürg Billeter <j@bitron.ch>
* vapi/Makefile.am, vapi/clutter-0.3.deps, vapi/clutter-0.3.vala,
vapi/clutter-0.4.deps, vapi/clutter-0.4.vala,
vapi/packages/clutter-0.3/, vapi/packages/clutter-0.4/: update to
Clutter 0.4.1, patch by Alberto Ruiz, fixes bug 470763
2007-08-27 Jürg Billeter <j@bitron.ch> 2007-08-27 Jürg Billeter <j@bitron.ch>
* vapigen/valavapigen.vala: use .deps files to satisfy dependencies, * vapigen/valavapigen.vala: use .deps files to satisfy dependencies,
......
...@@ -11,8 +11,8 @@ gee-1.0.vala: ../gee/gee.vala ...@@ -11,8 +11,8 @@ gee-1.0.vala: ../gee/gee.vala
dist_vapi_DATA = \ dist_vapi_DATA = \
atk.vala \ atk.vala \
cairo.vala \ cairo.vala \
clutter-0.3.vala \ clutter-0.4.deps \
clutter-0.3.deps \ clutter-0.4.vala \
curses.vala \ curses.vala \
dbus-glib-1.vala \ dbus-glib-1.vala \
enchant.vala \ enchant.vala \
......
...@@ -61,7 +61,7 @@ namespace Clutter { ...@@ -61,7 +61,7 @@ namespace Clutter {
[CCode (cprefix = "CLUTTER_INIT_", cheader_filename = "clutter/clutter.h")] [CCode (cprefix = "CLUTTER_INIT_", cheader_filename = "clutter/clutter.h")]
public enum InitError { public enum InitError {
SUCCESS, SUCCESS,
ERROR_UNKOWN, ERROR_UNKNOWN,
ERROR_THREADS, ERROR_THREADS,
ERROR_BACKEND, ERROR_BACKEND,
ERROR_INTERNAL, ERROR_INTERNAL,
...@@ -277,7 +277,7 @@ namespace Clutter { ...@@ -277,7 +277,7 @@ namespace Clutter {
[CCode (cheader_filename = "clutter/clutter.h")] [CCode (cheader_filename = "clutter/clutter.h")]
public class BehaviourDepth : Clutter.Behaviour { public class BehaviourDepth : Clutter.Behaviour {
public static GLib.Type get_type (); public static GLib.Type get_type ();
public BehaviourDepth (Clutter.Alpha alpha, int min_depth, int max_depth); public BehaviourDepth (Clutter.Alpha alpha, int start_depth, int end_depth);
[NoAccessorMethod] [NoAccessorMethod]
public weak int start_depth { get; set; } public weak int start_depth { get; set; }
[NoAccessorMethod] [NoAccessorMethod]
...@@ -397,14 +397,20 @@ namespace Clutter { ...@@ -397,14 +397,20 @@ namespace Clutter {
} }
[CCode (cheader_filename = "clutter/clutter.h")] [CCode (cheader_filename = "clutter/clutter.h")]
public class Box : Clutter.Actor { public class Box : Clutter.Actor {
public uint get_spacing (); public void get_color (out Clutter.Color color);
public void get_default_padding (int padding_top, int padding_right, int padding_bottom, int padding_left);
public void get_margin (Clutter.Margin margin);
public static GLib.Type get_type (); public static GLib.Type get_type ();
public void pack_end (Clutter.Actor actor); public void pack (Clutter.Actor actor, Clutter.PackType pack_type, Clutter.Padding padding);
public void pack_start (Clutter.Actor actor); public void pack_defaults (Clutter.Actor actor);
public bool query_child (Clutter.Actor actor, Clutter.BoxChild child); public bool query_child (Clutter.Actor actor, Clutter.BoxChild child);
public bool query_nth_child (int index_, Clutter.BoxChild child); public bool query_nth_child (int index_, Clutter.BoxChild child);
public void set_spacing (uint spacing); public void remove_all ();
public weak uint spacing { get; set; } public void set_color (out Clutter.Color color);
public void set_default_padding (int padding_top, int padding_right, int padding_bottom, int padding_left);
public void set_margin (Clutter.Margin margin);
public weak Clutter.Margin margin { get; set; }
public weak Clutter.Color color { get; set; }
} }
[CCode (cheader_filename = "clutter/clutter.h")] [CCode (cheader_filename = "clutter/clutter.h")]
public class CloneTexture : Clutter.Actor { public class CloneTexture : Clutter.Actor {
...@@ -718,7 +724,9 @@ namespace Clutter { ...@@ -718,7 +724,9 @@ namespace Clutter {
[CCode (cheader_filename = "clutter/clutter.h")] [CCode (cheader_filename = "clutter/clutter.h")]
public struct BoxChild { public struct BoxChild {
public weak Clutter.Actor actor; public weak Clutter.Actor actor;
public weak Clutter.ActorBox child_coords;
public Clutter.PackType pack_type; public Clutter.PackType pack_type;
public weak Clutter.Padding padding;
} }
[ReferenceType] [ReferenceType]
[CCode (cheader_filename = "clutter/clutter.h")] [CCode (cheader_filename = "clutter/clutter.h")]
...@@ -809,6 +817,15 @@ namespace Clutter { ...@@ -809,6 +817,15 @@ namespace Clutter {
} }
[ReferenceType] [ReferenceType]
[CCode (cheader_filename = "clutter/clutter.h")] [CCode (cheader_filename = "clutter/clutter.h")]
public struct Margin {
public int32 top;
public int32 right;
public int32 bottom;
public int32 left;
public static GLib.Type get_type ();
}
[ReferenceType]
[CCode (cheader_filename = "clutter/clutter.h")]
public struct MotionEvent { public struct MotionEvent {
public Clutter.EventType type; public Clutter.EventType type;
public uint time; public uint time;
...@@ -818,6 +835,15 @@ namespace Clutter { ...@@ -818,6 +835,15 @@ namespace Clutter {
public double axes; public double axes;
public weak Clutter.InputDevice device; public weak Clutter.InputDevice device;
} }
[ReferenceType]
[CCode (cheader_filename = "clutter/clutter.h")]
public struct Padding {
public int32 top;
public int32 right;
public int32 bottom;
public int32 left;
public static GLib.Type get_type ();
}
[ReferenceType (free_function = "clutter_perspective_free")] [ReferenceType (free_function = "clutter_perspective_free")]
[CCode (cheader_filename = "clutter/clutter.h")] [CCode (cheader_filename = "clutter/clutter.h")]
public struct Perspective { public struct Perspective {
...@@ -865,6 +891,7 @@ namespace Clutter { ...@@ -865,6 +891,7 @@ namespace Clutter {
[ReferenceType] [ReferenceType]
[CCode (cheader_filename = "clutter/clutter.h")] [CCode (cheader_filename = "clutter/clutter.h")]
public struct Effect { public struct Effect {
public static weak Clutter.Timeline depth (Clutter.EffectTemplate template_, Clutter.Actor actor, int start_depth, int end_depth, Clutter.EffectCompleteFunc completed_func, pointer completed_data);
public static weak Clutter.Timeline fade (Clutter.EffectTemplate template_, Clutter.Actor actor, uchar start_opacity, uchar end_opacity, Clutter.EffectCompleteFunc completed_func, pointer completed_data); public static weak Clutter.Timeline fade (Clutter.EffectTemplate template_, Clutter.Actor actor, uchar start_opacity, uchar end_opacity, Clutter.EffectCompleteFunc completed_func, pointer completed_data);
[NoArrayLength] [NoArrayLength]
public static weak Clutter.Timeline move (Clutter.EffectTemplate template_, Clutter.Actor actor, Clutter.Knot[] knots, uint n_knots, Clutter.EffectCompleteFunc completed_func, pointer completed_data); public static weak Clutter.Timeline move (Clutter.EffectTemplate template_, Clutter.Actor actor, Clutter.Knot[] knots, uint n_knots, Clutter.EffectCompleteFunc completed_func, pointer completed_data);
...@@ -903,13 +930,8 @@ namespace Clutter { ...@@ -903,13 +930,8 @@ namespace Clutter {
[CCode (cheader_filename = "clutter/clutter.h")] [CCode (cheader_filename = "clutter/clutter.h")]
public struct Init { public struct Init {
public static GLib.Quark error_quark (); public static GLib.Quark error_quark ();
public static Clutter.InitError with_args (int argc, out string argv, string parameter_string, out GLib.OptionEntry entries, string translation_domain) throws GLib.Error; [NoArrayLength]
} public static Clutter.InitError with_args (int argc, string[] argv, string parameter_string, out GLib.OptionEntry entries, string translation_domain) throws GLib.Error;
[ReferenceType]
[CCode (cheader_filename = "clutter/clutter.h")]
public struct Main {
public static int level ();
public static void quit ();
} }
[ReferenceType] [ReferenceType]
[CCode (cheader_filename = "clutter/clutter.h")] [CCode (cheader_filename = "clutter/clutter.h")]
...@@ -935,13 +957,31 @@ namespace Clutter { ...@@ -935,13 +957,31 @@ namespace Clutter {
[ReferenceType] [ReferenceType]
[CCode (cheader_filename = "clutter/clutter.h")] [CCode (cheader_filename = "clutter/clutter.h")]
public struct Threads { public struct Threads {
public static uint add_idle (GLib.SourceFunc func, pointer data);
public static uint add_idle_full (int priority, GLib.SourceFunc func, pointer data, GLib.DestroyNotify notify);
public static uint add_timeout (uint interval, GLib.SourceFunc func, pointer data);
public static uint add_timeout_full (int priority, uint interval, GLib.SourceFunc func, pointer data, GLib.DestroyNotify notify);
public static void enter (); public static void enter ();
public static void init ();
public static void leave (); public static void leave ();
public static void set_lock_functions (GLib.Callback enter_fn, GLib.Callback leave_fn);
} }
public static delegate uint AlphaFunc (Clutter.Alpha alpha, pointer user_data); public static delegate uint AlphaFunc (Clutter.Alpha alpha, pointer user_data);
public static delegate void BehaviourForeachFunc (Clutter.Behaviour behaviour, Clutter.Actor actor, pointer data); public static delegate void BehaviourForeachFunc (Clutter.Behaviour behaviour, Clutter.Actor actor, pointer data);
public static delegate void Callback (Clutter.Actor actor, pointer data); public static delegate void Callback (Clutter.Actor actor, pointer data);
public static delegate void EffectCompleteFunc (Clutter.Actor actor, pointer user_data); public static delegate void EffectCompleteFunc (Clutter.Actor actor, pointer user_data);
public static uint ramp_inc_func (Clutter.Alpha alpha, pointer dummy);
public static uint ramp_dec_func (Clutter.Alpha alpha, pointer dummy);
public static uint ramp_func (Clutter.Alpha alpha, pointer dummy);
public static uint sine_func (Clutter.Alpha alpha, pointer dummy);
public static uint sine_inc_func (Clutter.Alpha alpha, pointer dummy);
public static uint sine_dec_func (Clutter.Alpha alpha, pointer dummy);
public static uint sine_half_func (Clutter.Alpha alpha, pointer dummy);
public static uint square_func (Clutter.Alpha alpha, pointer dummy);
public static uint smoothstep_inc_func (Clutter.Alpha alpha, pointer dummy);
public static uint smoothstep_dec_func (Clutter.Alpha alpha, pointer dummy);
public static uint exp_inc_func (Clutter.Alpha alpha, pointer dummy);
public static uint exp_dec_func (Clutter.Alpha alpha, pointer dummy);
public static void init (out string[] args); public static void init (out string[] args);
public static void main (); public static void main ();
public static void main_quit (); public static void main_quit ();
...@@ -953,6 +993,5 @@ namespace Clutter { ...@@ -953,6 +993,5 @@ namespace Clutter {
public static bool get_show_fps (); public static bool get_show_fps ();
public static ulong get_timestamp (); public static ulong get_timestamp ();
public static uint keysym_to_unicode (uint keyval); public static uint keysym_to_unicode (uint keyval);
public static uint square_func (Clutter.Alpha alpha, pointer dummy);
public static int util_next_p2 (int a); public static int util_next_p2 (int a);
} }
namespace Clutter {
[Import]
public void init (out string[] args);
[Import]
public void main ();
[Import]
public void main_quit ();
}
/* clutter-2.0.vala
*
* Copyright (C) 2007 Alberto Ruiz
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Author:
* Alberto Ruiz <aruiz@gnome.org>
*/
namespace Clutter {
[Import]
public uint ramp_inc_func (Clutter.Alpha alpha, pointer dummy);
[Import]
public uint ramp_dec_func (Clutter.Alpha alpha, pointer dummy);
[Import]
public uint ramp_func (Clutter.Alpha alpha, pointer dummy);
[Import]
public uint sine_func (Clutter.Alpha alpha, pointer dummy);
[Import]
public uint sine_inc_func (Clutter.Alpha alpha, pointer dummy);
[Import]
public uint sine_dec_func (Clutter.Alpha alpha, pointer dummy);
[Import]
public uint sine_half_func (Clutter.Alpha alpha, pointer dummy);
[Import]
public uint square_func (Clutter.Alpha alpha, pointer dummy);
[Import]
public uint smoothstep_inc_func (Clutter.Alpha alpha, pointer dummy);
[Import]
public uint smoothstep_dec_func (Clutter.Alpha alpha, pointer dummy);
[Import]
public uint exp_inc_func (Clutter.Alpha alpha, pointer dummy);
[Import]
public uint exp_dec_func (Clutter.Alpha alpha, pointer dummy);
[Import]
public void init (out string[] args);
[Import]
public void main ();
[Import]
public void main_quit ();
}
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
--> -->
<namespace name="Clutter"> <namespace name="Clutter">
<enum name="ClutterActorFlags" type="flags" type-name="ClutterActorFlags"> <enum get-type="clutter_actor_flags_get_type" name="ClutterActorFlags" type="flags" type-name="ClutterActorFlags">
<member name="CLUTTER_ACTOR_MAPPED" value=""/> <member name="CLUTTER_ACTOR_MAPPED" value=""/>
<member name="CLUTTER_ACTOR_REALIZED" value=""/> <member name="CLUTTER_ACTOR_REALIZED" value=""/>
</enum> </enum>
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
<member name="CLUTTER_DEBUG_BACKEND" value=""/> <member name="CLUTTER_DEBUG_BACKEND" value=""/>
<member name="CLUTTER_DEBUG_SCHEDULER" value=""/> <member name="CLUTTER_DEBUG_SCHEDULER" value=""/>
</enum> </enum>
<enum name="ClutterEventType" type="enum" type-name="ClutterEventType"> <enum get-type="clutter_event_type_get_type" name="ClutterEventType" type="enum" type-name="ClutterEventType">
<member name="CLUTTER_NOTHING" value="0"/> <member name="CLUTTER_NOTHING" value=""/>
<member name="CLUTTER_KEY_PRESS" value=""/> <member name="CLUTTER_KEY_PRESS" value=""/>
<member name="CLUTTER_KEY_RELEASE" value=""/> <member name="CLUTTER_KEY_RELEASE" value=""/>
<member name="CLUTTER_MOTION" value=""/> <member name="CLUTTER_MOTION" value=""/>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<member name="CLUTTER_CLIENT_MESSAGE" value=""/> <member name="CLUTTER_CLIENT_MESSAGE" value=""/>
<member name="CLUTTER_DELETE" value=""/> <member name="CLUTTER_DELETE" value=""/>
</enum> </enum>
<enum name="ClutterFeatureFlags" type="flags" type-name="ClutterFeatureFlags"> <enum get-type="clutter_feature_flags_get_type" name="ClutterFeatureFlags" type="flags" type-name="ClutterFeatureFlags">
<member name="CLUTTER_FEATURE_TEXTURE_RECTANGLE" value=""/> <member name="CLUTTER_FEATURE_TEXTURE_RECTANGLE" value=""/>
<member name="CLUTTER_FEATURE_SYNC_TO_VBLANK" value=""/> <member name="CLUTTER_FEATURE_SYNC_TO_VBLANK" value=""/>
<member name="CLUTTER_FEATURE_TEXTURE_YUV" value=""/> <member name="CLUTTER_FEATURE_TEXTURE_YUV" value=""/>
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
<member name="CLUTTER_FEATURE_STAGE_USER_RESIZE" value=""/> <member name="CLUTTER_FEATURE_STAGE_USER_RESIZE" value=""/>
<member name="CLUTTER_FEATURE_STAGE_CURSOR" value=""/> <member name="CLUTTER_FEATURE_STAGE_CURSOR" value=""/>
</enum> </enum>
<enum name="ClutterGravity" type="enum" type-name="ClutterGravity"> <enum get-type="clutter_gravity_get_type" name="ClutterGravity" type="enum" type-name="ClutterGravity">
<member name="CLUTTER_GRAVITY_NONE" value="0"/> <member name="CLUTTER_GRAVITY_NONE" value=""/>
<member name="CLUTTER_GRAVITY_NORTH" value=""/> <member name="CLUTTER_GRAVITY_NORTH" value=""/>
<member name="CLUTTER_GRAVITY_NORTH_EAST" value=""/> <member name="CLUTTER_GRAVITY_NORTH_EAST" value=""/>
<member name="CLUTTER_GRAVITY_EAST" value=""/> <member name="CLUTTER_GRAVITY_EAST" value=""/>
...@@ -60,21 +60,21 @@ ...@@ -60,21 +60,21 @@
<member name="CLUTTER_GRAVITY_NORTH_WEST" value=""/> <member name="CLUTTER_GRAVITY_NORTH_WEST" value=""/>
<member name="CLUTTER_GRAVITY_CENTER" value=""/> <member name="CLUTTER_GRAVITY_CENTER" value=""/>
</enum> </enum>
<enum name="ClutterInitError" type="enum" type-name="ClutterInitError"> <enum get-type="clutter_init_error_get_type" name="ClutterInitError" type="enum" type-name="ClutterInitError">
<member name="CLUTTER_INIT_SUCCESS" value="1"/> <member name="CLUTTER_INIT_SUCCESS" value=""/>
<member name="CLUTTER_INIT_ERROR_UNKOWN" value="0"/> <member name="CLUTTER_INIT_ERROR_UNKNOWN" value=""/>
<member name="CLUTTER_INIT_ERROR_THREADS" value="-1"/> <member name="CLUTTER_INIT_ERROR_THREADS" value=""/>
<member name="CLUTTER_INIT_ERROR_BACKEND" value="-2"/> <member name="CLUTTER_INIT_ERROR_BACKEND" value=""/>
<member name="CLUTTER_INIT_ERROR_INTERNAL" value="-3"/> <member name="CLUTTER_INIT_ERROR_INTERNAL" value=""/>
</enum> </enum>
<enum name="ClutterLayoutFlags" type="flags" type-name="ClutterLayoutFlags"> <enum get-type="clutter_layout_flags_get_type" name="ClutterLayoutFlags" type="flags" type-name="ClutterLayoutFlags">
<member name="CLUTTER_LAYOUT_NONE" value="0"/> <member name="CLUTTER_LAYOUT_NONE" value=""/>
<member name="CLUTTER_LAYOUT_WIDTH_FOR_HEIGHT" value=""/> <member name="CLUTTER_LAYOUT_WIDTH_FOR_HEIGHT" value=""/>
<member name="CLUTTER_LAYOUT_HEIGHT_FOR_WIDTH" value=""/> <member name="CLUTTER_LAYOUT_HEIGHT_FOR_WIDTH" value=""/>
<member name="CLUTTER_LAYOUT_NATURAL" value=""/> <member name="CLUTTER_LAYOUT_NATURAL" value=""/>
<member name="CLUTTER_LAYOUT_TUNABLE" value=""/> <member name="CLUTTER_LAYOUT_TUNABLE" value=""/>
</enum> </enum>
<enum name="ClutterModifierType" type="flags" type-name="ClutterModifierType"> <enum get-type="clutter_modifier_type_get_type" name="ClutterModifierType" type="flags" type-name="ClutterModifierType">
<member name="CLUTTER_SHIFT_MASK" value=""/> <member name="CLUTTER_SHIFT_MASK" value=""/>
<member name="CLUTTER_LOCK_MASK" value=""/> <member name="CLUTTER_LOCK_MASK" value=""/>
<member name="CLUTTER_CONTROL_MASK" value=""/> <member name="CLUTTER_CONTROL_MASK" value=""/>
...@@ -89,36 +89,36 @@ ...@@ -89,36 +89,36 @@
<member name="CLUTTER_BUTTON4_MASK" value=""/> <member name="CLUTTER_BUTTON4_MASK" value=""/>
<member name="CLUTTER_BUTTON5_MASK" value=""/> <member name="CLUTTER_BUTTON5_MASK" value=""/>
</enum> </enum>
<enum name="ClutterPackType" type="enum" type-name="ClutterPackType"> <enum get-type="clutter_pack_type_get_type" name="ClutterPackType" type="enum" type-name="ClutterPackType">
<member name="CLUTTER_PACK_START" value=""/> <member name="CLUTTER_PACK_START" value=""/>
<member name="CLUTTER_PACK_END" value=""/> <member name="CLUTTER_PACK_END" value=""/>
</enum> </enum>
<enum name="ClutterRotateAxis" type="enum" type-name="ClutterRotateAxis"> <enum get-type="clutter_rotate_axis_get_type" name="ClutterRotateAxis" type="enum" type-name="ClutterRotateAxis">
<member name="CLUTTER_X_AXIS" value=""/> <member name="CLUTTER_X_AXIS" value=""/>
<member name="CLUTTER_Y_AXIS" value=""/> <member name="CLUTTER_Y_AXIS" value=""/>
<member name="CLUTTER_Z_AXIS" value=""/> <member name="CLUTTER_Z_AXIS" value=""/>
</enum> </enum>
<enum name="ClutterRotateDirection" type="enum" type-name="ClutterRotateDirection"> <enum get-type="clutter_rotate_direction_get_type" name="ClutterRotateDirection" type="enum" type-name="ClutterRotateDirection">
<member name="CLUTTER_ROTATE_CW" value=""/> <member name="CLUTTER_ROTATE_CW" value=""/>
<member name="CLUTTER_ROTATE_CCW" value=""/> <member name="CLUTTER_ROTATE_CCW" value=""/>
</enum> </enum>
<enum name="ClutterScrollDirection" type="enum" type-name="ClutterScrollDirection"> <enum get-type="clutter_scroll_direction_get_type" name="ClutterScrollDirection" type="enum" type-name="ClutterScrollDirection">
<member name="CLUTTER_SCROLL_UP" value=""/> <member name="CLUTTER_SCROLL_UP" value=""/>
<member name="CLUTTER_SCROLL_DOWN" value=""/> <member name="CLUTTER_SCROLL_DOWN" value=""/>
<member name="CLUTTER_SCROLL_LEFT" value=""/> <member name="CLUTTER_SCROLL_LEFT" value=""/>
<member name="CLUTTER_SCROLL_RIGHT" value=""/> <member name="CLUTTER_SCROLL_RIGHT" value=""/>
</enum> </enum>
<enum name="ClutterStageState" type="enum" type-name="ClutterStageState"> <enum get-type="clutter_stage_state_get_type" name="ClutterStageState" type="enum" type-name="ClutterStageState">
<member name="CLUTTER_STAGE_STATE_FULLSCREEN" value=""/> <member name="CLUTTER_STAGE_STATE_FULLSCREEN" value=""/>
<member name="CLUTTER_STAGE_STATE_MAXIMIZED" value=""/> <member name="CLUTTER_STAGE_STATE_MAXIMIZED" value=""/>
<member name="CLUTTER_STAGE_STATE_MINIMIZED" value=""/> <member name="CLUTTER_STAGE_STATE_MINIMIZED" value=""/>
<member name="CLUTTER_STAGE_STATE_OFFSCREEN" value=""/> <member name="CLUTTER_STAGE_STATE_OFFSCREEN" value=""/>
</enum> </enum>
<enum name="ClutterTextureError" type="enum" type-name="ClutterTextureError"> <enum get-type="clutter_texture_error_get_type" name="ClutterTextureError" type="enum" type-name="ClutterTextureError">
<member name="CLUTTER_TEXTURE_ERROR_OUT_OF_MEMORY" value=""/> <member name="CLUTTER_TEXTURE_ERROR_OUT_OF_MEMORY" value=""/>
<member name="CLUTTER_TEXTURE_ERROR_NO_YUV" value=""/> <member name="CLUTTER_TEXTURE_ERROR_NO_YUV" value=""/>
</enum> </enum>
<enum name="ClutterTextureFlags" type="flags" type-name="ClutterTextureFlags"> <enum get-type="clutter_texture_flags_get_type" name="ClutterTextureFlags" type="flags" type-name="ClutterTextureFlags">
<member name="CLUTTER_TEXTURE_RGB_FLAG_BGR" value=""/> <member name="CLUTTER_TEXTURE_RGB_FLAG_BGR" value=""/>
<member name="CLUTTER_TEXTURE_RGB_FLAG_PREMULT" value=""/> <member name="CLUTTER_TEXTURE_RGB_FLAG_PREMULT" value=""/>
<member name="CLUTTER_TEXTURE_YUV_FLAG_YUV2" value=""/> <member name="CLUTTER_TEXTURE_YUV_FLAG_YUV2" value=""/>
...@@ -1449,8 +1449,8 @@ ...@@ -1449,8 +1449,8 @@
<constructor name="new" symbol="clutter_behaviour_depth_new"> <constructor name="new" symbol="clutter_behaviour_depth_new">
<parameters> <parameters>
<parameter name="alpha" type="ClutterAlpha*"/> <parameter name="alpha" type="ClutterAlpha*"/>
<parameter name="min_depth" type="gint"/> <parameter name="start_depth" type="gint"/>
<parameter name="max_depth" type="gint"/> <parameter name="end_depth" type="gint"/>
</parameters> </parameters>
</constructor> </constructor>
</object> </object>
...@@ -1929,9 +1929,13 @@ ...@@ -1929,9 +1929,13 @@
</constructor> </constructor>
</object> </object>
<object get-type="" name="ClutterBox" parent="ClutterActor" type-name="ClutterBox"> <object get-type="" name="ClutterBox" parent="ClutterActor" type-name="ClutterBox">
<field name="allocation" type="ClutterActorBox"/>
<field name="children" type="GList*"/> <field name="children" type="GList*"/>
<field name="spacing" type="guint"/> <field name="color" type="ClutterColor"/>
<property name="spacing" readable="1" type="guint" writable="1"/> <field name="margin" type="ClutterMargin"/>
<field name="default_padding" type="ClutterPadding"/>
<property name="margin" readable="1" type="ClutterMargin" writable="1"/>
<property name="color" readable="1" type="ClutterColor" writable="1"/>
<vfunc name="pack_child"> <vfunc name="pack_child">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
...@@ -1946,23 +1950,43 @@ ...@@ -1946,23 +1950,43 @@
<parameter name="child" type="ClutterBoxChild*"/> <parameter name="child" type="ClutterBoxChild*"/>
</parameters> </parameters>
</vfunc> </vfunc>
<method name="get_spacing" symbol="clutter_box_get_spacing"> <method name="get_color" symbol="clutter_box_get_color">
<return-type type="guint"/> <return-type type="void"/>
<parameters>
<parameter name="box" type="ClutterBox*"/>
<parameter name="color" type="ClutterColor*"/>
</parameters>
</method>
<method name="get_default_padding" symbol="clutter_box_get_default_padding">
<return-type type="void"/>
<parameters>
<parameter name="box" type="ClutterBox*"/>
<parameter name="padding_top" type="gint*"/>
<parameter name="padding_right" type="gint*"/>
<parameter name="padding_bottom" type="gint*"/>
<parameter name="padding_left" type="gint*"/>
</parameters>
</method>
<method name="get_margin" symbol="clutter_box_get_margin">
<return-type type="void"/>
<parameters> <parameters>
<parameter name="box" type="ClutterBox*"/> <parameter name="box" type="ClutterBox*"/>
<parameter name="margin" type="ClutterMargin*"/>
</parameters> </parameters>
</method> </method>
<method name="get_type" symbol="clutter_box_get_type"> <method name="get_type" symbol="clutter_box_get_type">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
<method name="pack_end" symbol="clutter_box_pack_end"> <method name="pack" symbol="clutter_box_pack">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter name="box" type="ClutterBox*"/> <parameter name="box" type="ClutterBox*"/>
<parameter name="actor" type="ClutterActor*"/> <parameter name="actor" type="ClutterActor*"/>
<parameter name="pack_type" type="ClutterPackType"/>
<parameter name="padding" type="const-ClutterPadding*"/>
</parameters> </parameters>
</method> </method>
<method name="pack_start" symbol="clutter_box_pack_start"> <method name="pack_defaults" symbol="clutter_box_pack_defaults">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter name="box" type="ClutterBox*"/> <parameter name="box" type="ClutterBox*"/>
...@@ -1985,11 +2009,34 @@ ...@@ -1985,11 +2009,34 @@
<parameter name="child" type="ClutterBoxChild*"/> <parameter name="child" type="ClutterBoxChild*"/>
</parameters> </parameters>
</method> </method>
<method name="set_spacing" symbol="clutter_box_set_spacing"> <method name="remove_all" symbol="clutter_box_remove_all">
<return-type type="void"/>
<parameters>
<parameter name="box" type="ClutterBox*"/>
</parameters>
</method>
<method name="set_color" symbol="clutter_box_set_color">
<return-type type="void"/>