GNOME.org
 

gnomemm r2059 - in clutter-gtkmm/branches/cluttermm-0.8: . clutter-gtk clutter-gtk/clutter-gtkmm clutter-gtk/src docs examples/events scripts tools/extra_defs_gen

Author: murrayc
Date: Tue Feb 17 09:48:43 2009
New Revision: 2059
URL: http://svn.gnome.org/viewvc/gnomemm?rev=2059&view=rev

Log:
Increased version

Removed:
   clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/src/viewport.ccg
   clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/src/viewport.hg
   clutter-gtkmm/branches/cluttermm-0.8/scripts/depcomp
Modified:
   clutter-gtkmm/branches/cluttermm-0.8/ChangeLog
   clutter-gtkmm/branches/cluttermm-0.8/NEWS
   clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/clutter-gtkmm.h
   clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/clutter-gtkmm/utility.cc
   clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/src/Makefile_list_of_hg.am_fragment
   clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/src/clutter-gtk_methods.defs
   clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/src/embed.ccg
   clutter-gtkmm/branches/cluttermm-0.8/configure.in
   clutter-gtkmm/branches/cluttermm-0.8/docs/Makefile_web.am_fragment
   clutter-gtkmm/branches/cluttermm-0.8/examples/events/event.cc
   clutter-gtkmm/branches/cluttermm-0.8/examples/events/event.h
   clutter-gtkmm/branches/cluttermm-0.8/tools/extra_defs_gen/generate_defs_clutter_gtk.cc

Modified: clutter-gtkmm/branches/cluttermm-0.8/NEWS
==============================================================================
--- clutter-gtkmm/branches/cluttermm-0.8/NEWS	(original)
+++ clutter-gtkmm/branches/cluttermm-0.8/NEWS	Tue Feb 17 09:48:43 2009
@@ -1,3 +1,7 @@
+0.7.4:
+
+* Back-ported changes from trunk.
+
 0.7.2:
 
 * Created this new clutter-gtkmm tarball, wrapping clutter-gtk.

Modified: clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/clutter-gtkmm.h
==============================================================================
--- clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/clutter-gtkmm.h	(original)
+++ clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/clutter-gtkmm.h	Tue Feb 17 09:48:43 2009
@@ -28,7 +28,6 @@
 #include <cluttermm.h>
 #include <clutter-gtkmm/init.h>
 #include <clutter-gtkmm/embed.h>
-#include <clutter-gtkmm/viewport.h>
 #include <clutter-gtkmm/utility.h>
 
 #endif /* #ifndef LIBCLUTTER_GTKMM_H */

Modified: clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/clutter-gtkmm/utility.cc
==============================================================================
--- clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/clutter-gtkmm/utility.cc	(original)
+++ clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/clutter-gtkmm/utility.cc	Tue Feb 17 09:48:43 2009
@@ -18,7 +18,7 @@
  */
 
 #include <clutter-gtkmm/utility.h>
-#include <clutter-gtk/clutter-gtk.h>
+#include <clutter-gtk/gtk-clutter-embed.h>
 
 namespace Clutter
 {

Modified: clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/src/Makefile_list_of_hg.am_fragment	(original)
+++ clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/src/Makefile_list_of_hg.am_fragment	Tue Feb 17 09:48:43 2009
@@ -2,6 +2,4 @@
 # The include happens in Makefile.am, not Makefile.in or Makefile,
 # so it's like copy-and-pasting this into each of those Makefile.am files.
 
-files_hg = \
-		   embed.hg \
-		   viewport.hg
+files_hg = embed.hg

Modified: clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/src/clutter-gtk_methods.defs
==============================================================================
--- clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/src/clutter-gtk_methods.defs	(original)
+++ clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/src/clutter-gtk_methods.defs	Tue Feb 17 09:48:43 2009
@@ -7,35 +7,8 @@
   (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
 
@@ -56,224 +29,4 @@
   (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")
-  )
-)
-
 

Modified: clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/src/embed.ccg
==============================================================================
--- clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/src/embed.ccg	(original)
+++ clutter-gtkmm/branches/cluttermm-0.8/clutter-gtk/src/embed.ccg	Tue Feb 17 09:48:43 2009
@@ -15,7 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <clutter-gtk/clutter-gtk.h>
+#include <clutter-gtk/gtk-clutter-embed.h>
 
 namespace Clutter
 {

Modified: clutter-gtkmm/branches/cluttermm-0.8/configure.in
==============================================================================
--- clutter-gtkmm/branches/cluttermm-0.8/configure.in	(original)
+++ clutter-gtkmm/branches/cluttermm-0.8/configure.in	Tue Feb 17 09:48:43 2009
@@ -4,8 +4,8 @@
 #  Version and initialization
 #########################################################################
 CLUTTER_GTKMM_MAJOR_VERSION=0
-CLUTTER_GTKMM_MINOR_VERSION=9
-CLUTTER_GTKMM_MICRO_VERSION=0
+CLUTTER_GTKMM_MINOR_VERSION=7
+CLUTTER_GTKMM_MICRO_VERSION=4
 
 #
 # +1 : ? : +1  == new interface that does not break old one
@@ -73,14 +73,14 @@
 
 PKG_CHECK_MODULES(CLUTTER_GTKMM,
                   [gtkmm-2.4
-                   cluttermm-0.9
-                   clutter-gtk-0.9])
+                   cluttermm-0.8 >= 0.7.4
+                   clutter-gtk-0.8])
 AC_SUBST(CLUTTER_GTKMM_CFLAGS)
 AC_SUBST(CLUTTER_GTKMM_LIBS)
 
 # the API version of the library.  Libraries and pkg-config files will have this
 # value appended to them, e.g. libclutter-0.6.so
-API_VER=0.9
+API_VER=0.8
 AC_SUBST([API_VER])
 
 GMM_PROCDIR=`pkg-config --variable=gmmprocdir glibmm-2.4`

Modified: clutter-gtkmm/branches/cluttermm-0.8/docs/Makefile_web.am_fragment
==============================================================================
--- clutter-gtkmm/branches/cluttermm-0.8/docs/Makefile_web.am_fragment	(original)
+++ clutter-gtkmm/branches/cluttermm-0.8/docs/Makefile_web.am_fragment	Tue Feb 17 09:48:43 2009
@@ -1,5 +1,5 @@
 web_host = gtkmm.org
-web_path_gtkmm = /home/murrayc/gtkmm.org/docs/clutter-gtkmm-0.9/
+web_path_gtkmm = /home/murrayc/gtkmm.org/docs/clutter-gtkmm-0.8/
 web_path_docs = $(web_path_gtkmm)docs/
 
 #--delete and --delete-after are causing

Modified: clutter-gtkmm/branches/cluttermm-0.8/examples/events/event.cc
==============================================================================
--- clutter-gtkmm/branches/cluttermm-0.8/examples/events/event.cc	(original)
+++ clutter-gtkmm/branches/cluttermm-0.8/examples/events/event.cc	Tue Feb 17 09:48:43 2009
@@ -53,7 +53,7 @@
 
   Clutter::Color text_color;
   //Clutter::Gtk::get_text_color(*this, Gtk::STATE_NORMAL, text_color);
-  m_clutter_entry = Clutter::Text::create("Sans 10", "", text_color);
+  m_clutter_entry = Clutter::Entry::create("Sans 10", "", text_color);
   m_stage->add_actor(m_clutter_entry);
   m_clutter_entry->set_position(0, 0);
   m_clutter_entry->set_size(500, 20);

Modified: clutter-gtkmm/branches/cluttermm-0.8/examples/events/event.h
==============================================================================
--- clutter-gtkmm/branches/cluttermm-0.8/examples/events/event.h	(original)
+++ clutter-gtkmm/branches/cluttermm-0.8/examples/events/event.h	Tue Feb 17 09:48:43 2009
@@ -28,6 +28,6 @@
   Clutter::Gtk::Embed m_embed;
   Glib::RefPtr<Clutter::Stage> m_stage;
   Glib::RefPtr<Clutter::Texture> m_hand;
-  Glib::RefPtr<Clutter::Text> m_clutter_entry;
+  Glib::RefPtr<Clutter::Entry> m_clutter_entry;
 };
 

Modified: clutter-gtkmm/branches/cluttermm-0.8/tools/extra_defs_gen/generate_defs_clutter_gtk.cc
==============================================================================
--- clutter-gtkmm/branches/cluttermm-0.8/tools/extra_defs_gen/generate_defs_clutter_gtk.cc	(original)
+++ clutter-gtkmm/branches/cluttermm-0.8/tools/extra_defs_gen/generate_defs_clutter_gtk.cc	Tue Feb 17 09:48:43 2009
@@ -17,7 +17,7 @@
 
 #include "glibmm_generate_extra_defs/generate_extra_defs.h"
 #include <clutter/clutter.h>
-#include <clutter-gtk/clutter-gtk.h>
+#include <clutter-gtk/gtk-clutter-embed.h>
 #include <iostream>
 
 int main(int argc, char** argv)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]