gnomemm r1935 - in clutter-gtkmm/trunk: . clutter-gtk clutter-gtk/src

[siavashs svn gnome org]

Author: siavashs
Date: Sat Jan  3 17:00:15 2009
New Revision: 1935
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1935&view=rev

Log:
* Regenerated clutter-gtk_methods.defs, Added Viewport

  * clutter-gtk/src/clutter-gtk_methods.defs: Regenerated
  * clutter-gtk/src/Makefile_list_of_hg.am_fragment:
  * clutter-gtk/clutter-gtkmm.h
  * clutter-gtkmm/trunk/clutter-gtk/src/viewport.ccg:
  * clutter-gtkmm/trunk/clutter-gtk/src/viewport.hg: Added Viewport

Added:
   clutter-gtkmm/trunk/clutter-gtk/src/viewport.ccg
      - copied, changed from r1934, /clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm.h
   clutter-gtkmm/trunk/clutter-gtk/src/viewport.hg
      - copied, changed from r1934, /clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm.h
Modified:
   clutter-gtkmm/trunk/ChangeLog
   clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm.h
   clutter-gtkmm/trunk/clutter-gtk/src/Makefile_list_of_hg.am_fragment
   clutter-gtkmm/trunk/clutter-gtk/src/clutter-gtk_methods.defs

Modified: clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm.h
==============================================================================
--- clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm.h	(original)
+++ clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm.h	Sat Jan  3 17:00:15 2009
@@ -28,5 +28,6 @@
 #include <cluttermm.h>
 #include <clutter-gtkmm/init.h>
 #include <clutter-gtkmm/embed.h>
+#include <clutter-gtkmm/viewport.h>
 
 #endif /* #ifndef LIBCLUTTER_GTKMM_H */

Modified: clutter-gtkmm/trunk/clutter-gtk/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- clutter-gtkmm/trunk/clutter-gtk/src/Makefile_list_of_hg.am_fragment	(original)
+++ clutter-gtkmm/trunk/clutter-gtk/src/Makefile_list_of_hg.am_fragment	Sat Jan  3 17:00:15 2009
@@ -3,4 +3,5 @@
 # so it's like copy-and-pasting this into each of those Makefile.am files.
 
 files_hg = \
-		   embed.hg
+		   embed.hg \
+		   viewport.hg

Modified: clutter-gtkmm/trunk/clutter-gtk/src/clutter-gtk_methods.defs
==============================================================================
--- clutter-gtkmm/trunk/clutter-gtk/src/clutter-gtk_methods.defs	(original)
+++ clutter-gtkmm/trunk/clutter-gtk/src/clutter-gtk_methods.defs	Sat Jan  3 17:00:15 2009
@@ -7,8 +7,35 @@
   (gtype-id "GTK_TYPE_CLUTTER_EMBED")
 )
 
+(define-object ClutterScrollable
+  (in-module "Gtk")
+  (c-name "GtkClutterScrollable")
+  (gtype-id "GTK_TYPE_CLUTTER_SCROLLABLE")
+)
+
+(define-object ClutterViewport
+  (in-module "Gtk")
+  (parent "ClutterActor")
+  (c-name "GtkClutterViewport")
+  (gtype-id "GTK_TYPE_CLUTTER_VIEWPORT")
+)
+
 ;; Enumerations and flags ...
 
+(define-enum GtkInitError
+  (in-module "Clutter")
+  (c-name "ClutterGtkInitError")
+  (gtype-id "CLUTTER_TYPE_GTK_INIT_ERROR")
+  (values
+    '("last" "CLUTTER_INIT_ERROR_LAST")
+    '("gtk" "CLUTTER_INIT_ERROR_GTK")
+  )
+)
+
+
+;; From clutter-gtk.h
+
+
 
 ;; From gtk-clutter-embed.h
 
@@ -29,4 +56,224 @@
   (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
+
+(define-function gtk_clutter_scrollable_get_type
+  (c-name "gtk_clutter_scrollable_get_type")
+  (return-type "GType")
+)
+
+(define-method set_adjustments
+  (of-object "GtkClutterScrollable")
+  (c-name "gtk_clutter_scrollable_set_adjustments")
+  (return-type "none")
+  (parameters
+    '("GtkAdjustment*" "h_adjust")
+    '("GtkAdjustment*" "v_adjust")
+  )
+)
+
+(define-method get_adjustments
+  (of-object "GtkClutterScrollable")
+  (c-name "gtk_clutter_scrollable_get_adjustments")
+  (return-type "none")
+  (parameters
+    '("GtkAdjustment**" "h_adjust")
+    '("GtkAdjustment**" "v_adjust")
+  )
+)
+
+
+
+;; From gtk-clutter-util.h
+
+(define-function gtk_clutter_get_fg_color
+  (c-name "gtk_clutter_get_fg_color")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("GtkStateType" "state")
+    '("ClutterColor*" "color")
+  )
+)
+
+(define-function gtk_clutter_get_bg_color
+  (c-name "gtk_clutter_get_bg_color")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("GtkStateType" "state")
+    '("ClutterColor*" "color")
+  )
+)
+
+(define-function gtk_clutter_get_text_color
+  (c-name "gtk_clutter_get_text_color")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("GtkStateType" "state")
+    '("ClutterColor*" "color")
+  )
+)
+
+(define-function gtk_clutter_get_text_aa_color
+  (c-name "gtk_clutter_get_text_aa_color")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("GtkStateType" "state")
+    '("ClutterColor*" "color")
+  )
+)
+
+(define-function gtk_clutter_get_base_color
+  (c-name "gtk_clutter_get_base_color")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("GtkStateType" "state")
+    '("ClutterColor*" "color")
+  )
+)
+
+(define-function gtk_clutter_get_light_color
+  (c-name "gtk_clutter_get_light_color")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("GtkStateType" "state")
+    '("ClutterColor*" "color")
+  )
+)
+
+(define-function gtk_clutter_get_dark_color
+  (c-name "gtk_clutter_get_dark_color")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("GtkStateType" "state")
+    '("ClutterColor*" "color")
+  )
+)
+
+(define-function gtk_clutter_get_mid_color
+  (c-name "gtk_clutter_get_mid_color")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("GtkStateType" "state")
+    '("ClutterColor*" "color")
+  )
+)
+
+(define-function gtk_clutter_texture_new_from_pixbuf
+  (c-name "gtk_clutter_texture_new_from_pixbuf")
+  (return-type "ClutterActor*")
+  (parameters
+    '("GdkPixbuf*" "pixbuf")
+  )
+)
+
+(define-function gtk_clutter_texture_new_from_stock
+  (c-name "gtk_clutter_texture_new_from_stock")
+  (return-type "ClutterActor*")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("const-gchar*" "stock_id")
+    '("GtkIconSize" "size")
+  )
+)
+
+(define-function gtk_clutter_texture_new_from_icon_name
+  (c-name "gtk_clutter_texture_new_from_icon_name")
+  (return-type "ClutterActor*")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("const-gchar*" "icon_name")
+    '("GtkIconSize" "size")
+  )
+)
+
+(define-function gtk_clutter_texture_set_from_pixbuf
+  (c-name "gtk_clutter_texture_set_from_pixbuf")
+  (return-type "none")
+  (parameters
+    '("ClutterTexture*" "texture")
+    '("GdkPixbuf*" "pixbuf")
+  )
+)
+
+(define-function gtk_clutter_texture_set_from_stock
+  (c-name "gtk_clutter_texture_set_from_stock")
+  (return-type "none")
+  (parameters
+    '("ClutterTexture*" "texture")
+    '("GtkWidget*" "widget")
+    '("const-gchar*" "stock_id")
+    '("GtkIconSize" "size")
+  )
+)
+
+(define-function gtk_clutter_texture_set_from_icon_name
+  (c-name "gtk_clutter_texture_set_from_icon_name")
+  (return-type "none")
+  (parameters
+    '("ClutterTexture*" "texture")
+    '("GtkWidget*" "widget")
+    '("const-gchar*" "icon_name")
+    '("GtkIconSize" "size")
+  )
+)
+
+
+
+;; From gtk-clutter-viewport.h
+
+(define-function gtk_clutter_viewport_get_type
+  (c-name "gtk_clutter_viewport_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_clutter_viewport_new
+  (c-name "gtk_clutter_viewport_new")
+  (is-constructor-of "GtkClutterViewport")
+  (return-type "ClutterActor*")
+  (parameters
+    '("GtkAdjustment*" "h_adjust")
+    '("GtkAdjustment*" "v_adjust")
+  )
+)
+
+(define-method get_origin
+  (of-object "GtkClutterViewport")
+  (c-name "gtk_clutter_viewport_get_origin")
+  (return-type "none")
+  (parameters
+    '("gint*" "x")
+    '("gint*" "y")
+    '("gint*" "z")
+  )
+)
+
+(define-method get_originu
+  (of-object "GtkClutterViewport")
+  (c-name "gtk_clutter_viewport_get_originu")
+  (return-type "none")
+  (parameters
+    '("ClutterVertex*" "origin")
+  )
+)
+
 

Copied: clutter-gtkmm/trunk/clutter-gtk/src/viewport.ccg (from r1934, /clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm.h)
==============================================================================
--- /clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm.h	(original)
+++ clutter-gtkmm/trunk/clutter-gtk/src/viewport.ccg	Sat Jan  3 17:00:15 2009
@@ -1,6 +1,4 @@
-/* cluttermm-gtk - a C++ wrapper for clutter-gtk
- *
- * Copyright 2007 The cluttermm Development Team
+/* Copyright (C) 2007 The cluttermm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -17,16 +15,12 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef LIBCLUTTER_GTKMM_H
-#define LIBCLUTTER_GTKMM_H
-
-/* cluttermm version.  */
-extern const int clutter_gtkmm_major_version;
-extern const int clutter_gtkmm_minor_version;
-extern const int clutter_gtkmm_micro_version;
+#include <clutter-gtk/clutter-gtk.h>
 
-#include <cluttermm.h>
-#include <clutter-gtkmm/init.h>
-#include <clutter-gtkmm/embed.h>
+namespace Clutter
+{
+namespace Gtk
+{
 
-#endif /* #ifndef LIBCLUTTER_GTKMM_H */
+} // namespace Gtk
+} // namespace Clutter

Copied: clutter-gtkmm/trunk/clutter-gtk/src/viewport.hg (from r1934, /clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm.h)
==============================================================================
--- /clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm.h	(original)
+++ clutter-gtkmm/trunk/clutter-gtk/src/viewport.hg	Sat Jan  3 17:00:15 2009
@@ -1,6 +1,4 @@
-/* cluttermm-gtk - a C++ wrapper for clutter-gtk
- *
- * Copyright 2007 The cluttermm Development Team
+/* Copyright (C) 2007 The cluttermm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -17,16 +15,34 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef LIBCLUTTER_GTKMM_H
-#define LIBCLUTTER_GTKMM_H
+#include <cluttermm/actor.h>
+
+_DEFS(clutter-gtkmm,clutter-gtk)
+_PINCLUDE(cluttermm/private/actor_p.h)
+
+
+namespace Clutter
+{
+namespace Gtk
+{
+
+//TODO: Documentation.
+class Viewport :
+  public ::Clutter::Actor
+{
+  _CLASS_GOBJECT(Viewport, GtkClutterViewport, GTK_CLUTTER_VIEWPORT, ::Clutter::Actor, ClutterActor)
+
+protected:
+  _CTOR_DEFAULT()
+
+public:
+
+  _WRAP_METHOD(void get_origin(int& x, int& y, int& z), gtk_clutter_viewport_get_origin)
+#m4 _CONVERSION(`Vertex&',`ClutterVertex*',`($3).gobj()')
+  _WRAP_METHOD(void get_originu(Vertex& origin), gtk_clutter_viewport_get_originu)
+};
 
-/* cluttermm version.  */
-extern const int clutter_gtkmm_major_version;
-extern const int clutter_gtkmm_minor_version;
-extern const int clutter_gtkmm_micro_version;
-
-#include <cluttermm.h>
-#include <clutter-gtkmm/init.h>
-#include <clutter-gtkmm/embed.h>
+} // namespace Gtk
+} // namespace Clutter
 
-#endif /* #ifndef LIBCLUTTER_GTKMM_H */
+//vim: ts=2,sw=2