ecore_init and ecore_shutdown aren't exported anymore.

[ruby-ecore.git] / src / ecore_evas / rb_ecore_evas.c

diff --git a/src/ecore_evas/rb_ecore_evas.c b/src/ecore_evas/rb_ecore_evas.c
index 18ac0e02d00992bf0d81d9a89171718f6cb71590..b508339bf44cb1bf988ac743c9df18e5af197e95 100644 (file)
--- 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 25 2004-06-26 23:07:01Z tilman $
+ * $Id: rb_ecore_evas.c 27 2004-07-08 18:25:05Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -20,6 +20,7 @@
 
 #include <ruby.h>
 
+#include <Ecore.h>
 #include <Ecore_Evas.h>
 #include <rb_evas.h>
 
@@ -44,12 +45,19 @@
                return Qnil; \
        }
 
+static VALUE evases;
+
 /* called by the child classes */
 void c_ecore_evas_free (Ecore_Evas **ee)
 {
        if (*ee)
                ecore_evas_free (*ee);
 
+       rb_hash_aset (evases, INT2NUM ((long) ee), Qnil);
+
+       ecore_evas_shutdown ();
+       ecore_shutdown ();
+
        free (ee);
 }
 
@@ -59,7 +67,7 @@ static VALUE c_inspect (VALUE self)
 
        GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
-       snprintf (buf, sizeof (buf), "#<EcoreEvas:%p ptr=%p>",
+       snprintf (buf, sizeof (buf), "#<Ecore::Evas::EcoreEvas:%p ptr=%p>",
                  (void *) self, *ee);
 
        return rb_str_new2 (buf);
@@ -128,9 +136,16 @@ static VALUE c_layer_set (VALUE self, VALUE val)
 
 static VALUE c_evas (VALUE self)
 {
+       VALUE evas;
+
        GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
-       return TO_EVAS (self, ecore_evas_get (*ee));
+       if (NIL_P (evas = rb_hash_aref (evases, INT2NUM ((long) (ee))))) {
+               evas = TO_EVAS (self, ecore_evas_get (*ee));
+               rb_hash_aset (evases, INT2NUM ((long) ee), evas);
+       }
+
+       return evas;
 }
 
 static VALUE c_get_size_min (VALUE self)
@@ -343,4 +358,7 @@ void Init_EcoreEvas (void)
        rb_define_method (cEcoreEvas, "sticky=", c_sticky_set, 1);
        rb_define_method (cEcoreEvas, "rotation", c_rotation_get, 0);
        rb_define_method (cEcoreEvas, "rotation=", c_rotation_set, 1);
+
+       evases = rb_hash_new ();
+       rb_global_variable (&evases);
 }