gnomemm r2148 - in cluttermm/trunk: . clutter/src tools/m4

[siavashs svn gnome org]

Author: siavashs
Date: Sun Apr  5 19:37:58 2009
New Revision: 2148
URL: http://svn.gnome.org/viewvc/gnomemm?rev=2148&view=rev

Log:
Wrapped the new API for Clutter::Text

  * trunk/clutter/src/clutter_methods.defs:
  * trunk/clutter/src/clutter_signals.defs: Regenerated .defs
  * trunk/clutter/src/text.hg: Wrapped the new API
  * trunk/tools/m4/convert_cluttermm.m4:

Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/clutter/src/clutter_methods.defs
   cluttermm/trunk/clutter/src/clutter_signals.defs
   cluttermm/trunk/clutter/src/text.hg
   cluttermm/trunk/tools/m4/convert_cluttermm.m4

Modified: cluttermm/trunk/clutter/src/clutter_methods.defs
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_methods.defs	(original)
+++ cluttermm/trunk/clutter/src/clutter_methods.defs	Sun Apr  5 19:37:58 2009
@@ -3735,61 +3735,6 @@
   (return-type "none")
 )
 
-(define-method add_many
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_add_many")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "first_actor")
-  )
-  (varargs #t)
-)
-
-(define-method add_many_valist
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_add_many_valist")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "first_actor")
-    '("va_list" "var_args")
-  )
-)
-
-(define-method remove
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_remove")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
-)
-
-(define-method raise
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_raise")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-    '("ClutterActor*" "sibling")
-  )
-)
-
-(define-method lower
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_lower")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-    '("ClutterActor*" "sibling")
-  )
-)
-
-(define-method sort_depth_order
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_sort_depth_order")
-  (return-type "none")
-)
-
 
 
 ;; From clutter-interval.h
@@ -5515,16 +5460,6 @@
   (return-type "CoglHandle")
 )
 
-(define-method set_uniform_1f
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_set_uniform_1f")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "name")
-    '("gfloat" "value")
-  )
-)
-
 
 
 ;; From clutter-stage-manager.h

Modified: cluttermm/trunk/clutter/src/clutter_signals.defs
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_signals.defs	(original)
+++ cluttermm/trunk/clutter/src/clutter_signals.defs	Sun Apr  5 19:37:58 2009
@@ -1918,24 +1918,6 @@
 
 ;; From ClutterGroup
 
-(define-signal add
-  (of-object "ClutterGroup")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("ClutterActor*" "p0")
-  )
-)
-
-(define-signal remove
-  (of-object "ClutterGroup")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("ClutterActor*" "p0")
-  )
-)
-
 (define-property name
   (of-object "ClutterGroup")
   (prop-type "GParamString")
@@ -2333,30 +2315,30 @@
   )
 )
 
-(define-property playing
+(define-property buffer-fill
   (of-object "ClutterMedia")
-  (prop-type "GParamBoolean")
-  (docs "Wheter the actor is playing")
+  (prop-type "GParamDouble")
+  (docs "The fill level of the buffer")
   (readable #t)
-  (writable #t)
+  (writable #f)
   (construct-only #f)
 )
 
-(define-property buffer-fill
+(define-property duration
   (of-object "ClutterMedia")
   (prop-type "GParamDouble")
-  (docs "The fill level of the buffer")
+  (docs "The duration of the stream, in seconds")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property audio-volume
+(define-property can-seek
   (of-object "ClutterMedia")
-  (prop-type "GParamDouble")
-  (docs "The volume of the audio")
+  (prop-type "GParamBoolean")
+  (docs "Whether the current stream is seekable")
   (readable #t)
-  (writable #t)
+  (writable #f)
   (construct-only #f)
 )
 
@@ -2369,30 +2351,30 @@
   (construct-only #f)
 )
 
-(define-property uri
+(define-property audio-volume
   (of-object "ClutterMedia")
-  (prop-type "GParamString")
-  (docs "URI of a media file")
+  (prop-type "GParamDouble")
+  (docs "The volume of the audio")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property duration
+(define-property uri
   (of-object "ClutterMedia")
-  (prop-type "GParamDouble")
-  (docs "The duration of the stream, in seconds")
+  (prop-type "GParamString")
+  (docs "URI of a media file")
   (readable #t)
-  (writable #f)
+  (writable #t)
   (construct-only #f)
 )
 
-(define-property can-seek
+(define-property playing
   (of-object "ClutterMedia")
   (prop-type "GParamBoolean")
-  (docs "Whether the current stream is seekable")
+  (docs "Wheter the actor is playing")
   (readable #t)
-  (writable #f)
+  (writable #t)
   (construct-only #f)
 )
 

Modified: cluttermm/trunk/clutter/src/text.hg
==============================================================================
--- cluttermm/trunk/clutter/src/text.hg	(original)
+++ cluttermm/trunk/clutter/src/text.hg	Sun Apr  5 19:37:58 2009
@@ -42,23 +42,64 @@
 #m4 dnl _CONVERSION(`ClutterActor*',`Glib::RefPtr<Text>',`Glib::wrap((ClutterText*)$3)')
 
   _WRAP_METHOD(void set_text(const Glib::ustring& text), clutter_text_set_text)
+  _WRAP_METHOD(void set_markup(const Glib::ustring& markup), clutter_text_set_markup)
   _WRAP_METHOD(Glib::ustring get_text() const, clutter_text_get_text)
-  _WRAP_METHOD(void set_font_name(const Glib::ustring& font_name), clutter_text_set_font_name)
-  _WRAP_METHOD(Glib::ustring get_font_name() const, clutter_text_get_font_name)
+
+  _WRAP_METHOD(void set_activatable(bool activatable=true), clutter_text_set_activatable)
+  _WRAP_METHOD(bool get_activatable() const, clutter_text_get_activatable)
+
+  _WRAP_METHOD(void set_attributes(Pango::AttrList& attrs), clutter_text_set_attributes)
+  _WRAP_METHOD(Pango::AttrList get_attributes(), clutter_text_get_attributes)
 
   _WRAP_METHOD(void set_color(const Color& color), clutter_text_set_color)
   _WRAP_METHOD_DOCS_ONLY(clutter_text_get_color)
   Color get_color() const;
   _IGNORE(clutter_text_get_color)
 
+  _WRAP_METHOD(void set_ellipsize(Pango::EllipsizeMode mode), clutter_text_set_ellipsize)
+  _WRAP_METHOD(Pango::EllipsizeMode get_ellipsize(), clutter_text_get_ellipsize)
+
+  _WRAP_METHOD(void set_font_name(const Glib::ustring& font_name), clutter_text_set_font_name)
+  _WRAP_METHOD(Glib::ustring get_font_name() const, clutter_text_get_font_name)
+
+  _WRAP_METHOD(void set_password_char(gunichar wc), clutter_text_set_password_char)
+  _WRAP_METHOD(gunichar get_password_char() const, clutter_text_get_password_char)
+
+  _WRAP_METHOD(void set_justify(bool justify=true), clutter_text_set_justify)
+  _WRAP_METHOD(bool get_justify() const, clutter_text_get_justify)
+
   _WRAP_METHOD(Glib::RefPtr<Pango::Layout> get_layout(), clutter_text_get_layout)
   _WRAP_METHOD(Glib::RefPtr<const Pango::Layout> get_layout() const, clutter_text_get_layout, constversion)
 
+  _WRAP_METHOD(void set_line_alignment(Pango::Alignment alignment), clutter_text_set_line_alignment)
   _WRAP_METHOD(Pango::Alignment get_line_alignment() const, clutter_text_get_line_alignment)
-  _WRAP_METHOD(void set_line_alignment(Pango::Alignment wrap_mode), clutter_text_set_line_alignment)
 
-  _WRAP_METHOD(int get_cursor_position() const, clutter_text_get_cursor_position)
-  _WRAP_METHOD(void set_cursor_position(int position), clutter_text_set_cursor_position)
+  _WRAP_METHOD(void set_line_wrap(bool line_wrap=true), clutter_text_set_line_wrap)
+  _WRAP_METHOD(bool get_line_wrap() const, clutter_text_get_line_wrap)
+
+  _WRAP_METHOD(Pango::WrapMode get_line_wrap_mode() const, clutter_text_get_line_wrap_mode)
+  _WRAP_METHOD(void set_line_wrap_mode(Pango::WrapMode wrap_mode), clutter_text_set_line_wrap_mode)
+
+  _WRAP_METHOD(int get_max_length() const, clutter_text_get_max_length)
+  _WRAP_METHOD(void set_max_length(int max_length), clutter_text_set_max_length)
+
+  _WRAP_METHOD(void set_selectable(bool selectable=true), clutter_text_set_selectable)
+  _WRAP_METHOD(bool get_selectable() const, clutter_text_get_selectable)
+
+  _WRAP_METHOD(void set_selection(gssize start_pos, gssize end_pos), clutter_text_set_selection)
+  _WRAP_METHOD(Glib::ustring get_selection() const, clutter_text_get_selection)
+
+  _WRAP_METHOD(void set_selection_bound(int selection_bound), clutter_text_set_selection_bound)
+  _WRAP_METHOD(int get_selection_bound() const, clutter_text_get_selection_bound)
+
+  _WRAP_METHOD(void set_single_line_mode(bool single_line=true), clutter_text_set_single_line_mode)
+  _WRAP_METHOD(bool get_single_line_mode() const, clutter_text_get_single_line_mode)
+
+  _WRAP_METHOD(void set_use_markup(bool setting=true), clutter_text_set_use_markup)
+  _WRAP_METHOD(bool get_use_markup() const, clutter_text_get_use_markup)
+
+  _WRAP_METHOD(void set_editable(bool editable=true), clutter_text_set_editable)
+  _WRAP_METHOD(bool get_editable() const, clutter_text_get_editable)
 
   _WRAP_METHOD(void insert(gunichar wc), clutter_text_insert_unichar)
   _WRAP_METHOD(void insert(const Glib::ustring& text, gssize position), clutter_text_insert_text)
@@ -66,14 +107,21 @@
   _WRAP_METHOD(void delete_chars(guint len), clutter_text_delete_chars)
   _WRAP_METHOD(void delete_text(gssize start_pos, gssize end_pos), clutter_text_delete_text)
 
+  _WRAP_METHOD(Glib::ustring get_chars(gssize start_pos, gssize end_pos) const, clutter_text_get_chars)
+
+  _WRAP_METHOD(void set_cursor_color(const Color& color), clutter_text_set_cursor_color)
+  _WRAP_METHOD(void get_cursor_color(Color& color) const, clutter_text_get_cursor_color)
+
+  _WRAP_METHOD(void set_cursor_position(int position), clutter_text_set_cursor_position)
+  _WRAP_METHOD(int get_cursor_position() const, clutter_text_get_cursor_position)
+
   _WRAP_METHOD(void set_cursor_visible(bool visible), clutter_text_set_cursor_visible)
   _WRAP_METHOD(bool get_cursor_visible() const, clutter_text_get_cursor_visible)
 
-  _WRAP_METHOD(void set_password_char(gunichar wc), clutter_text_set_password_char)
-  _WRAP_METHOD(gunichar get_password_char() const, clutter_text_get_password_char)
+  _WRAP_METHOD(void set_cursor_size(int size), clutter_text_set_cursor_size)
+  _WRAP_METHOD(unsigned int get_cursor_size() const, clutter_text_get_cursor_size)
 
-  _WRAP_METHOD(int get_max_length() const, clutter_text_get_max_length)
-  _WRAP_METHOD(void set_max_length(int max_length), clutter_text_set_max_length)
+  _WRAP_METHOD(bool activate(), clutter_text_activate)
 
   _WRAP_SIGNAL(void activate(), "activate")
   _WRAP_SIGNAL(void text_changed(), "text_changed")
@@ -96,7 +144,6 @@
   _WRAP_PROPERTY("line-wrap", bool)
   _WRAP_PROPERTY("line-wrap-mode", Pango::WrapMode)
   _WRAP_PROPERTY("ellipsize", Pango::EllipsizeMode)
-  _WRAP_PROPERTY("alignment", Pango::Alignment)
   _WRAP_PROPERTY("justify", bool)
   _WRAP_PROPERTY("password-char", gunichar)
   _WRAP_PROPERTY("max-length", int)

Modified: cluttermm/trunk/tools/m4/convert_cluttermm.m4
==============================================================================
--- cluttermm/trunk/tools/m4/convert_cluttermm.m4	(original)
+++ cluttermm/trunk/tools/m4/convert_cluttermm.m4	Sun Apr  5 19:37:58 2009
@@ -42,6 +42,7 @@
 _CONVERSION(`ClutterChildMeta*',`Glib::RefPtr<ChildMeta>',`Glib::wrap($3)')
 _CONVERSION(`ClutterChildMeta*',`Glib::RefPtr<const ChildMeta>',`Glib::wrap($3)')
 
+_CONVERSION(`Color&',`ClutterColor*',`($3).gobj()')
 _CONVERSION(`const Color&',`const ClutterColor*',`($3).gobj()')
 _CONVERSION(`const Margin&',`const ClutterMargin*',`($3).gobj()')