reflexion 0.1.12 → 0.1.17

data/include/reflex/ruby/timer.h

@@ -0,0 +1,69 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_RUBY_TIMER_H__
+#define __REFLEX_RUBY_TIMER_H__
+
+
+#include <rucy/rucy.h>
+#include <rucy/class.h>
+#include <rucy/extension.h>
+#include <reflex/timer.h>
+
+
+namespace Reflex
+{
+
+
+	Rucy::Class timer_class ();
+	// class Reflex::Timer
+
+
+	template <typename T>
+	class RubyTimer : public Rucy::ClassWrapper<T>
+	{
+
+		typedef Rucy::ClassWrapper<T> Super;
+
+		public:
+
+			virtual void fire ()
+			{
+				if (this->value.is_kind_of(timer_class()))
+				{
+					RUCY_SYM(call_timer_block);
+					this->value.call(call_timer_block);
+				}
+
+				Super::fire();
+			}
+
+	};// RubyTimer
+
+
+}// Reflex
+
+
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::Timer)
+
+
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Reflex::Timer> ()
+	{
+		return Reflex::timer_class();
+	}
+
+	inline Value
+	value (Reflex::Timer::Ref& ref, Value klass = Reflex::timer_class())
+	{
+		return value(ref.get(), klass);
+	}
+
+
+}// Rucy
+
+
+#endif//EOH

data/include/reflex/ruby/view.h

@@ -23,59 +23,26 @@ namespace Reflex
 	class RubyView : public Rucy::ClassWrapper<T>
 	{
 
+		typedef Rucy::ClassWrapper<T> Super;
+
 		public:
 
-			RUCY_OVERRIDE_BEGIN(Rucy::ClassWrapper<T>)
-
-			RUCY_OVERRIDE_ID(content_size)
-			RUCY_OVERRIDE_ID(on_update)
-			RUCY_OVERRIDE_ID(on_draw)
-			RUCY_OVERRIDE_ID(on_move)
-			RUCY_OVERRIDE_ID(on_resize)
-			RUCY_OVERRIDE_ID(on_rotate)
-			RUCY_OVERRIDE_ID(on_scroll)
-			RUCY_OVERRIDE_ID(on_focus)
-			RUCY_OVERRIDE_ID(on_blur)
-			RUCY_OVERRIDE_ID(on_key)
-			RUCY_OVERRIDE_ID(on_key_down)
-			RUCY_OVERRIDE_ID(on_key_up)
-			RUCY_OVERRIDE_ID(on_pointer)
-			RUCY_OVERRIDE_ID(on_pointer_down)
-			RUCY_OVERRIDE_ID(on_pointer_up)
-			RUCY_OVERRIDE_ID(on_pointer_move)
-			RUCY_OVERRIDE_ID(on_wheel)
-			RUCY_OVERRIDE_ID(on_capture)
-			RUCY_OVERRIDE_ID(on_contact)
-			RUCY_OVERRIDE_ID(on_contact_begin)
-			RUCY_OVERRIDE_ID(on_contact_end)
-
-			RUCY_OVERRIDE_END
-
-			virtual Point content_size () const
+			virtual Bounds content_bounds () const
 			{
-				RUCY_SYM(content_size);
-				if (RUCY_IS_OVERRIDDEN(content_size))
+				RUCY_SYM(content_bounds);
+				if (this->is_overridable())
 				{
-					Rucy::Value ret = this->value.call(content_size);
-					return ret.is_nil() ? Super::content_size() : Rucy::to<Point>(ret);
+					Rucy::Value ret = this->value.call(content_bounds);
+					return ret.is_nil() ? Super::content_bounds() : Rucy::to<Bounds>(ret);
 				}
 				else
-					return Super::content_size();
-			}
-
-			virtual void make_body ()
-			{
-				RUCY_SYM(make_body);
-				if (RUCY_IS_OVERRIDABLE())
-					this->value.call(make_body);
-				else
-					Super::make_body();
+					return Super::content_bounds();
 			}
 
 			virtual void on_attach (Event* e)
 			{
 				RUCY_SYM(on_attach);
-				if (RUCY_IS_OVERRIDABLE())
+				if (this->is_overridable())
 					this->value.call(on_attach, Rucy::value(e));
 				else
 					Super::on_attach(e);
@@ -84,7 +51,7 @@ namespace Reflex
 			virtual void on_detach (Event* e)
 			{
 				RUCY_SYM(on_detach);
-				if (RUCY_IS_OVERRIDABLE())
+				if (this->is_overridable())
 					this->value.call(on_detach, Rucy::value(e));
 				else
 					Super::on_detach(e);
@@ -93,7 +60,7 @@ namespace Reflex
 			virtual void on_show (Event* e)
 			{
 				RUCY_SYM(on_show);
-				if (RUCY_IS_OVERRIDABLE())
+				if (this->is_overridable())
 					this->value.call(on_show, Rucy::value(e));
 				else
 					Super::on_show(e);
@@ -102,7 +69,7 @@ namespace Reflex
 			virtual void on_hide (Event* e)
 			{
 				RUCY_SYM(on_hide);
-				if (RUCY_IS_OVERRIDABLE())
+				if (this->is_overridable())
 					this->value.call(on_hide, Rucy::value(e));
 				else
 					Super::on_hide(e);
@@ -111,7 +78,7 @@ namespace Reflex
 			virtual void on_update (UpdateEvent* e)
 			{
 				RUCY_SYM(on_update);
-				if (RUCY_IS_OVERRIDDEN(on_update))
+				if (this->is_overridable())
 					this->value.call(on_update, Rucy::value(e));
 				else
 					Super::on_update(e);
@@ -120,7 +87,7 @@ namespace Reflex
 			virtual void on_draw (DrawEvent* e)
 			{
 				RUCY_SYM(on_draw);
-				if (RUCY_IS_OVERRIDDEN(on_draw))
+				if (this->is_overridable())
 					this->value.call(on_draw, Rucy::value(e));
 				else
 					Super::on_draw(e);
@@ -129,7 +96,7 @@ namespace Reflex
 			virtual void on_move (FrameEvent* e)
 			{
 				RUCY_SYM(on_move);
-				if (RUCY_IS_OVERRIDDEN(on_move))
+				if (this->is_overridable())
 					this->value.call(on_move, Rucy::value(e));
 				else
 					Super::on_move(e);
@@ -138,7 +105,7 @@ namespace Reflex
 			virtual void on_resize (FrameEvent* e)
 			{
 				RUCY_SYM(on_resize);
-				if (RUCY_IS_OVERRIDDEN(on_resize))
+				if (this->is_overridable())
 					this->value.call(on_resize, Rucy::value(e));
 				else
 					Super::on_resize(e);
@@ -147,7 +114,7 @@ namespace Reflex
 			virtual void on_rotate (FrameEvent* e)
 			{
 				RUCY_SYM(on_rotate);
-				if (RUCY_IS_OVERRIDDEN(on_rotate))
+				if (this->is_overridable())
 					this->value.call(on_rotate, Rucy::value(e));
 				else
 					Super::on_rotate(e);
@@ -156,7 +123,7 @@ namespace Reflex
 			virtual void on_scroll (ScrollEvent* e)
 			{
 				RUCY_SYM(on_scroll);
-				if (RUCY_IS_OVERRIDDEN(on_scroll))
+				if (this->is_overridable())
 					this->value.call(on_scroll, Rucy::value(e));
 				else
 					Super::on_scroll(e);
@@ -165,25 +132,16 @@ namespace Reflex
 			virtual void on_focus (FocusEvent* e)
 			{
 				RUCY_SYM(on_focus);
-				if (RUCY_IS_OVERRIDDEN(on_focus))
+				if (this->is_overridable())
 					this->value.call(on_focus, Rucy::value(e));
 				else
 					Super::on_focus(e);
 			}
 
-			virtual void on_blur (FocusEvent* e)
-			{
-				RUCY_SYM(on_blur);
-				if (RUCY_IS_OVERRIDDEN(on_blur))
-					this->value.call(on_blur, Rucy::value(e));
-				else
-					Super::on_blur(e);
-			}
-
 			virtual void on_key (KeyEvent* e)
 			{
 				RUCY_SYM(on_key);
-				if (RUCY_IS_OVERRIDDEN(on_key))
+				if (this->is_overridable())
 					this->value.call(on_key, Rucy::value(e));
 				else
 					Super::on_key(e);
@@ -192,7 +150,7 @@ namespace Reflex
 			virtual void on_key_down (KeyEvent* e)
 			{
 				RUCY_SYM(on_key_down);
-				if (RUCY_IS_OVERRIDDEN(on_key_down))
+				if (this->is_overridable())
 					this->value.call(on_key_down, Rucy::value(e));
 				else
 					Super::on_key_down(e);
@@ -201,7 +159,7 @@ namespace Reflex
 			virtual void on_key_up (KeyEvent* e)
 			{
 				RUCY_SYM(on_key_up);
-				if (RUCY_IS_OVERRIDDEN(on_key_up))
+				if (this->is_overridable())
 					this->value.call(on_key_up, Rucy::value(e));
 				else
 					Super::on_key_up(e);
@@ -210,7 +168,7 @@ namespace Reflex
 			virtual void on_pointer (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer);
-				if (RUCY_IS_OVERRIDDEN(on_pointer))
+				if (this->is_overridable())
 					this->value.call(on_pointer, Rucy::value(e));
 				else
 					Super::on_pointer(e);
@@ -219,7 +177,7 @@ namespace Reflex
 			virtual void on_pointer_down (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer_down);
-				if (RUCY_IS_OVERRIDDEN(on_pointer_down))
+				if (this->is_overridable())
 					this->value.call(on_pointer_down, Rucy::value(e));
 				else
 					Super::on_pointer_down(e);
@@ -228,7 +186,7 @@ namespace Reflex
 			virtual void on_pointer_up (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer_up);
-				if (RUCY_IS_OVERRIDDEN(on_pointer_up))
+				if (this->is_overridable())
 					this->value.call(on_pointer_up, Rucy::value(e));
 				else
 					Super::on_pointer_up(e);
@@ -237,7 +195,7 @@ namespace Reflex
 			virtual void on_pointer_move (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer_move);
-				if (RUCY_IS_OVERRIDDEN(on_pointer_move))
+				if (this->is_overridable())
 					this->value.call(on_pointer_move, Rucy::value(e));
 				else
 					Super::on_pointer_move(e);
@@ -246,7 +204,7 @@ namespace Reflex
 			virtual void on_wheel (WheelEvent* e)
 			{
 				RUCY_SYM(on_wheel);
-				if (RUCY_IS_OVERRIDDEN(on_wheel))
+				if (this->is_overridable())
 					this->value.call(on_wheel, Rucy::value(e));
 				else
 					Super::on_wheel(e);
@@ -255,16 +213,25 @@ namespace Reflex
 			virtual void on_capture (CaptureEvent* e)
 			{
 				RUCY_SYM(on_capture);
-				if (RUCY_IS_OVERRIDDEN(on_capture))
+				if (this->is_overridable())
 					this->value.call(on_capture, Rucy::value(e));
 				else
 					Super::on_capture(e);
 			}
 
+			virtual void on_timer (TimerEvent* e)
+			{
+				RUCY_SYM(on_timer);
+				if (this->is_overridable())
+					this->value.call(on_timer, Rucy::value(e));
+				else
+					Super::on_timer(e);
+			}
+
 			virtual void on_contact (ContactEvent* e)
 			{
-				RUCY_SYM(on_contact);
-				if (RUCY_IS_OVERRIDDEN(on_contact))
+				RUCY_SYM_B(on_contact);
+				if (this->is_overridable())
 					this->value.call(on_contact, Rucy::value(e));
 				else
 					Super::on_contact(e);
@@ -272,8 +239,8 @@ namespace Reflex
 
 			virtual void on_contact_begin (ContactEvent* e)
 			{
-				RUCY_SYM(on_contact_begin);
-				if (RUCY_IS_OVERRIDDEN(on_contact_begin))
+				RUCY_SYM_B(on_contact_begin);
+				if (this->is_overridable())
 					this->value.call(on_contact_begin, Rucy::value(e));
 				else
 					Super::on_contact_begin(e);
@@ -281,8 +248,8 @@ namespace Reflex
 
 			virtual void on_contact_end (ContactEvent* e)
 			{
-				RUCY_SYM(on_contact_end);
-				if (RUCY_IS_OVERRIDDEN(on_contact_end))
+				RUCY_SYM_B(on_contact_end);
+				if (this->is_overridable())
 					this->value.call(on_contact_end, Rucy::value(e));
 				else
 					Super::on_contact_end(e);

data/include/reflex/ruby/window.h

@@ -23,29 +23,14 @@ namespace Reflex
 	class RubyWindow : public Rucy::ClassWrapper<T>
 	{
 
-		public:
-
-			RUCY_OVERRIDE_BEGIN(Rucy::ClassWrapper<T>)
+		typedef Rucy::ClassWrapper<T> Super;
 
-			RUCY_OVERRIDE_ID(on_update)
-			RUCY_OVERRIDE_ID(on_draw)
-			RUCY_OVERRIDE_ID(on_move)
-			RUCY_OVERRIDE_ID(on_resize)
-			RUCY_OVERRIDE_ID(on_key)
-			RUCY_OVERRIDE_ID(on_key_down)
-			RUCY_OVERRIDE_ID(on_key_up)
-			RUCY_OVERRIDE_ID(on_pointer)
-			RUCY_OVERRIDE_ID(on_pointer_down)
-			RUCY_OVERRIDE_ID(on_pointer_up)
-			RUCY_OVERRIDE_ID(on_pointer_move)
-			RUCY_OVERRIDE_ID(on_wheel)
-
-			RUCY_OVERRIDE_END
+		public:
 
 			virtual void on_show (Event* e)
 			{
 				RUCY_SYM(on_show);
-				if (RUCY_IS_OVERRIDABLE())
+				if (this->is_overridable())
 					this->value.call(on_show, Rucy::value(e));
 				else
 					return Super::on_show(e);
@@ -54,7 +39,7 @@ namespace Reflex
 			virtual void on_hide (Event* e)
 			{
 				RUCY_SYM(on_hide);
-				if (RUCY_IS_OVERRIDABLE())
+				if (this->is_overridable())
 					this->value.call(on_hide, Rucy::value(e));
 				else
 					return Super::on_hide(e);
@@ -63,7 +48,7 @@ namespace Reflex
 			virtual void on_close (Event* e)
 			{
 				RUCY_SYM(on_close);
-				if (RUCY_IS_OVERRIDABLE())
+				if (this->is_overridable())
 					this->value.call(on_close, Rucy::value(e));
 				else
 					return Super::on_close(e);
@@ -72,7 +57,7 @@ namespace Reflex
 			virtual void on_update (UpdateEvent* e)
 			{
 				RUCY_SYM(on_update);
-				if (RUCY_IS_OVERRIDDEN(on_update))
+				if (this->is_overridable())
 					this->value.call(on_update, Rucy::value(e));
 				else
 					Super::on_update(e);
@@ -81,7 +66,7 @@ namespace Reflex
 			virtual void on_draw (DrawEvent* e)
 			{
 				RUCY_SYM(on_draw);
-				if (RUCY_IS_OVERRIDDEN(on_draw))
+				if (this->is_overridable())
 					this->value.call(on_draw, Rucy::value(e));
 				else
 					Super::on_draw(e);
@@ -90,7 +75,7 @@ namespace Reflex
 			virtual void on_move (FrameEvent* e)
 			{
 				RUCY_SYM(on_move);
-				if (RUCY_IS_OVERRIDDEN(on_move))
+				if (this->is_overridable())
 					this->value.call(on_move, Rucy::value(e));
 				else
 					Super::on_move(e);
@@ -99,7 +84,7 @@ namespace Reflex
 			virtual void on_resize (FrameEvent* e)
 			{
 				RUCY_SYM(on_resize);
-				if (RUCY_IS_OVERRIDDEN(on_resize))
+				if (this->is_overridable())
 					this->value.call(on_resize, Rucy::value(e));
 				else
 					Super::on_resize(e);
@@ -108,7 +93,7 @@ namespace Reflex
 			virtual void on_key (KeyEvent* e)
 			{
 				RUCY_SYM(on_key);
-				if (RUCY_IS_OVERRIDDEN(on_key))
+				if (this->is_overridable())
 					this->value.call(on_key, Rucy::value(e));
 				else
 					Super::on_key(e);
@@ -117,7 +102,7 @@ namespace Reflex
 			virtual void on_key_down (KeyEvent* e)
 			{
 				RUCY_SYM(on_key_down);
-				if (RUCY_IS_OVERRIDDEN(on_key_down))
+				if (this->is_overridable())
 					this->value.call(on_key_down, Rucy::value(e));
 				else
 					Super::on_key_down(e);
@@ -126,7 +111,7 @@ namespace Reflex
 			virtual void on_key_up (KeyEvent* e)
 			{
 				RUCY_SYM(on_key_up);
-				if (RUCY_IS_OVERRIDDEN(on_key_up))
+				if (this->is_overridable())
 					this->value.call(on_key_up, Rucy::value(e));
 				else
 					Super::on_key_up(e);
@@ -135,7 +120,7 @@ namespace Reflex
 			virtual void on_pointer (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer);
-				if (RUCY_IS_OVERRIDDEN(on_pointer))
+				if (this->is_overridable())
 					this->value.call(on_pointer, Rucy::value(e));
 				else
 					Super::on_pointer(e);
@@ -144,7 +129,7 @@ namespace Reflex
 			virtual void on_pointer_down (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer_down);
-				if (RUCY_IS_OVERRIDDEN(on_pointer_down))
+				if (this->is_overridable())
 					this->value.call(on_pointer_down, Rucy::value(e));
 				else
 					Super::on_pointer_down(e);
@@ -153,7 +138,7 @@ namespace Reflex
 			virtual void on_pointer_up (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer_up);
-				if (RUCY_IS_OVERRIDDEN(on_pointer_up))
+				if (this->is_overridable())
 					this->value.call(on_pointer_up, Rucy::value(e));
 				else
 					Super::on_pointer_up(e);
@@ -162,7 +147,7 @@ namespace Reflex
 			virtual void on_pointer_move (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer_move);
-				if (RUCY_IS_OVERRIDDEN(on_pointer_move))
+				if (this->is_overridable())
 					this->value.call(on_pointer_move, Rucy::value(e));
 				else
 					Super::on_pointer_move(e);
@@ -171,7 +156,7 @@ namespace Reflex
 			virtual void on_wheel (WheelEvent* e)
 			{
 				RUCY_SYM(on_wheel);
-				if (RUCY_IS_OVERRIDDEN(on_wheel))
+				if (this->is_overridable())
 					this->value.call(on_wheel, Rucy::value(e));
 				else
 					Super::on_wheel(e);