X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore_evas%2Frb_ecore_evas.c;h=9b2ad29a2bd77a657f19c8c1a6b75dff4aaac389;hb=675f0103d4db84bcae4d83911afceb76c44d50f0;hp=07ec2b1bba809f204c4c2d723c775a60b938acea;hpb=d6477a98dd3bdd7eff030aaf64b68fa3bc08690a;p=ruby-ecore.git

diff --git a/src/ecore_evas/rb_ecore_evas.c b/src/ecore_evas/rb_ecore_evas.c
index 07ec2b1..9b2ad29 100644
--- a/src/ecore_evas/rb_ecore_evas.c
+++ b/src/ecore_evas/rb_ecore_evas.c
@@ -1,7 +1,7 @@
 /*
- * $Id: rb_ecore_evas.c 65 2004-08-12 19:37:37Z tilman $
+ * $Id: rb_ecore_evas.c 110 2004-09-02 17:06:54Z tilman $
  *
- * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
+ * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -30,12 +30,16 @@
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
+#define RUBY_ECORE_EVAS_KEY "__RB_ECORE_EVAS_KEY"
+
 #define CALLBACK_DEFINE_HANDLER(name) \
 	static void on_##name (Ecore_Evas *real) \
 	{ \
-		VALUE self = rb_hash_aref (objects, INT2NUM ((long) real)); \
+		VALUE self; \
 		VALUE 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)); \
@@ -56,7 +60,6 @@
 		return Qnil;
 
 VALUE cEcoreEvas;
-static VALUE objects;
 
 /* called by the child classes */
 void c_ecore_evas_mark (RbEcoreEvas *ee)
@@ -87,7 +90,7 @@ static VALUE c_init (int argc, VALUE *argv, VALUE self)
 	ee->evas = Qnil;
 	ee->callbacks = rb_hash_new ();
 
-	rb_hash_aset (objects, INT2NUM ((long) ee->real), self);
+	ecore_evas_data_set (ee->real, RUBY_ECORE_EVAS_KEY, (void *) self);
 
 	return Qnil;
 }
@@ -526,7 +529,6 @@ static VALUE c_delete (VALUE self)
 	rb_gc_start ();
 
 	ecore_evas_free (ee->real);
-	rb_hash_aset (objects, INT2NUM ((long) ee->real), Qnil);
 	ee->real = NULL;
 
 	return Qnil;
@@ -724,7 +726,4 @@ void Init_EcoreEvas (void)
 	rb_define_method (cEcoreEvas, "on_mouse_out", c_on_mouse_out, 0);
 	rb_define_method (cEcoreEvas, "on_pre_render", c_on_pre_render, 0);
 	rb_define_method (cEcoreEvas, "on_post_render", c_on_post_render, 0);
-
-	objects = rb_hash_new ();
-	rb_global_variable (&objects);
 }