reflexion 0.1.23 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c9de459b494d9ab8e2e94e53a26b0fd9d363a1c66dd442894d0385827634849
-  data.tar.gz: 26858625a7e25d0cbba85d7a054ab9426c526997d0eb2ed704b125ee93ba436c
+  metadata.gz: 9c0f36ce2f27bdfc704cf1ad8546e18a9acf656ea8c18c16d58a6f50c2a0e037
+  data.tar.gz: f88574b6d37c6a3d6656b185c5ee61708d1c9b5b7492d44732d8774f0027d657
 SHA512:
-  metadata.gz: 6c0e16849f3de4b39cfe8270f8208b0e6e1f2cae808e3a678f4b79bad2d9a397f741e78474670350de327e54c91fe64f199f6b2dc437635950147a0f91610e5a
-  data.tar.gz: 2c38f9a17ec2a0d8a81f067b3326c0dca5bc970d86735ac503238eb458ac8ed8c452bc32042ee96f4a109e78742a8b3107d48237775e4090a08885905e378709
+  metadata.gz: 3bc258254bdb5348518da4a25017286cc9b4821008ff219a4e8c87286323e6a3a55c6888b979d1be76d617f9f468700f2d5f0cd65c6bb141734958f02656fac5
+  data.tar.gz: a3bdb07be95f500c100ee3d9dc98defee1d7274ec4ae7f807cfa98c3d15deab74f75dfefb0324c621a9b5f2c141b8a2bad2c886f68b9f68671101638e07c54c6

data/.doc/ext/reflex/capture_event.cpp

@@ -23,8 +23,9 @@ VALUE initialize(VALUE self, VALUE begin, VALUE end)
 {
 	CHECK;
 
-	THIS->begin = to<uint>(begin);
-	THIS->end   = to<uint>(end);
+	*THIS = Reflex::CaptureEvent(
+		to<uint>(begin),
+		to<uint>(end));
 
 	return rb_call_super(0, NULL);
 }
@@ -33,7 +34,7 @@ static
 VALUE initialize_copy(VALUE self, VALUE obj)
 {
 	CHECK;
-	*THIS = to<Reflex::CaptureEvent&>(obj);
+	*THIS = to<Reflex::CaptureEvent&>(obj).dup();
 	return self;
 }
 
@@ -41,14 +42,14 @@ static
 VALUE begin(VALUE self)
 {
 	CHECK;
-	return value(THIS->begin);
+	return value(THIS->begin());
 }
 
 static
 VALUE end(VALUE self)
 {
 	CHECK;
-	return value(THIS->end);
+	return value(THIS->end());
 }
 
 

data/.doc/ext/reflex/contact_event.cpp

@@ -3,6 +3,7 @@
 
 #include "reflex/ruby/shape.h"
 #include "reflex/ruby/view.h"
+#include "reflex/ruby/shape.h"
 #include "defs.h"
 
 
@@ -20,12 +21,13 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self, VALUE type, VALUE shape)
+VALUE initialize(VALUE self, VALUE action, VALUE shape)
 {
 	CHECK;
 
-	THIS->type  = (Reflex::ContactEvent::Type) to<int>(type);
-	THIS->shape = to<Reflex::Shape*>(shape);
+	*THIS = Reflex::ContactEvent(
+		(Reflex::ContactEvent::Action) to<uint>(action),
+		to<Reflex::Shape*>(shape));
 
 	return rb_call_super(0, NULL);
 }
@@ -34,29 +36,29 @@ static
 VALUE initialize_copy(VALUE self, VALUE obj)
 {
 	CHECK;
-	*THIS = to<Reflex::ContactEvent&>(obj);
+	*THIS = to<Reflex::ContactEvent&>(obj).dup();
 	return self;
 }
 
 static
-VALUE get_type(VALUE self)
+VALUE get_action(VALUE self)
 {
 	CHECK;
-	return value(THIS->type);
+	return value(THIS->action());
 }
 
 static
 VALUE get_shape(VALUE self)
 {
 	CHECK;
-	return value(THIS->shape);
+	return value(THIS->shape());
 }
 
 static
 VALUE get_view(VALUE self)
 {
 	CHECK;
-	return value(THIS->view);
+	return value(THIS->view());
 }
 
 
@@ -71,12 +73,12 @@ Init_contact_event ()
 	rb_define_alloc_func(cContactEvent, alloc);
 	rb_define_private_method(cContactEvent, "initialize", RUBY_METHOD_FUNC(initialize), 2);
 	rb_define_private_method(cContactEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
-	rb_define_method(cContactEvent, "type", RUBY_METHOD_FUNC(get_type), 0);
+	rb_define_method(cContactEvent, "action", RUBY_METHOD_FUNC(get_action), 0);
 	rb_define_method(cContactEvent, "shape", RUBY_METHOD_FUNC(get_shape), 0);
 	rb_define_method(cContactEvent, "view", RUBY_METHOD_FUNC(get_view), 0);
-	cContactEvent.define_const("TYPE_NONE",  Reflex::ContactEvent::NONE);
-	cContactEvent.define_const("TYPE_BEGIN", Reflex::ContactEvent::BEGIN);
-	cContactEvent.define_const("TYPE_END",   Reflex::ContactEvent::END);
+	cContactEvent.define_const("ACTION_NONE", Reflex::ContactEvent::ACTION_NONE);
+	cContactEvent.define_const("BEGIN",       Reflex::ContactEvent::BEGIN);
+	cContactEvent.define_const("END",         Reflex::ContactEvent::END);
 }
 
 

data/.doc/ext/reflex/draw_event.cpp

@@ -20,11 +20,13 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self, VALUE dt)
+VALUE initialize(VALUE self, VALUE dt, VALUE fps)
 {
 	CHECK;
 
-	THIS->dt = to<float>(dt);
+	*THIS = Reflex::DrawEvent(
+		to<float>(dt),
+		to<float>(fps));
 
 	return rb_call_super(0, NULL);
 }
@@ -33,7 +35,7 @@ static
 VALUE initialize_copy(VALUE self, VALUE obj)
 {
 	CHECK;
-	*THIS = to<Reflex::DrawEvent&>(obj);
+	*THIS = to<Reflex::DrawEvent&>(obj).dup();
 	return self;
 }
 
@@ -41,28 +43,28 @@ static
 VALUE painter(VALUE self)
 {
 	CHECK;
-	return value(THIS->painter);
+	return value(THIS->painter());
 }
 
 static
 VALUE bounds(VALUE self)
 {
 	CHECK;
-	return value(THIS->bounds);
+	return value(THIS->bounds());
 }
 
 static
 VALUE dt(VALUE self)
 {
 	CHECK;
-	return value(THIS->dt);
+	return value(THIS->dt());
 }
 
 static
 VALUE fps(VALUE self)
 {
 	CHECK;
-	return value(THIS->fps);
+	return value(THIS->fps());
 }
 
 
@@ -75,7 +77,7 @@ Init_draw_event ()
 
 	cDrawEvent = mReflex.define_class("DrawEvent", Reflex::event_class());
 	rb_define_alloc_func(cDrawEvent, alloc);
-	rb_define_private_method(cDrawEvent, "initialize", RUBY_METHOD_FUNC(initialize), 1);
+	rb_define_private_method(cDrawEvent, "initialize", RUBY_METHOD_FUNC(initialize), 2);
 	rb_define_private_method(cDrawEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cDrawEvent, "painter", RUBY_METHOD_FUNC(painter), 0);
 	rb_define_method(cDrawEvent, "bounds", RUBY_METHOD_FUNC(bounds), 0);

data/.doc/ext/reflex/event.cpp

@@ -1,6 +1,7 @@
 #include "reflex/ruby/event.h"
 
 
+#include "reflex/exception.h"
 #include "defs.h"
 
 
@@ -14,15 +15,7 @@ RUCY_DEFINE_VALUE_FROM_TO(Reflex::Event)
 static
 VALUE alloc(VALUE klass)
 {
-	return new_type<Reflex::Event>(klass);
-}
-
-static
-VALUE initialize_copy(VALUE self, VALUE obj)
-{
-	CHECK;
-	*THIS = to<Reflex::Event&>(obj);
-	return self;
+	Reflex::reflex_error(__FILE__, __LINE__, "can not instantiate Event class.");
 }
 
 static
@@ -56,7 +49,6 @@ Init_event ()
 
 	cEvent = rb_define_class_under(mReflex, "Event", rb_cObject);
 	rb_define_alloc_func(cEvent, alloc);
-	rb_define_private_method(cEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cEvent, "block", RUBY_METHOD_FUNC(block), 0);
 	cEvent.define_method("blocked?", is_blocked);
 	rb_define_method(cEvent, "time", RUBY_METHOD_FUNC(get_time), 0);

data/.doc/ext/reflex/focus_event.cpp

@@ -19,13 +19,14 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self, VALUE type, VALUE current, VALUE last)
+VALUE initialize(VALUE self, VALUE action, VALUE current, VALUE last)
 {
 	CHECK;
 
-	THIS->type    = (Reflex::FocusEvent::Type) to<uint>(type);
-	THIS->current = to<Reflex::View*>(current);
-	THIS->last    = to<Reflex::View*>(last);
+	*THIS = Reflex::FocusEvent(
+		(Reflex::FocusEvent::Action) to<uint>(action),
+		to<Reflex::View*>(current),
+		to<Reflex::View*>(last));
 
 	return rb_call_super(0, NULL);
 }
@@ -34,29 +35,29 @@ static
 VALUE initialize_copy(VALUE self, VALUE obj)
 {
 	CHECK;
-	*THIS = to<Reflex::FocusEvent&>(obj);
+	*THIS = to<Reflex::FocusEvent&>(obj).dup();
 	return self;
 }
 
 static
-VALUE get_type(VALUE self)
+VALUE get_action(VALUE self)
 {
 	CHECK;
-	return value(THIS->type);
+	return value(THIS->action());
 }
 
 static
 VALUE get_current(VALUE self)
 {
 	CHECK;
-	return THIS->current ? value(THIS->current) : nil();
+	return THIS->current() ? value(THIS->current()) : nil();
 }
 
 static
 VALUE get_last(VALUE self)
 {
 	CHECK;
-	return THIS->last ? value(THIS->last) : nil();
+	return THIS->last() ? value(THIS->last()) : nil();
 }
 
 
@@ -71,12 +72,12 @@ Init_focus_event ()
 	rb_define_alloc_func(cFocusEvent, alloc);
 	rb_define_private_method(cFocusEvent, "initialize", RUBY_METHOD_FUNC(initialize), 3);
 	rb_define_private_method(cFocusEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
-	rb_define_method(cFocusEvent, "type", RUBY_METHOD_FUNC(get_type), 0);
+	rb_define_method(cFocusEvent, "action", RUBY_METHOD_FUNC(get_action), 0);
 	rb_define_method(cFocusEvent, "current", RUBY_METHOD_FUNC(get_current), 0);
 	rb_define_method(cFocusEvent, "last", RUBY_METHOD_FUNC(get_last), 0);
-	cFocusEvent.define_const("TYPE_NONE",  Reflex::FocusEvent::NONE);
-	cFocusEvent.define_const("TYPE_FOCUS", Reflex::FocusEvent::FOCUS);
-	cFocusEvent.define_const("TYPE_BLUR",  Reflex::FocusEvent::BLUR);
+	cFocusEvent.define_const("ACTION_NONE", Reflex::FocusEvent::ACTION_NONE);
+	cFocusEvent.define_const("FOCUS",       Reflex::FocusEvent::FOCUS);
+	cFocusEvent.define_const("BLUR",        Reflex::FocusEvent::BLUR);
 }
 
 

data/.doc/ext/reflex/frame_event.cpp

@@ -20,15 +20,15 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self, VALUE frame, VALUE dx, VALUE dy, VALUE dwidth, VALUE dheight)
+VALUE initialize(VALUE self, VALUE frame, VALUE dx, VALUE dy, VALUE dwidth, VALUE dheight, VALUE angle, VALUE dangle)
 {
 	CHECK;
 
-	THIS->frame   = to<Rays::Bounds>(frame);
-	THIS->dx      = to<coord>(dx);
-	THIS->dy      = to<coord>(dy);
-	THIS->dwidth  = to<coord>(dwidth);
-	THIS->dheight = to<coord>(dheight);
+	*THIS = Reflex::FrameEvent(
+		to<Rays::Bounds>(frame),
+		to<coord>(dx),     to<coord>(dy),
+		to<coord>(dwidth), to<coord>(dheight),
+		to<float>(angle),  to<float>(dangle));
 
 	return rb_call_super(0, NULL);
 }
@@ -37,7 +37,7 @@ static
 VALUE initialize_copy(VALUE self, VALUE obj)
 {
 	CHECK;
-	*THIS = to<Reflex::FrameEvent&>(obj);
+	*THIS = to<Reflex::FrameEvent&>(obj).dup();
 	return self;
 }
 
@@ -45,63 +45,63 @@ static
 VALUE frame(VALUE self)
 {
 	CHECK;
-	return value(THIS->frame);
+	return value(THIS->frame());
 }
 
 static
 VALUE dx(VALUE self)
 {
 	CHECK;
-	return value(THIS->dx);
+	return value(THIS->dx());
 }
 
 static
 VALUE dy(VALUE self)
 {
 	CHECK;
-	return value(THIS->dy);
+	return value(THIS->dy());
 }
 
 static
 VALUE dwidth(VALUE self)
 {
 	CHECK;
-	return value(THIS->dwidth);
+	return value(THIS->dwidth());
 }
 
 static
 VALUE dheight(VALUE self)
 {
 	CHECK;
-	return value(THIS->dheight);
+	return value(THIS->dheight());
 }
 
 static
 VALUE dposition(VALUE self)
 {
 	CHECK;
-	return value(Rays::Point(THIS->dx, THIS->dy));
+	return value(Rays::Point(THIS->dx(), THIS->dy()));
 }
 
 static
 VALUE dsize(VALUE self)
 {
 	CHECK;
-	return value(Rays::Point(THIS->dw, THIS->dh));
+	return value(Rays::Point(THIS->dwidth(), THIS->dheight()));
 }
 
 static
 VALUE angle(VALUE self)
 {
 	CHECK;
-	return value(THIS->angle);
+	return value(THIS->angle());
 }
 
 static
 VALUE dangle(VALUE self)
 {
 	CHECK;
-	return value(THIS->dangle);
+	return value(THIS->dangle());
 }
 
 static
@@ -135,7 +135,7 @@ Init_frame_event ()
 
 	cFrameEvent = mReflex.define_class("FrameEvent", Reflex::event_class());
 	rb_define_alloc_func(cFrameEvent, alloc);
-	rb_define_private_method(cFrameEvent, "initialize", RUBY_METHOD_FUNC(initialize), 5);
+	rb_define_private_method(cFrameEvent, "initialize", RUBY_METHOD_FUNC(initialize), 7);
 	rb_define_private_method(cFrameEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cFrameEvent, "frame", RUBY_METHOD_FUNC(frame), 0);
 	rb_define_method(cFrameEvent, "dx", RUBY_METHOD_FUNC(dx), 0);

data/.doc/ext/reflex/key_event.cpp

@@ -18,15 +18,16 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self, VALUE type, VALUE chars, VALUE code, VALUE repeat, VALUE modifiers)
+VALUE initialize(VALUE self, VALUE action, VALUE chars, VALUE code, VALUE modifiers, VALUE repeat)
 {
 	CHECK;
 
-	THIS->type      = (Reflex::KeyEvent::Type) to<int>(type);
-	THIS->chars     = chars.c_str();
-	THIS->code      = to<int>(code);
-	THIS->repeat    = to<int>(repeat);
-	THIS->modifiers = to<uint>(modifiers);
+	*THIS = Reflex::KeyEvent(
+		(Reflex::KeyEvent::Action) to<uint>(action),
+		chars.c_str(),
+		to<int>(code),
+		to<uint>(modifiers),
+		to<int>(repeat));
 
 	return rb_call_super(0, NULL);
 }
@@ -35,22 +36,22 @@ static
 VALUE initialize_copy(VALUE self, VALUE obj)
 {
 	CHECK;
-	*THIS = to<Reflex::KeyEvent&>(obj);
+	*THIS = to<Reflex::KeyEvent&>(obj).dup();
 	return self;
 }
 
 static
-VALUE get_type(VALUE self)
+VALUE get_action(VALUE self)
 {
 	CHECK;
-	return value(THIS->type);
+	return value(THIS->action());
 }
 
 static
 VALUE get_key(VALUE self)
 {
 	CHECK;
-	switch (THIS->code)
+	switch (THIS->code())
 	{
 		#define CASE(key)         case Reflex::KEY_##key
 		#define SYMBOL1(name)     SYMBOL2(_##name, #name)
@@ -247,35 +248,35 @@ static
 VALUE get_chars(VALUE self)
 {
 	CHECK;
-	return value(THIS->chars.c_str());
+	return value(THIS->chars());
 }
 
 static
 VALUE get_code(VALUE self)
 {
 	CHECK;
-	return value(THIS->code);
+	return value(THIS->code());
 }
 
 static
 VALUE get_modifiers(VALUE self)
 {
 	CHECK;
-	return value(THIS->modifiers);
+	return value(THIS->modifiers());
 }
 
 static
 VALUE get_repeat(VALUE self)
 {
 	CHECK;
-	return value(THIS->repeat);
+	return value(THIS->repeat());
 }
 
 static
 VALUE is_captured(VALUE self)
 {
 	CHECK;
-	return value(THIS->captured);
+	return value(THIS->is_captured());
 }
 
 
@@ -290,16 +291,16 @@ Init_key_event ()
 	rb_define_alloc_func(cKeyEvent, alloc);
 	rb_define_private_method(cKeyEvent, "initialize", RUBY_METHOD_FUNC(initialize), 5);
 	rb_define_private_method(cKeyEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
-	rb_define_method(cKeyEvent, "type", RUBY_METHOD_FUNC(get_type), 0);
+	rb_define_method(cKeyEvent, "action", RUBY_METHOD_FUNC(get_action), 0);
 	rb_define_method(cKeyEvent, "key", RUBY_METHOD_FUNC(get_key), 0);
 	rb_define_method(cKeyEvent, "chars", RUBY_METHOD_FUNC(get_chars), 0);
 	rb_define_method(cKeyEvent, "code", RUBY_METHOD_FUNC(get_code), 0);
 	rb_define_method(cKeyEvent, "modifiers", RUBY_METHOD_FUNC(get_modifiers), 0);
 	rb_define_method(cKeyEvent, "repeat", RUBY_METHOD_FUNC(get_repeat), 0);
 	cKeyEvent.define_method("captured?", is_captured);
-	cKeyEvent.define_const("TYPE_NONE", Reflex::KeyEvent::NONE);
-	cKeyEvent.define_const("TYPE_DOWN", Reflex::KeyEvent::DOWN);
-	cKeyEvent.define_const("TYPE_UP",   Reflex::KeyEvent::UP);
+	cKeyEvent.define_const("ACTION_NONE", Reflex::KeyEvent::ACTION_NONE);
+	cKeyEvent.define_const("DOWN",        Reflex::KeyEvent::DOWN);
+	cKeyEvent.define_const("UP",          Reflex::KeyEvent::UP);
 }
 
 

data/.doc/ext/reflex/pointer_event.cpp

@@ -41,7 +41,7 @@ static
 VALUE initialize_copy(VALUE self, VALUE obj)
 {
 	CHECK;
-	*THIS = to<Reflex::PointerEvent&>(obj);
+	*THIS = to<Reflex::PointerEvent&>(obj).dup();
 	return self;
 }
 

data/.doc/ext/reflex/scroll_event.cpp

@@ -23,12 +23,9 @@ VALUE initialize(VALUE self, VALUE x, VALUE y, VALUE z, VALUE dx, VALUE dy, VALU
 {
 	CHECK;
 
-	THIS->x  = to<coord>(x);
-	THIS->y  = to<coord>(y);
-	THIS->z  = to<coord>(z);
-	THIS->dx = to<coord>(dx);
-	THIS->dy = to<coord>(dy);
-	THIS->dz = to<coord>(dz);
+	*THIS = Reflex::ScrollEvent(
+		to<coord>( x), to<coord>( y), to<coord>( z),
+		to<coord>(dx), to<coord>(dy), to<coord>(dz));
 
 	return rb_call_super(0, NULL);
 }
@@ -37,7 +34,7 @@ static
 VALUE initialize_copy(VALUE self, VALUE obj)
 {
 	CHECK;
-	*THIS = to<Reflex::ScrollEvent&>(obj);
+	*THIS = to<Reflex::ScrollEvent&>(obj).dup();
 	return self;
 }
 
@@ -45,56 +42,56 @@ static
 VALUE x(VALUE self)
 {
 	CHECK;
-	return value(THIS->x);
+	return value(THIS->scroll().x);
 }
 
 static
 VALUE y(VALUE self)
 {
 	CHECK;
-	return value(THIS->y);
+	return value(THIS->scroll().y);
 }
 
 static
 VALUE z(VALUE self)
 {
 	CHECK;
-	return value(THIS->z);
+	return value(THIS->scroll().z);
 }
 
 static
 VALUE dx(VALUE self)
 {
 	CHECK;
-	return value(THIS->dx);
+	return value(THIS->dscroll().x);
 }
 
 static
 VALUE dy(VALUE self)
 {
 	CHECK;
-	return value(THIS->dy);
+	return value(THIS->dscroll().y);
 }
 
 static
 VALUE dz(VALUE self)
 {
 	CHECK;
-	return value(THIS->dz);
+	return value(THIS->dscroll().z);
 }
 
 static
 VALUE scroll(VALUE self)
 {
 	CHECK;
-	return value(Rays::Point(THIS->x, THIS->y, THIS->z));
+	return value(THIS->scroll());
 }
 
 static
-VALUE delta(VALUE self)
+VALUE dscroll(VALUE self)
 {
 	CHECK;
-	return value(Rays::Point(THIS->dx, THIS->dy, THIS->dz));
+	return value(THIS->dscroll());
 }
 
 
@@ -116,7 +113,7 @@ Init_scroll_event ()
 	rb_define_method(cScrollEvent, "dy", RUBY_METHOD_FUNC(dy), 0);
 	rb_define_method(cScrollEvent, "dz", RUBY_METHOD_FUNC(dz), 0);
 	rb_define_method(cScrollEvent, "scroll", RUBY_METHOD_FUNC(scroll), 0);
-	rb_define_method(cScrollEvent, "delta", RUBY_METHOD_FUNC(delta), 0);
+	rb_define_method(cScrollEvent, "dscroll", RUBY_METHOD_FUNC(dscroll), 0);
 }
 
 

data/.doc/ext/reflex/timer.cpp

@@ -1,6 +1,7 @@
 #include "reflex/ruby/timer.h"
 
 
+#include "reflex/exception.h"
 #include "reflex/ruby/view.h"
 #include "reflex/ruby/selector.h"
 #include "defs.h"
@@ -16,6 +17,12 @@ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Timer)
 #define CALL(fun) RUCY_CALL_SUPER(THIS, fun)
 
 
+static
+VALUE alloc(VALUE klass)
+{
+	Reflex::reflex_error(__FILE__, __LINE__, "can not instantiate Timer class.");
+}
+
 static
 VALUE stop(VALUE self)
 {
@@ -75,13 +82,14 @@ Init_timer ()
 	Module mReflex = rb_define_module("Reflex");
 
 	cTimer = rb_define_class_under(mReflex, "Timer", rb_cObject);
+	rb_define_alloc_func(cTimer, alloc);
 	rb_define_method(cTimer, "stop", RUBY_METHOD_FUNC(stop), 0);
 	rb_define_method(cTimer, "owner", RUBY_METHOD_FUNC(get_owner), 0);
 	rb_define_method(cTimer, "id", RUBY_METHOD_FUNC(get_id), 0);
 	rb_define_method(cTimer, "interval", RUBY_METHOD_FUNC(get_interval), 0);
 	rb_define_method(cTimer, "count=", RUBY_METHOD_FUNC(set_count), 1);
 	rb_define_method(cTimer, "count", RUBY_METHOD_FUNC(get_count), 0);
-	cTimer.define_method("finish?", is_finished);
+	cTimer.define_method("finished?", is_finished);
 
 	define_selector_methods<Reflex::Timer>(cTimer);
 }