X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore_evas%2Frb_ecore_evas.c;h=10cbdcb79781020b618a91877ba4dac3aa517e36;hb=3c4e4d849820f3b70c237ee2ef2ff33805b22ab6;hp=d5628362604cbd3f456abec765b3fa7bd1ccdbfa;hpb=089179a6b3860c1ab7a42f2d72f46815a54bee0a;p=ruby-ecore.git

diff --git a/src/ecore_evas/rb_ecore_evas.c b/src/ecore_evas/rb_ecore_evas.c
index d562836..10cbdcb 100644
--- a/src/ecore_evas/rb_ecore_evas.c
+++ b/src/ecore_evas/rb_ecore_evas.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_ecore_evas.c 346 2005-06-05 19:43:40Z tilman $
+ * $Id: rb_ecore_evas.c 371 2006-02-15 18:39:12Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -35,14 +35,14 @@
 #define CALLBACK_DEFINE_HANDLER(name) \
 	static void on_##name (Ecore_Evas *real) \
 	{ \
-		VALUE self; \
-		VALUE cb; \
+		VALUE self, cb; \
 \
 		self = (VALUE) ecore_evas_data_get (real, \
 		                                    RUBY_ECORE_EVAS_KEY); \
 		GET_OBJ (self, RbEcoreEvas, ee); \
 \
-		cb = rb_hash_aref (ee->callbacks, rb_str_new2 (#name)); \
+		cb = rb_hash_aref (ee->callbacks, \
+		                   LONG2NUM ((long) ecore_evas_callback_##name##_set)); \
 		rb_funcall (cb, rb_intern ("call"), 0); \
 	} \
 
@@ -55,7 +55,8 @@
 		if (NIL_P (ee->callbacks)) \
 			ee->callbacks = rb_hash_new (); \
 \
-		rb_hash_aset (ee->callbacks, rb_str_new2 (#name), \
+		rb_hash_aset (ee->callbacks, \
+		              LONG2NUM ((long) ecore_evas_callback_##name##_set), \
 		              rb_block_proc ()); \
 \
 		ecore_evas_callback_##name##_set (ee->real, on_##name); \
@@ -719,8 +720,6 @@ void Init_EcoreEvas (void)
 {
 	cEcoreEvas = rb_define_class_under (mEvas, "EcoreEvas", rb_cObject);
 
-	rb_define_private_method (rb_singleton_class (cEcoreEvas),
-	                          "new", NULL, 0);
 	rb_define_method (cEcoreEvas, "initialize", c_init, -1);
 	rb_define_method (cEcoreEvas, "inspect", c_inspect, 0);
 	rb_define_method (cEcoreEvas, "delete", c_delete, 0);