gnomemm r1869 - in cluttermm/trunk: . clutter/src

[daniel svn gnome org]

Author: daniel
Date: Tue Dec 16 19:24:51 2008
New Revision: 1869
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1869&view=rev

Log:
* clutter/src/alpha.{ccg,hg}: Temporarily disable the global
ALPHA_* function slots.  The code needs to be reworked as the
corresponding Clutter API has changed, and also because I don't
like it.
This removes the last obstacle to get cluttermm itself to build
again.  The examples still fail to compile, though.


Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/clutter/src/alpha.ccg
   cluttermm/trunk/clutter/src/alpha.hg

Modified: cluttermm/trunk/clutter/src/alpha.ccg
==============================================================================
--- cluttermm/trunk/clutter/src/alpha.ccg	(original)
+++ cluttermm/trunk/clutter/src/alpha.ccg	Tue Dec 16 19:24:51 2008
@@ -90,6 +90,7 @@
     return sigc::bind (sigc::ptr_fun(alpha_slot_proxy), func);
 }
 
+#if 0
 Alpha::SlotAlphaFunc ALPHA_RAMP_INC = generate_alpha_slot_proxy(CLUTTER_ALPHA_RAMP_INC);
 Alpha::SlotAlphaFunc ALPHA_RAMP_DEC = generate_alpha_slot_proxy(CLUTTER_ALPHA_RAMP_DEC);
 Alpha::SlotAlphaFunc ALPHA_RAMP = generate_alpha_slot_proxy(CLUTTER_ALPHA_RAMP);
@@ -102,6 +103,7 @@
 Alpha::SlotAlphaFunc ALPHA_SMOOTHSTEP_DEC = generate_alpha_slot_proxy(CLUTTER_ALPHA_SMOOTHSTEP_DEC);
 Alpha::SlotAlphaFunc ALPHA_EXP_INC = generate_alpha_slot_proxy(CLUTTER_ALPHA_EXP_INC);
 Alpha::SlotAlphaFunc ALPHA_EXP_DEC = generate_alpha_slot_proxy(CLUTTER_ALPHA_EXP_DEC);
+#endif
 
 } //namespace Clutter
 

Modified: cluttermm/trunk/clutter/src/alpha.hg
==============================================================================
--- cluttermm/trunk/clutter/src/alpha.hg	(original)
+++ cluttermm/trunk/clutter/src/alpha.hg	Tue Dec 16 19:24:51 2008
@@ -78,6 +78,7 @@
 /// @name Pre-defined Alpha functions
 /// @related Alpha
 /// @{
+#if 0
 extern Alpha::SlotAlphaFunc ALPHA_RAMP_INC;
 extern Alpha::SlotAlphaFunc ALPHA_RAMP_DEC;
 extern Alpha::SlotAlphaFunc ALPHA_RAMP;
@@ -90,6 +91,7 @@
 extern Alpha::SlotAlphaFunc ALPHA_SMOOTHSTEP_DEC;
 extern Alpha::SlotAlphaFunc ALPHA_EXP_INC;
 extern Alpha::SlotAlphaFunc ALPHA_EXP_DEC;
+#endif
 /// @}
 
 } // namespace Clutter