[clutter-gtkmm] Updated generate_defs_clutter_gtk.cc
- From: Siavash Safi <siavashs src gnome org>
- To: svn-commits-list gnome org
- Subject: [clutter-gtkmm] Updated generate_defs_clutter_gtk.cc
- Date: Mon, 27 Apr 2009 08:29:48 -0400 (EDT)
commit 946427899a1c03771574db9fc6f73a70e6348803
Author: Siavash Safi <siavash siavashs org>
Date: Mon Apr 27 16:58:10 2009 +0430
Updated generate_defs_clutter_gtk.cc
Regenerated defs.
Added clutter-gtk_docs.xml
Updated the Viewport constructor.
Updated the example (no need to show the stage)
---
.gitignore | 31 +
ChangeLog | 13 +
clutter-gtk/src/Makefile.am | 3 +-
clutter-gtk/src/clutter-gtk_docs.xml | 610 ++++++++++++++++++++
clutter-gtk/src/clutter-gtk_enums.defs | 10 +
clutter-gtk/src/clutter-gtk_methods.defs | 31 +-
clutter-gtk/src/clutter-gtk_signals.defs | 636 +++++++++++++++++++++
clutter-gtk/src/viewport.hg | 7 +-
examples/events/event.cc | 9 +-
tools/extra_defs_gen/generate_defs_clutter_gtk.cc | 4 +-
10 files changed, 1333 insertions(+), 21 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d312771
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,31 @@
+Makefile.in
+Makefile
+*.o
+*.l[oa]
+*_p.h
+.deps
+.libs
+.stamps
+
+aclocal.m4
+autom4te.cache/
+clutter-gtk/clutter-gtkmm-0.9.pc
+clutter-gtk/clutter-gtkmm-config.h
+clutter-gtk/clutter-gtkmm/embed.*
+clutter-gtk/clutter-gtkmm/viewport.*
+clutter-gtk/clutter-gtkmm/wrap_init.cc
+clutter-gtk/stamp-h1
+config.log
+config.status
+configure
+docs/reference/Doxyfile
+docs/reference/html/
+examples/events/events
+libtool
+scripts/config.guess
+scripts/config.sub
+scripts/install-sh
+scripts/ltmain.sh
+scripts/missing
+tools/extra_defs_gen/generate_extra_defs_clutter_gtk
+
diff --git a/ChangeLog b/ChangeLog
index 96a6c95..a73cd3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-04-27 Siavash Safi <siavash siavashs org>
+
+ * .gitignore: Added .gitignore
+ * clutter-gtk/src/Makefile.am:
+ * clutter-gtk/src/clutter-gtk_docs.xml: Added docs xml
+ * clutter-gtk/src/clutter-gtk_enums.defs:
+ * clutter-gtk/src/clutter-gtk_methods.defs:
+ * clutter-gtk/src/clutter-gtk_signals.defs: Regenerated defs
+ * clutter-gtk/src/viewport.hg: Updated the ctor and create()
+ * examples/events/event.cc: No need to show the stage, the stage is shown
+ when the embed is shown
+ * tools/extra_defs_gen/generate_defs_clutter_gtk.cc: Updated
+
2009-03-19 Murray Cumming <murrayc murrayc com>
* clutter-gtk/src/embed.hg: get_stage(): Use refreturn to fix the
diff --git a/clutter-gtk/src/Makefile.am b/clutter-gtk/src/Makefile.am
index 2ba856a..c3ac43f 100644
--- a/clutter-gtk/src/Makefile.am
+++ b/clutter-gtk/src/Makefile.am
@@ -10,7 +10,8 @@ files_defs = clutter-gtk.defs \
clutter-gtk_signals.defs \
clutter-gtk_enums.defs \
clutter-gtk_vfuncs.defs \
- clutter-gtk_others.defs
+ clutter-gtk_others.defs \
+ clutter-gtk_docs.defs
include $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment
diff --git a/clutter-gtk/src/clutter-gtk_docs.xml b/clutter-gtk/src/clutter-gtk_docs.xml
new file mode 100644
index 0000000..e496463
--- /dev/null
+++ b/clutter-gtk/src/clutter-gtk_docs.xml
@@ -0,0 +1,610 @@
+<root>
+<function name="gtk_clutter_viewport_get_origin">
+<description>
+Retrieves the current translation factor ("origin") used when
+displaying the child of @viewport.
+
+Since: 1.0.
+
+</description>
+<parameters>
+<parameter name="viewport">
+<parameter_description> a #GtkClutterViewport
+</parameter_description>
+</parameter>
+<parameter name="x">
+<parameter_description> return location for the X origin in pixels, or %NULL
+</parameter_description>
+</parameter>
+<parameter name="y">
+<parameter_description> return location for the Y origin in pixels, or %NULL
+</parameter_description>
+</parameter>
+<parameter name="z">
+<parameter_description> return location for the Z origin in pixels, or %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="SECTION">
+<description>
+#GtkClutterViewport is a scrollable actor that can contain a single
+#ClutterActor. Using two #GtkAdjustment<!-- -->s it is possible to
+control the visible area of the child actor if the size of the viewport
+is smaller than the size of the child.
+
+The #GtkAdjustment<!-- -->s used to control the horizontal and
+vertical scrolling can be attached to a #GtkScrollbar subclass,
+like #GtkHScrollbar or #GtkVScrollbar.
+
+The #GtkClutterViewport can be used inside any #ClutterContainer
+implementation.
+
+#GtkClutterViewport is available since Clutter-GTK 1.0
+
+</description>
+<parameters>
+<parameter name="short_description">
+<parameter_description> A scrollable actor
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_clutter_texture_set_from_pixbuf">
+<description>
+Sets the contents of @texture with a copy of @pixbuf.
+
+Since: 0.8
+
+</description>
+<parameters>
+<parameter name="texture">
+<parameter_description> a #ClutterTexture
+</parameter_description>
+</parameter>
+<parameter name="pixbuf">
+<parameter_description> a #GdkPixbuf
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_clutter_get_text_aa_color">
+<description>
+Retrieves the text-aa color of @widget for the given @state and copies it
+into @color.
+
+Since: 0.8
+
+</description>
+<parameters>
+<parameter name="widget">
+<parameter_description> a #GtkWidget
+</parameter_description>
+</parameter>
+<parameter name="state">
+<parameter_description> a state
+</parameter_description>
+</parameter>
+<parameter name="color">
+<parameter_description> return location for a #ClutterColor
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_clutter_scrollable_set_adjustments">
+<description>
+Sets the horizontal and vertical adjustments used to determine
+the position of the scrollable actor.
+
+Since: 1.0
+
+</description>
+<parameters>
+<parameter name="scrollable">
+<parameter_description> a #GtkClutterScrollable
+</parameter_description>
+</parameter>
+<parameter name="h_adjust">
+<parameter_description> a #GtkAdjustment, or %NULL
+</parameter_description>
+</parameter>
+<parameter name="v_adjust">
+<parameter_description> a #GtkAdjustment, or %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_clutter_texture_set_from_icon_name">
+<description>
+Sets the contents of @texture using the @icon_name from the
+current icon theme.
+
+Since: 0.8
+
+</description>
+<parameters>
+<parameter name="texture">
+<parameter_description> a #ClutterTexture
+</parameter_description>
+</parameter>
+<parameter name="widget">
+<parameter_description> a #GtkWidget or %NULL
+</parameter_description>
+</parameter>
+<parameter name="icon_name">
+<parameter_description> the name of the icon
+</parameter_description>
+</parameter>
+<parameter name="size">
+<parameter_description> the icon size or -1
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="GtkClutterViewport">
+<description>
+The current origin of the viewport.
+
+Since: 1.0
+
+</description>
+<parameters>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_clutter_texture_new_from_icon_name">
+<description>
+Creates a new #ClutterTexture and sets its contents to be
+the @icon_name from the current icon theme.
+
+
+</description>
+<parameters>
+<parameter name="widget">
+<parameter_description> a #GtkWidget or %NULL
+</parameter_description>
+</parameter>
+<parameter name="icon_name">
+<parameter_description> the name of the icon
+</parameter_description>
+</parameter>
+<parameter name="size">
+<parameter_description> the size of the icon, or -1
+</parameter_description>
+</parameter>
+</parameters>
+<return> the newly created texture, or %NULL if @widget
+was %NULL and @icon_name was not found.
+
+Since: 0.8
+</return>
+</function>
+
+<function name="gtk_clutter_embed_get_stage">
+<description>
+Retrieves the #ClutterStage from @embed. The returned stage can be
+used to add actors to the Clutter scene.
+
+
+</description>
+<parameters>
+<parameter name="embed">
+<parameter_description> a #GtkClutterEmbed
+</parameter_description>
+</parameter>
+</parameters>
+<return> the Clutter stage. You should never destroy or unref
+the returned actor.
+
+Since: 0.6
+</return>
+</function>
+
+<function name="gtk_clutter_get_mid_color">
+<description>
+Retrieves the mid color of @widget for the given @state and copies it
+into @color.
+
+Since: 0.8
+
+</description>
+<parameters>
+<parameter name="widget">
+<parameter_description> a #GtkWidget
+</parameter_description>
+</parameter>
+<parameter name="state">
+<parameter_description> a state
+</parameter_description>
+</parameter>
+<parameter name="color">
+<parameter_description> return location for a #ClutterColor
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_clutter_texture_new_from_pixbuf">
+<description>
+Creates a new #ClutterTexture and sets its contents with a copy
+of @pixbuf.
+
+
+</description>
+<parameters>
+<parameter name="pixbuf">
+<parameter_description> a #GdkPixbuf
+</parameter_description>
+</parameter>
+</parameters>
+<return> the newly created #ClutterTexture
+
+Since: 0.8
+</return>
+</function>
+
+<function name="gtk_clutter_embed_new">
+<description>
+Creates a new #GtkClutterEmbed widget. This widget can be
+used to build a scene using Clutter API into a GTK+ application.
+
+
+</description>
+<parameters>
+</parameters>
+<return> the newly created #GtkClutterEmbed
+
+Since: 0.6
+</return>
+</function>
+
+<function name="gtk_clutter_scrollable_get_adjustments">
+<description>
+Retrieves the horizontal and vertical adjustments used to
+determine the position of the scrollable actor.
+
+Since: 1.0
+
+</description>
+<parameters>
+<parameter name="scrollable">
+<parameter_description> a #GtkClutterScrollable
+</parameter_description>
+</parameter>
+<parameter name="h_adjust">
+<parameter_description> return location for a #GtkAdjustment, or %NULL
+</parameter_description>
+</parameter>
+<parameter name="v_adjust">
+<parameter_description> return location for a #GtkAdjustment, or %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_clutter_get_base_color">
+<description>
+Retrieves the base color of @widget for the given @state and copies it
+into @color.
+
+Since: 0.8
+
+</description>
+<parameters>
+<parameter name="widget">
+<parameter_description> a #GtkWidget
+</parameter_description>
+</parameter>
+<parameter name="state">
+<parameter_description> a state
+</parameter_description>
+</parameter>
+<parameter name="color">
+<parameter_description> return location for a #ClutterColor
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_clutter_init_with_args">
+<description>
+This function should be called instead of clutter_init() and
+gtk_init_with_args().
+
+
+</description>
+<parameters>
+<parameter name="argc">
+<parameter_description> a pointer to the number of command line arguments.
+</parameter_description>
+</parameter>
+<parameter name="argv">
+<parameter_description> a pointer to the array of command line arguments.
+</parameter_description>
+</parameter>
+<parameter name="parameter_string">
+<parameter_description> a string which is displayed in
+the first line of <option>--help</option> output, after
+<literal><replaceable>programname</replaceable> [OPTION...]</literal>
+</parameter_description>
+</parameter>
+<parameter name="entries">
+<parameter_description> a %NULL-terminated array of #GOptionEntry<!-- -->s
+describing the options of your program
+</parameter_description>
+</parameter>
+<parameter name="translation_domain">
+<parameter_description> a translation domain to use for translating
+the <option>--help</option> output for the options in @entries
+with gettext(), or %NULL
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> a return location for errors
+</parameter_description>
+</parameter>
+</parameters>
+<return> %CLUTTER_INIT_SUCCESS on success, a negative integer
+on failure.
+
+Since: 1.0
+</return>
+</function>
+
+<function name="gtk_clutter_get_light_color">
+<description>
+Retrieves the light color of @widget for the given @state and copies it
+into @color.
+
+Since: 0.8
+
+</description>
+<parameters>
+<parameter name="widget">
+<parameter_description> a #GtkWidget
+</parameter_description>
+</parameter>
+<parameter name="state">
+<parameter_description> a state
+</parameter_description>
+</parameter>
+<parameter name="color">
+<parameter_description> return location for a #ClutterColor
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_clutter_viewport_new">
+<description>
+Creates a new #GtkClutterViewport with the given adjustments.
+
+
+</description>
+<parameters>
+<parameter name="h_adjust">
+<parameter_description> horizontal adjustment, or %NULL
+</parameter_description>
+</parameter>
+<parameter name="v_adjust">
+<parameter_description> vertical adjustment, or %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return> the newly created viewport actor
+
+Since: 1.0
+</return>
+</function>
+
+<function name="gtk_clutter_texture_set_from_stock">
+<description>
+Sets the contents of @texture using the stock icon @stock_id, as
+rendered by @widget.
+
+Since: 0.8
+
+</description>
+<parameters>
+<parameter name="texture">
+<parameter_description> a #ClutterTexture
+</parameter_description>
+</parameter>
+<parameter name="widget">
+<parameter_description> a #GtkWidget
+</parameter_description>
+</parameter>
+<parameter name="stock_id">
+<parameter_description> the stock id of the icon
+</parameter_description>
+</parameter>
+<parameter name="size">
+<parameter_description> the size of the icon, or -1
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_clutter_get_fg_color">
+<description>
+Retrieves the foreground color of @widget for the given @state and copies
+it into @color.
+
+Since: 0.8
+
+</description>
+<parameters>
+<parameter name="widget">
+<parameter_description> a #GtkWidget
+</parameter_description>
+</parameter>
+<parameter name="state">
+<parameter_description> a state
+</parameter_description>
+</parameter>
+<parameter name="color">
+<parameter_description> return location for a #ClutterColor
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_clutter_get_bg_color">
+<description>
+Retrieves the background color of @widget for the given @state and copies
+it into @color.
+
+Since: 0.8
+
+</description>
+<parameters>
+<parameter name="widget">
+<parameter_description> a #GtkWidget
+</parameter_description>
+</parameter>
+<parameter name="state">
+<parameter_description> a state
+</parameter_description>
+</parameter>
+<parameter name="color">
+<parameter_description> return location for a #ClutterColor
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_clutter_get_dark_color">
+<description>
+Retrieves the dark color of @widget for the given @state and copies it
+into @color.
+
+Since: 0.8
+
+</description>
+<parameters>
+<parameter name="widget">
+<parameter_description> a #GtkWidget
+</parameter_description>
+</parameter>
+<parameter name="state">
+<parameter_description> a state
+</parameter_description>
+</parameter>
+<parameter name="color">
+<parameter_description> return location for a #ClutterColor
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_clutter_get_text_color">
+<description>
+Retrieves the text color of @widget for the given @state and copies it
+into @color.
+
+Since: 0.8
+
+</description>
+<parameters>
+<parameter name="widget">
+<parameter_description> a #GtkWidget
+</parameter_description>
+</parameter>
+<parameter name="state">
+<parameter_description> a state
+</parameter_description>
+</parameter>
+<parameter name="color">
+<parameter_description> return location for a #ClutterColor
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="GtkClutterScrollable">
+<description>
+The #GtkAdjustment that determines the value of the
+vertical position for this scrollable actor.
+
+Since: 1.0
+
+</description>
+<parameters>
+</parameters>
+<return></return>
+</function>
+
+<function name="gtk_clutter_init">
+<description>
+This function should be called instead of clutter_init() and
+gtk_init().
+
+
+</description>
+<parameters>
+<parameter name="argc">
+<parameter_description> pointer to the arguments count, or %NULL
+</parameter_description>
+</parameter>
+<parameter name="argv">
+<parameter_description> pointer to the arguments vector, or %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return> %CLUTTER_INIT_SUCCESS on success, a negative integer
+on failure.
+
+Since: 0.8
+</return>
+</function>
+
+<function name="gtk_clutter_texture_new_from_stock">
+<description>
+Creates a new #ClutterTexture and sets its contents using the stock
+icon @stock_id as rendered by @widget.
+
+
+</description>
+<parameters>
+<parameter name="widget">
+<parameter_description> a #GtkWidget
+</parameter_description>
+</parameter>
+<parameter name="stock_id">
+<parameter_description> the stock id of the icon
+</parameter_description>
+</parameter>
+<parameter name="size">
+<parameter_description> the size of the icon, or -1
+</parameter_description>
+</parameter>
+</parameters>
+<return> the newly created #ClutterTexture
+
+Since: 0.8
+</return>
+</function>
+
+</root>
diff --git a/clutter-gtk/src/clutter-gtk_enums.defs b/clutter-gtk/src/clutter-gtk_enums.defs
index e69de29..d0bf106 100644
--- a/clutter-gtk/src/clutter-gtk_enums.defs
+++ b/clutter-gtk/src/clutter-gtk_enums.defs
@@ -0,0 +1,10 @@
+;; From /usr/local/include/clutter-0.9/clutter-gtk/gtk-clutter-util.h
+
+(define-enum-extended GtkInitError
+ (in-module "Clutter")
+ (c-name "ClutterGtkInitError")
+ (values
+ '("t" "CLUTTER_INIT_ERROR_LAST" "#error")
+ )
+)
+
diff --git a/clutter-gtk/src/clutter-gtk_methods.defs b/clutter-gtk/src/clutter-gtk_methods.defs
index 6004bc9..2a95a1c 100644
--- a/clutter-gtk/src/clutter-gtk_methods.defs
+++ b/clutter-gtk/src/clutter-gtk_methods.defs
@@ -56,15 +56,6 @@
(return-type "ClutterActor*")
)
-(define-function gtk_clutter_init
- (c-name "gtk_clutter_init")
- (return-type "ClutterInitError")
- (parameters
- '("gint*" "argc")
- '("gchar***" "argv")
- )
-)
-
;; From gtk-clutter-scrollable.h
@@ -98,6 +89,28 @@
;; From gtk-clutter-util.h
+(define-function gtk_clutter_init
+ (c-name "gtk_clutter_init")
+ (return-type "ClutterInitError")
+ (parameters
+ '("int*" "argc")
+ '("char***" "argv")
+ )
+)
+
+(define-function gtk_clutter_init_with_args
+ (c-name "gtk_clutter_init_with_args")
+ (return-type "ClutterInitError")
+ (parameters
+ '("int*" "argc")
+ '("char***" "argv")
+ '("const-char*" "parameter_string")
+ '("GOptionEntry*" "entries")
+ '("const-char*" "translation_domain")
+ '("GError**" "error")
+ )
+)
+
(define-function gtk_clutter_get_fg_color
(c-name "gtk_clutter_get_fg_color")
(return-type "none")
diff --git a/clutter-gtk/src/clutter-gtk_signals.defs b/clutter-gtk/src/clutter-gtk_signals.defs
index e69de29..ffd1e04 100644
--- a/clutter-gtk/src/clutter-gtk_signals.defs
+++ b/clutter-gtk/src/clutter-gtk_signals.defs
@@ -0,0 +1,636 @@
+;; From GtkClutterEmbed
+
+(define-property user-data
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamPointer")
+ (docs "Anonymous User Data Pointer")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property name
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamString")
+ (docs "The name of the widget")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property parent
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamObject")
+ (docs "The parent widget of this widget. Must be a Container widget")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property width-request
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamInt")
+ (docs "Override for width request of the widget, or -1 if natural request should be used")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property height-request
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamInt")
+ (docs "Override for height request of the widget, or -1 if natural request should be used")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property visible
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamBoolean")
+ (docs "Whether the widget is visible")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property sensitive
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamBoolean")
+ (docs "Whether the widget responds to input")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property app-paintable
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamBoolean")
+ (docs "Whether the application will paint directly on the widget")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property can-focus
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamBoolean")
+ (docs "Whether the widget can accept the input focus")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property has-focus
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamBoolean")
+ (docs "Whether the widget has the input focus")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property is-focus
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamBoolean")
+ (docs "Whether the widget is the focus widget within the toplevel")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property can-default
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamBoolean")
+ (docs "Whether the widget can be the default widget")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property has-default
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamBoolean")
+ (docs "Whether the widget is the default widget")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property receives-default
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamBoolean")
+ (docs "If TRUE, the widget will receive the default action when it is focused")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property composite-child
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamBoolean")
+ (docs "Whether the widget is part of a composite widget")
+ (readable #t)
+ (writable #f)
+ (construct-only #f)
+)
+
+(define-property style
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamObject")
+ (docs "The style of the widget, which contains information about how it will look (colors etc)")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property events
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamFlags")
+ (docs "The event mask that decides what kind of GdkEvents this widget gets")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property extension-events
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamEnum")
+ (docs "The mask that decides what kind of extension events this widget gets")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property no-show-all
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamBoolean")
+ (docs "Whether gtk_widget_show_all() should not affect this widget")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property has-tooltip
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamBoolean")
+ (docs "Whether this widget has a tooltip")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property tooltip-markup
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamString")
+ (docs "The contents of the tooltip for this widget")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property tooltip-text
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamString")
+ (docs "The contents of the tooltip for this widget")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property window
+ (of-object "GtkClutterEmbed")
+ (prop-type "GParamObject")
+ (docs "The widget's window if it is realized")
+ (readable #t)
+ (writable #f)
+ (construct-only #f)
+)
+
+;; From GtkClutterViewport
+
+(define-property vadjustment
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamObject")
+ (docs "The GtkAdjustment that determines the value of the vertical position for this scrollable actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property hadjustment
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamObject")
+ (docs "The GtkAdjustment that determines the value of the horizontal position for this scrollable actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property name
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamString")
+ (docs "Name of the actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property x
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamInt")
+ (docs "X coordinate of the actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property y
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamInt")
+ (docs "Y coordinate of the actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property width
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamInt")
+ (docs "Width of the actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property height
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamInt")
+ (docs "Height of the actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property fixed-x
+ (of-object "GtkClutterViewport")
+ (prop-type "ClutterParamSpecUnit")
+ (docs "Forced X position of the actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property fixed-y
+ (of-object "GtkClutterViewport")
+ (prop-type "ClutterParamSpecUnit")
+ (docs "Forced Y position of the actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property fixed-position-set
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamBoolean")
+ (docs "Whether to use fixed positioning for the actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property min-width
+ (of-object "GtkClutterViewport")
+ (prop-type "ClutterParamSpecUnit")
+ (docs "Forced minimum width request for the actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property min-width-set
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamBoolean")
+ (docs "Whether to use the min-width property")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property min-height
+ (of-object "GtkClutterViewport")
+ (prop-type "ClutterParamSpecUnit")
+ (docs "Forced minimum height request for the actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property min-height-set
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamBoolean")
+ (docs "Whether to use the min-height property")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property natural-width
+ (of-object "GtkClutterViewport")
+ (prop-type "ClutterParamSpecUnit")
+ (docs "Forced natural width request for the actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property natural-width-set
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamBoolean")
+ (docs "Whether to use the natural-width property")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property natural-height
+ (of-object "GtkClutterViewport")
+ (prop-type "ClutterParamSpecUnit")
+ (docs "Forced natural height request for the actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property natural-height-set
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamBoolean")
+ (docs "Whether to use the natural-height property")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property request-mode
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamEnum")
+ (docs "The actor's request mode")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property allocation
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamBoxed")
+ (docs "The actor's allocation")
+ (readable #t)
+ (writable #f)
+ (construct-only #f)
+)
+
+(define-property depth
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamInt")
+ (docs "Depth of actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property clip
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamBoxed")
+ (docs "The clip region for the actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property has-clip
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamBoolean")
+ (docs "Whether the actor has a clip set or not")
+ (readable #t)
+ (writable #f)
+ (construct-only #f)
+)
+
+(define-property clip-to-allocation
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamBoolean")
+ (docs "Sets the clip region to track the actor's allocation")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property opacity
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamUChar")
+ (docs "Opacity of actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property visible
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamBoolean")
+ (docs "Whether the actor is visible or not")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property reactive
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamBoolean")
+ (docs "Whether the actor is reactive to events or not")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property scale-x
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamDouble")
+ (docs "Scale factor on the X axis")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property scale-y
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamDouble")
+ (docs "Scale factor on the Y axis")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property scale-center-x
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamInt")
+ (docs "Horizontal scale center")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property scale-center-y
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamInt")
+ (docs "Vertical scale center")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property scale-gravity
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamEnum")
+ (docs "The center of scaling")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property rotation-angle-x
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamDouble")
+ (docs "The rotation angle on the X axis")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property rotation-angle-y
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamDouble")
+ (docs "The rotation angle on the Y axis")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property rotation-angle-z
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamDouble")
+ (docs "The rotation angle on the Z axis")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property rotation-center-x
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamBoxed")
+ (docs "The rotation center on the X axis")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property rotation-center-y
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamBoxed")
+ (docs "The rotation center on the Y axis")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property rotation-center-z
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamBoxed")
+ (docs "The rotation center on the Z axis")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property rotation-center-z-gravity
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamEnum")
+ (docs "Center point for rotation around the Z axis")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property anchor-x
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamInt")
+ (docs "X coordinate of the anchor point")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property anchor-y
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamInt")
+ (docs "Y coordinate of the anchor point")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property anchor-gravity
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamEnum")
+ (docs "The anchor point as a ClutterGravity")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property show-on-set-parent
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamBoolean")
+ (docs "Whether the actor is shown when parented")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property child
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamObject")
+ (docs "The ClutterActor inside the viewport")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property origin
+ (of-object "GtkClutterViewport")
+ (prop-type "GParamBoxed")
+ (docs "The current origin of the viewport")
+ (readable #t)
+ (writable #f)
+ (construct-only #f)
+)
+
+;; From GtkClutterScrollable
+
+(define-property vadjustment
+ (of-object "GtkClutterScrollable")
+ (prop-type "GParamObject")
+ (docs "The GtkAdjustment that determines the value of the vertical position for this scrollable actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property hadjustment
+ (of-object "GtkClutterScrollable")
+ (prop-type "GParamObject")
+ (docs "The GtkAdjustment that determines the value of the horizontal position for this scrollable actor")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
diff --git a/clutter-gtk/src/viewport.hg b/clutter-gtk/src/viewport.hg
index f75eb55..8d62c90 100644
--- a/clutter-gtk/src/viewport.hg
+++ b/clutter-gtk/src/viewport.hg
@@ -16,6 +16,7 @@
*/
#include <cluttermm/actor.h>
+#include <gtkmm/adjustment.h>
_DEFS(clutter-gtkmm,clutter-gtk)
_PINCLUDE(cluttermm/private/actor_p.h)
@@ -33,13 +34,13 @@ class Viewport :
_CLASS_GOBJECT(Viewport, GtkClutterViewport, GTK_CLUTTER_VIEWPORT, ::Clutter::Actor, ClutterActor)
protected:
- _CTOR_DEFAULT()
+#m4 _CONVERSION(`::Gtk::Adjustment&',`GtkAdjustment*',`($3).gobj()')
+ _WRAP_CTOR(Viewport(::Gtk::Adjustment& h_adjustment, ::Gtk::Adjustment& v_adjustment), gtk_clutter_viewport_new)
public:
+ _WRAP_CREATE(::Gtk::Adjustment& h_adjustment, ::Gtk::Adjustment& v_adjustment)
_WRAP_METHOD(void get_origin(float& x, float& y, float& z), gtk_clutter_viewport_get_origin)
-#m4 _CONVERSION(`Vertex&',`ClutterVertex*',`($3).gobj()')
- _WRAP_METHOD(void get_originu(Vertex& origin), gtk_clutter_viewport_get_originu)
};
} // namespace Gtk
diff --git a/examples/events/event.cc b/examples/events/event.cc
index 9511ada..84b5a21 100644
--- a/examples/events/event.cc
+++ b/examples/events/event.cc
@@ -52,7 +52,7 @@ Event::Event()
m_hand->signal_button_press_event().connect(sigc::mem_fun(*this, &Event::on_hand_button_press));
Clutter::Color text_color;
- //Clutter::Gtk::get_text_color(*this, Gtk::STATE_NORMAL, text_color);
+ Clutter::Gtk::get_text_color(*this, Gtk::STATE_NORMAL, text_color);
m_clutter_entry = Clutter::Text::create("Sans 10", "", text_color);
m_stage->add_actor(m_clutter_entry);
m_clutter_entry->set_position(0, 0);
@@ -89,12 +89,7 @@ Event::Event()
m_hbox_opacity.pack_start(m_spin_opacity);
m_spin_opacity.signal_value_changed().connect(sigc::mem_fun(*this, &Event::on_opacity_changed));
- show_all();
-
- /* Only show/show_all the stage after parent show. widget_show will call
- * show on the stage.
- */
- m_stage->show_all();
+ show_all_children();
}
Event::~Event()
diff --git a/tools/extra_defs_gen/generate_defs_clutter_gtk.cc b/tools/extra_defs_gen/generate_defs_clutter_gtk.cc
index 5a0b48f..94ba20a 100644
--- a/tools/extra_defs_gen/generate_defs_clutter_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_clutter_gtk.cc
@@ -25,7 +25,9 @@ int main(int argc, char** argv)
clutter_init(&argc, &argv);
std::cout
- << get_defs(GTK_TYPE_CLUTTER_EMBED)
+ << get_defs(GTK_CLUTTER_TYPE_EMBED)
+ << get_defs(GTK_CLUTTER_TYPE_VIEWPORT)
+ << get_defs(GTK_CLUTTER_TYPE_SCROLLABLE)
;
return 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
