include/reflex/ruby/view.h in reflexion-0.1.8 vs include/reflex/ruby/view.h in reflexion-0.1.9

@@ -30,10 +30,11 @@
 			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)
@@ -42,10 +43,13 @@
 			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
 			{
@@ -60,35 +64,50 @@
 			}
 
 			virtual void make_body ()
 			{
 				RUCY_SYM(make_body);
-				this->value.call(make_body);
+				if (RUCY_IS_OVERRIDABLE())
+					this->value.call(make_body);
+				else
+					Super::make_body();
 			}
 
 			virtual void on_attach (Event* e)
 			{
 				RUCY_SYM(on_attach);
-				this->value.call(on_attach, Rucy::value(e));
+				if (RUCY_IS_OVERRIDABLE())
+					this->value.call(on_attach, Rucy::value(e));
+				else
+					Super::on_attach(e);
 			}
 
 			virtual void on_detach (Event* e)
 			{
 				RUCY_SYM(on_detach);
-				this->value.call(on_detach, Rucy::value(e));
+				if (RUCY_IS_OVERRIDABLE())
+					this->value.call(on_detach, Rucy::value(e));
+				else
+					Super::on_detach(e);
 			}
 
 			virtual void on_show (Event* e)
 			{
 				RUCY_SYM(on_show);
-				this->value.call(on_show, Rucy::value(e));
+				if (RUCY_IS_OVERRIDABLE())
+					this->value.call(on_show, Rucy::value(e));
+				else
+					Super::on_show(e);
 			}
 
 			virtual void on_hide (Event* e)
 			{
 				RUCY_SYM(on_hide);
-				this->value.call(on_hide, Rucy::value(e));
+				if (RUCY_IS_OVERRIDABLE())
+					this->value.call(on_hide, Rucy::value(e));
+				else
+					Super::on_hide(e);
 			}
 
 			virtual void on_update (UpdateEvent* e)
 			{
 				RUCY_SYM(on_update);
@@ -123,10 +142,19 @@
 					this->value.call(on_resize, Rucy::value(e));
 				else
 					Super::on_resize(e);
 			}
 
+			virtual void on_rotate (FrameEvent* e)
+			{
+				RUCY_SYM(on_rotate);
+				if (RUCY_IS_OVERRIDDEN(on_rotate))
+					this->value.call(on_rotate, Rucy::value(e));
+				else
+					Super::on_rotate(e);
+			}
+
 			virtual void on_scroll (ScrollEvent* e)
 			{
 				RUCY_SYM(on_scroll);
 				if (RUCY_IS_OVERRIDDEN(on_scroll))
 					this->value.call(on_scroll, Rucy::value(e));
@@ -229,9 +257,36 @@
 				RUCY_SYM(on_capture);
 				if (RUCY_IS_OVERRIDDEN(on_capture))
 					this->value.call(on_capture, Rucy::value(e));
 				else
 					Super::on_capture(e);
+			}
+
+			virtual void on_contact (ContactEvent* e)
+			{
+				RUCY_SYM(on_contact);
+				if (RUCY_IS_OVERRIDDEN(on_contact))
+					this->value.call(on_contact, Rucy::value(e));
+				else
+					Super::on_contact(e);
+			}
+
+			virtual void on_contact_begin (ContactEvent* e)
+			{
+				RUCY_SYM(on_contact_begin);
+				if (RUCY_IS_OVERRIDDEN(on_contact_begin))
+					this->value.call(on_contact_begin, Rucy::value(e));
+				else
+					Super::on_contact_begin(e);
+			}
+
+			virtual void on_contact_end (ContactEvent* e)
+			{
+				RUCY_SYM(on_contact_end);
+				if (RUCY_IS_OVERRIDDEN(on_contact_end))
+					this->value.call(on_contact_end, Rucy::value(e));
+				else
+					Super::on_contact_end(e);
 			}
 
 	};// RubyView