GNOME.org
 

[cluttermm/cluttermm-1.2] Remove use of clutter-1.3/1.4 API so it builds with clutter 1.2.

commit 86a493e5994fc09f2633b46c1170d964db6405bb
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Sep 21 11:22:52 2010 +0200

    Remove use of clutter-1.3/1.4 API so it builds with clutter 1.2.
    
    This is the cluttermm-1.2 branch, using clutter 1.2

 ChangeLog                                        |    6 ++
 clutter/cluttermm.h                              |    2 -
 clutter/src/action.ccg                           |   26 ----------
 clutter/src/action.hg                            |   46 ------------------
 clutter/src/actor-meta.ccg                       |   26 ----------
 clutter/src/actor-meta.hg                        |   54 ----------------------
 clutter/src/actor.hg                             |   34 --------------
 clutter/src/effect.ccg                           |   26 ----------
 clutter/src/effect.hg                            |   46 ------------------
 clutter/src/filelist.am                          |    3 -
 clutter/src/stage.hg                             |    3 -
 clutter/src/texture.hg                           |    5 +--
 codegen/extradefs/generate_extra_defs_clutter.cc |    3 -
 configure.ac                                     |    3 +-
 14 files changed, 8 insertions(+), 275 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 295f084..34bfab3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-21  Murray Cumming  <murrayc murrayc com>
+
+	Remove use of clutter-1.3/1.4 API so it builds with clutter 1.2.
+
+This is the cluttermm-1.2 branch, using clutter 1.2
+
 2010-09-17  Chris Kühl  <chrisk openismus com>
 
 	Fixed typo in Script::get_object (constverrsion != constversion)
diff --git a/clutter/cluttermm.h b/clutter/cluttermm.h
index 2cc2ad1..2a61ec1 100644
--- a/clutter/cluttermm.h
+++ b/clutter/cluttermm.h
@@ -54,9 +54,7 @@
 
 #include <glibmm.h>
 #include <cluttermmconfig.h>
-#include <cluttermm/action.h>
 #include <cluttermm/actor.h>
-#include <cluttermm/actor-meta.h>
 #include <cluttermm/alpha.h>
 #include <cluttermm/animation.h>
 #include <cluttermm/behaviour.h>
diff --git a/clutter/src/actor.hg b/clutter/src/actor.hg
index 68fc535..3c7330d 100644
--- a/clutter/src/actor.hg
+++ b/clutter/src/actor.hg
@@ -18,11 +18,8 @@
 #include <glibmm/object.h>
 #include <pangomm/context.h>
 #include <pangomm/layout.h>
-#include <atkmm/object.h>
-#include <cluttermm/action.h>
 #include <cluttermm/animation.h>
 #include <cluttermm/color.h>
-#include <cluttermm/effect.h>
 #include <cluttermm/scriptable.h>
 #include <cluttermm/shader.h>
 #include <cluttermm/types.h> // For Event*
@@ -154,8 +151,6 @@ public:
   _WRAP_METHOD(guint32 get_gid() const, clutter_actor_get_gid)
   _WRAP_METHOD(void set_clip(float xoff, float yoff, float width, float height), clutter_actor_set_clip)
   _WRAP_METHOD(void get_clip(float& xoff, float& yoff, float& width, float& height), clutter_actor_get_clip)
-  _WRAP_METHOD(void set_clip_to_allocation(bool clip_set = true), clutter_actor_set_clip_to_allocation)
-  _WRAP_METHOD(bool get_clip_to_allocation() const, clutter_actor_get_clip_to_allocation)
   _WRAP_METHOD(void remove_clip(), clutter_actor_remove_clip)
   _WRAP_METHOD(bool has_clip() const, clutter_actor_has_clip)
   _WRAP_METHOD(void set_parent(const Glib::RefPtr<Actor>& parent), clutter_actor_set_parent)
@@ -163,7 +158,6 @@ public:
   _WRAP_METHOD(Glib::RefPtr<const Actor> get_parent() const, clutter_actor_get_parent, refreturn, constversion)
   _WRAP_METHOD(void reparent(const Glib::RefPtr<Actor>& new_parent), clutter_actor_reparent)
   _WRAP_METHOD(void unparent(), clutter_actor_unparent)
-  _WRAP_METHOD(bool contains(const Glib::RefPtr<const Actor>& descendant) const, clutter_actor_contains)
   _WRAP_METHOD(void raise(const Glib::RefPtr<Actor>& below), clutter_actor_raise)
   _WRAP_METHOD(void lower(const Glib::RefPtr<Actor>& above), clutter_actor_lower)
   _WRAP_METHOD(void raise_top (), clutter_actor_raise_top)
@@ -267,34 +261,6 @@ public:
   _WRAP_METHOD(void push_internal(), clutter_actor_push_internal)
   _WRAP_METHOD(void pop_internal(), clutter_actor_pop_internal)
 
-  _WRAP_METHOD(bool has_allocation() const, clutter_actor_has_allocation)
-
-  _WRAP_METHOD(Glib::RefPtr<Atk::Object> get_accessible(), clutter_actor_get_accessible, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Atk::Object> get_accessible() const, clutter_actor_get_accessible, refreturn, constversion)
-
-  _WRAP_METHOD(void add_action(const Glib::RefPtr<Action>& action), clutter_actor_add_action)
-  _WRAP_METHOD(void add_action(const Glib::ustring& name, const Glib::RefPtr<Action>& action), clutter_actor_add_action_with_name)
-  _WRAP_METHOD(void remove_action(const Glib::RefPtr<Action>&action), clutter_actor_remove_action)
-  _WRAP_METHOD(void remove_action(const Glib::ustring& name), clutter_actor_remove_action_by_name)
-
-  _WRAP_METHOD(Glib::RefPtr<Action> get_action(const Glib::ustring& name), clutter_actor_get_action, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Action> get_action(const Glib::ustring& name) const, clutter_actor_get_action, refreturn, constversion)
-
-//TODO:   _WRAP_METHOD(GLis* get_actions(), clutter_actor_get_actions)
-  _WRAP_METHOD(void clear_actions(), clutter_actor_clear_actions)
-
-
-  _WRAP_METHOD(void add_effect(const Glib::RefPtr<Effect>& effect), clutter_actor_add_effect)
-  _WRAP_METHOD(void add_effect_with_name(const Glib::ustring& name,
-                                                    const Glib::RefPtr<Effect>& effect), clutter_actor_add_effect_with_name)
-  _WRAP_METHOD(void remove_effect(const Glib::RefPtr<Effect>& effect), clutter_actor_remove_effect)
-  _WRAP_METHOD(void remove_effect(const Glib::ustring& name), clutter_actor_remove_effect_by_name )
-  //TODO: GList *        clutter_actor_get_effects           (ClutterActor  *self);
-  _WRAP_METHOD(Glib::RefPtr<Effect> get_effect(const Glib::ustring& name), clutter_actor_get_effect, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Effect> get_effect(const Glib::ustring& name) const, clutter_actor_get_effect, refreturn, constversion)
-  _WRAP_METHOD(void clear_effects(), clutter_actor_clear_effects)
-
-
 
 // signals
   _WRAP_SIGNAL(bool button_press_event(ButtonEvent* event), "button_press_event")
diff --git a/clutter/src/filelist.am b/clutter/src/filelist.am
index 101fa88..d4246ba 100644
--- a/clutter/src/filelist.am
+++ b/clutter/src/filelist.am
@@ -12,8 +12,6 @@ files_defs =			\
 
 files_hg =			\
 	actor.hg		\
-	actor-meta.hg		\
-	action.hg		\
 	alpha.hg		\
 	animation.hg		\
 	backend.hg		\
@@ -29,7 +27,6 @@ files_hg =			\
 	clone.hg		\
 	color.hg		\
 	container.hg		\
-	effect.hg \
 	group.hg		\
 	interval.hg		\
 	media.hg		\
diff --git a/clutter/src/stage.hg b/clutter/src/stage.hg
index 11c0369..b524a68 100644
--- a/clutter/src/stage.hg
+++ b/clutter/src/stage.hg
@@ -123,9 +123,6 @@ public:
   _WRAP_METHOD(void set_minimum_size(guint width, guint height), clutter_stage_set_minimum_size)
   _WRAP_METHOD(void get_minimum_size(guint& width, guint& height), clutter_stage_get_minimum_size)
 
-  _WRAP_METHOD(void set_no_clear_hint(bool no_clear = true), clutter_stage_set_no_clear_hint)
-  _WRAP_METHOD(bool get_no_clear_hint() const, clutter_stage_get_no_clear_hint)
-
   _WRAP_SIGNAL(void fullscreen(), "fullscreen")
   _WRAP_SIGNAL(void unfullscreen(), "unfullscreen")
   _WRAP_SIGNAL(void activate(), "activate")
diff --git a/clutter/src/texture.hg b/clutter/src/texture.hg
index b191930..6c0050d 100644
--- a/clutter/src/texture.hg
+++ b/clutter/src/texture.hg
@@ -18,7 +18,7 @@
 #include <cluttermm/actor.h>
 #include <cluttermm/types.h>
 #include <clutter/clutter.h> // For CoglHandle
- 
+
 _DEFS(cluttermm,clutter)
 _PINCLUDE(cluttermm/private/actor_p.h)
 
@@ -91,9 +91,6 @@ public:
 
   _WRAP_METHOD(bool get_load_data_async() const, clutter_texture_get_load_data_async)
   _WRAP_METHOD(void set_load_data_async(bool load_async=true), clutter_texture_set_load_data_async)
-  
-  _WRAP_METHOD(void set_pick_with_alpha(bool pick_with_alpha = true), clutter_texture_set_pick_with_alpha)
-  _WRAP_METHOD(bool get_pick_with_alpha() const, clutter_texture_get_pick_with_alpha)
 
   // TODO: figure out what to do with this GError parameter
   //_WRAP_SIGNAL(void load_finished(GError* error), "load_finished")
diff --git a/codegen/extradefs/generate_extra_defs_clutter.cc b/codegen/extradefs/generate_extra_defs_clutter.cc
index 065d0c4..423198d 100644
--- a/codegen/extradefs/generate_extra_defs_clutter.cc
+++ b/codegen/extradefs/generate_extra_defs_clutter.cc
@@ -26,8 +26,6 @@ int main(int argc, char** argv)
 
   std::cout
     << get_defs(CLUTTER_TYPE_ACTOR)
-    << get_defs(CLUTTER_TYPE_ACTOR_META)
-    << get_defs(CLUTTER_TYPE_ACTION)
     << get_defs(CLUTTER_TYPE_ALPHA)
     << get_defs(CLUTTER_TYPE_ANIMATION)
     << get_defs(CLUTTER_TYPE_BACKEND)
@@ -44,7 +42,6 @@ int main(int argc, char** argv)
     << get_defs(CLUTTER_TYPE_CLONE)
     << get_defs(CLUTTER_TYPE_COLOR)
     << get_defs(CLUTTER_TYPE_CONTAINER)
-    << get_defs(CLUTTER_TYPE_EFFECT)
     << get_defs(CLUTTER_TYPE_EVENT)
 //    << get_defs(CLUTTER_TYPE_FIXED)
     << get_defs(CLUTTER_TYPE_GROUP)
diff --git a/configure.ac b/configure.ac
index c844ebd..8e1086a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
-AC_SUBST([CLUTTERMM_MODULES], ['clutter-1.0 >= 1.3.8 pangomm-1.4 >= 2.24 atkmm-1.6 >= 2.20'])
+AC_SUBST([CLUTTERMM_MODULES], ['clutter-1.0 >= 1.2.0 pangomm-1.4 >= 2.24'])
 PKG_CHECK_MODULES([CLUTTERMM], [$CLUTTERMM_MODULES])
 MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
 
@@ -51,7 +51,6 @@ MM_ARG_WITH_TAGFILE_DOC([libsigc++-2.0.tag], [sigc++-2.0])
 MM_ARG_WITH_TAGFILE_DOC([glibmm-2.4.tag], [glibmm-2.4])
 MM_ARG_WITH_TAGFILE_DOC([cairomm-1.0.tag], [cairomm-1.0])
 MM_ARG_WITH_TAGFILE_DOC([pangomm-1.4.tag], [pangomm-1.4])
-MM_ARG_WITH_TAGFILE_DOC([atkmm-1.6.tag], [atkmm-1.6])
 
 AC_LANG([C++])
 MM_ARG_ENABLE_WARNINGS([CLUTTERMM_WXXFLAGS],
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]