From 6c769aac08caf234bbff82cca822d8f209283bbe Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Thu, 16 Feb 2006 20:39:55 +0000
Subject: [PATCH] Reworked ADD_EVENT() wrt handling of the inherited method.

In that macro, we now remove Ecore#EventHandler.inherited temporarily
when defining C event classes rather than overriding the method.
---
 src/ecore/rb_event_handler.c | 7 +------
 src/ecore/rb_event_handler.h | 6 ++----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/ecore/rb_event_handler.c b/src/ecore/rb_event_handler.c
index 4dd45ce..18e2fc7 100644
--- a/src/ecore/rb_event_handler.c
+++ b/src/ecore/rb_event_handler.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_event_handler.c 367 2006-02-14 22:20:14Z tilman $
+ * $Id: rb_event_handler.c 372 2006-02-16 20:39:55Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -196,11 +196,6 @@ static VALUE c_ev_init (int argc, VALUE *argv, VALUE self)
 	return self;
 }
 
-VALUE c_ev_inherited_noop (VALUE klass, VALUE child)
-{
-	return Qnil;
-}
-
 static void free_ruby_event (void *data, void *event)
 {
 	/* do nothing */
diff --git a/src/ecore/rb_event_handler.h b/src/ecore/rb_event_handler.h
index b9d56a8..34df332 100644
--- a/src/ecore/rb_event_handler.h
+++ b/src/ecore/rb_event_handler.h
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_event_handler.h 365 2006-02-14 21:50:47Z tilman $
+ * $Id: rb_event_handler.h 372 2006-02-16 20:39:55Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -22,8 +22,7 @@
 #define __RB_EVENT_HANDLER_H
 
 #define ADD_EVENT(mod, constname, clsname, obj) \
-	rb_define_singleton_method (cEcoreEvent, "inherited", \
-	                            c_ev_inherited_noop, 1); \
+	rb_remove_method (rb_singleton_class (cEcoreEvent), "inherited"); \
 \
 	(obj) = rb_define_class_under ((mod), (clsname), cEcoreEvent); \
 	rb_define_private_method (rb_singleton_class ((obj)), \
@@ -36,7 +35,6 @@
 void Init_EventHandler (void);
 
 VALUE c_ev_inherited (VALUE klass, VALUE child);
-VALUE c_ev_inherited_noop (VALUE klass, VALUE child);
 
 #ifndef __RB_EVENT_HANDLER_C
 extern VALUE event_classes, cEcoreEvent;
-- 
2.30.2