Oops, STR2CSTR is obsolete, use StringValuePtr() instead.

[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 cf887c94bf6f57ef9bb914959d0654bc22180c3a..abf269dd2593921cbe8a48c1e12f2cf5b24b2915 100644 (file)
--- a/src/ecore_evas/rb_ecore_evas.c
+++ b/src/ecore_evas/rb_ecore_evas.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: rb_ecore_evas.c 14 2004-06-20 10:33:13Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -26,13 +26,13 @@
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
-#define GET_OBJ(obj, ee) \
-       Ecore_Evas **(ee) = NULL; \
+#define GET_OBJ(obj, type, o, desc) \
+       type **(o) = NULL; \
 \
-       Data_Get_Struct ((obj), Ecore_Evas *, (ee)); \
+       Data_Get_Struct ((obj), type *, (o)); \
 \
-       if (!*(ee)) { \
-               rb_raise (rb_eException, "EcoreEvas destroyed already"); \
+       if (!*(o)) { \
+               rb_raise (rb_eException, desc " destroyed already"); \
                return Qnil; \
        }
 
@@ -59,7 +59,7 @@ static VALUE c_init (int argc, VALUE argv, VALUE self)
 
 static VALUE c_show (VALUE self)
 {
-       GET_OBJ (self, ee);
+       GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
        ecore_evas_show (*ee);
 
@@ -68,7 +68,7 @@ static VALUE c_show (VALUE self)
 
 static VALUE c_hide (VALUE self)
 {
-       GET_OBJ (self, ee);
+       GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
        ecore_evas_hide (*ee);
 
@@ -77,21 +77,21 @@ static VALUE c_hide (VALUE self)
 
 static VALUE c_is_visible (VALUE self)
 {
-       GET_OBJ (self, ee);
+       GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
        return ecore_evas_visibility_get (*ee) ? Qtrue : Qfalse;
 }
 
 static VALUE c_evas (VALUE self)
 {
-       GET_OBJ (self, ee);
+       GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
        return TO_EVAS (self, ecore_evas_get (*ee));
 }
 
 static VALUE c_resize (VALUE self, VALUE w, VALUE h)
 {
-       GET_OBJ (self, ee);
+       GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
        Check_Type (w, T_FIXNUM);
        Check_Type (h, T_FIXNUM);
@@ -105,7 +105,7 @@ static VALUE c_title_get (VALUE self)
 {
        const char *tmp;
 
-       GET_OBJ (self, ee);
+       GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
        if (!(tmp = ecore_evas_title_get (*ee)))
                return Qnil;
@@ -115,25 +115,25 @@ static VALUE c_title_get (VALUE self)
 
 static VALUE c_title_set (VALUE self, VALUE val)
 {
-       GET_OBJ (self, ee);
+       GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
        Check_Type (val, T_STRING);
 
-       ecore_evas_title_set (*ee, STR2CSTR (val));
+       ecore_evas_title_set (*ee, StringValuePtr (val));
 
        return Qnil;
 }
 
 static VALUE c_borderless_get (VALUE self)
 {
-       GET_OBJ (self, ee);
+       GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
        return ecore_evas_borderless_get (*ee) ? Qtrue : Qfalse;
 }
 
 static VALUE c_borderless_set (VALUE self, VALUE val)
 {
-       GET_OBJ (self, ee);
+       GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
        /* make sure we're passed a boolean */
        if (TYPE (val) != T_TRUE && TYPE (val) != T_FALSE) {
@@ -150,7 +150,7 @@ static VALUE c_borderless_set (VALUE self, VALUE val)
 
 static VALUE c_delete (VALUE self)
 {
-       GET_OBJ (self, ee);
+       GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
        /* reap our children */
        rb_gc_start ();