Macro tweaks.

diff --git a/src/rb_edje.c b/src/rb_edje.c
index f47fbd801fac392680c44f776394ef5bcf323102..a8fe2212061746cd5dc8cfc1e1f0cb30ea33f7f7 100644 (file)
--- a/src/rb_edje.c
+++ b/src/rb_edje.c
@@ -1,5 +1,5 @@
 /*
 /*

- * $Id: rb_edje.c 31 2004-07-10 14:06:07Z tilman $
+ * $Id: rb_edje.c 37 2004-07-25 11:19:48Z tilman $

  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *


@@ -27,9 +27,9 @@
 #include "rb_edje_main.h"
 
 #define GET_OBJ(obj, type, o) \
 #include "rb_edje_main.h"
 
 #define GET_OBJ(obj, type, o) \

-       type **(o) = NULL; \
+       type *(o) = NULL; \

 \
 \

-       Data_Get_Struct ((obj), type *, (o)); \
+       Data_Get_Struct ((obj), type, (o)); \

 \
        if (!*(o)) { \
                rb_raise (rb_eException, \
 \
        if (!*(o)) { \
                rb_raise (rb_eException, \


@@ -51,7 +51,7 @@
                rb_raise (rb_eTypeError, \
                          "wrong argument type %s (expected %s)", \
                          rb_obj_classname ((val)), \
                rb_raise (rb_eTypeError, \
                          "wrong argument type %s (expected %s)", \
                          rb_obj_classname ((val)), \

-                         rb_obj_classname ((klass))); \
+                         rb_class2name ((klass))); \

                return Qnil; \
        }
 
                return Qnil; \
        }
 


@@ -68,7 +68,7 @@ static VALUE c_new (VALUE klass, VALUE evas)
        Evas_Object **edje;
 
        CHECK_CLASS (evas, cEvas);
        Evas_Object **edje;
 
        CHECK_CLASS (evas, cEvas);

-       GET_OBJ (evas, Evas, e);
+       GET_OBJ (evas, Evas *, e);

 
        edje_init ();
 
 
        edje_init ();
 


@@ -84,7 +84,7 @@ static VALUE c_new (VALUE klass, VALUE evas)
 
 static VALUE c_load (VALUE self, VALUE eet, VALUE group)
 {
 
 static VALUE c_load (VALUE self, VALUE eet, VALUE group)
 {

-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);

 
        Check_Type (eet, T_STRING);
        Check_Type (group, T_STRING);
 
        Check_Type (eet, T_STRING);
        Check_Type (group, T_STRING);


@@ -100,7 +100,7 @@ static VALUE c_get_size_min (VALUE self)
 {
        int w = 0, h = 0;
 
 {
        int w = 0, h = 0;
 

-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);

 
        edje_object_size_min_get (*e, &w, &h);
 
 
        edje_object_size_min_get (*e, &w, &h);
 


@@ -111,7 +111,7 @@ static VALUE c_get_size_max (VALUE self)
 {
        int w = 0, h = 0;
 
 {
        int w = 0, h = 0;
 

-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);

 
        edje_object_size_max_get (*e, &w, &h);
 
 
        edje_object_size_max_get (*e, &w, &h);
 


@@ -122,7 +122,7 @@ static VALUE c_part_exists_get (VALUE self, VALUE part)
 {
        int r;
 
 {
        int r;
 

-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);

 
        Check_Type (part, T_STRING);
 
 
        Check_Type (part, T_STRING);
 


@@ -133,12 +133,12 @@ static VALUE c_part_exists_get (VALUE self, VALUE part)
 
 static VALUE c_part_swallow (VALUE self, VALUE part, VALUE target)
 {
 
 static VALUE c_part_swallow (VALUE self, VALUE part, VALUE target)
 {

-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);

 
        Check_Type (part, T_STRING);
 
        CHECK_CLASS (target, cEvasObject);
 
        Check_Type (part, T_STRING);
 
        CHECK_CLASS (target, cEvasObject);

-       GET_OBJ (target, Evas_Object, target2);
+       GET_OBJ (target, Evas_Object *, target2);

 
        edje_object_part_swallow (*e, StringValuePtr (part), *target2);
 
 
        edje_object_part_swallow (*e, StringValuePtr (part), *target2);
 


@@ -147,10 +147,10 @@ static VALUE c_part_swallow (VALUE self, VALUE part, VALUE target)
 
 static VALUE c_part_unswallow (VALUE self, VALUE target)
 {
 
 static VALUE c_part_unswallow (VALUE self, VALUE target)
 {

-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);

 
        CHECK_CLASS (target, cEvasObject);
 
        CHECK_CLASS (target, cEvasObject);

-       GET_OBJ (target, Evas_Object, target2);
+       GET_OBJ (target, Evas_Object *, target2);

 
        edje_object_part_unswallow (*e, *target2);
 
 
        edje_object_part_unswallow (*e, *target2);
 


@@ -162,7 +162,7 @@ static VALUE c_get_part_swallow (VALUE self, VALUE part)
        Evas_Object *o;
        void *obj;
 
        Evas_Object *o;
        void *obj;
 

-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);

 
        Check_Type (part, T_STRING);
 
 
        Check_Type (part, T_STRING);
 


@@ -181,7 +181,7 @@ static VALUE c_get_part_text (VALUE self, VALUE part)
 {
        const char *s;
 
 {
        const char *s;
 

-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);

 
        Check_Type (part, T_STRING);
 
 
        Check_Type (part, T_STRING);
 


@@ -193,7 +193,7 @@ static VALUE c_get_part_text (VALUE self, VALUE part)
 
 static VALUE c_set_part_text (VALUE self, VALUE part, VALUE text)
 {
 
 static VALUE c_set_part_text (VALUE self, VALUE part, VALUE text)
 {

-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);

 
        Check_Type (part, T_STRING);
        Check_Type (text, T_STRING);
 
        Check_Type (part, T_STRING);
        Check_Type (text, T_STRING);


@@ -213,7 +213,7 @@ static void on_text_changed (void *data, Evas_Object *e,
 
 static VALUE c_on_text_changed (VALUE self)
 {
 
 static VALUE c_on_text_changed (VALUE self)
 {

-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);

 
        if (!rb_block_given_p ())
                return Qnil;
 
        if (!rb_block_given_p ())
                return Qnil;


@@ -226,7 +226,7 @@ static VALUE c_on_text_changed (VALUE self)
 
 static VALUE c_signal_emit (VALUE self, VALUE emission, VALUE source)
 {
 
 static VALUE c_signal_emit (VALUE self, VALUE emission, VALUE source)
 {

-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);

 
        Check_Type (emission, T_STRING);
        Check_Type (source, T_STRING);
 
        Check_Type (emission, T_STRING);
        Check_Type (source, T_STRING);


@@ -245,7 +245,7 @@ static void on_signal (void *data, Evas_Object *o,
 
 static VALUE c_on_signal (VALUE self, VALUE signal, VALUE src)
 {
 
 static VALUE c_on_signal (VALUE self, VALUE signal, VALUE src)
 {

-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);

 
        Check_Type (signal, T_STRING);
        Check_Type (src, T_STRING);
 
        Check_Type (signal, T_STRING);
        Check_Type (src, T_STRING);


@@ -262,14 +262,14 @@ static VALUE c_on_signal (VALUE self, VALUE signal, VALUE src)
 
 static VALUE c_play_get (VALUE self)
 {
 
 static VALUE c_play_get (VALUE self)
 {

-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);

 
        return edje_object_play_get (*e) ? Qtrue : Qfalse;
 }
 
 static VALUE c_play_set (VALUE self, VALUE val)
 {
 
        return edje_object_play_get (*e) ? Qtrue : Qfalse;
 }
 
 static VALUE c_play_set (VALUE self, VALUE val)
 {

-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);

 
        CHECK_BOOL(val);
 
 
        CHECK_BOOL(val);
 


@@ -280,14 +280,14 @@ static VALUE c_play_set (VALUE self, VALUE val)
 
 static VALUE c_animation_get (VALUE self)
 {
 
 static VALUE c_animation_get (VALUE self)
 {

-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);

 
        return edje_object_animation_get (*e) ? Qtrue : Qfalse;
 }
 
 static VALUE c_animation_set (VALUE self, VALUE val)
 {
 
        return edje_object_animation_get (*e) ? Qtrue : Qfalse;
 }
 
 static VALUE c_animation_set (VALUE self, VALUE val)
 {

-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);

 
        CHECK_BOOL(val);
 
 
        CHECK_BOOL(val);
 


@@ -298,23 +298,23 @@ static VALUE c_animation_set (VALUE self, VALUE val)
 
 void Init_Edje (void)
 {
 
 void Init_Edje (void)
 {

-       VALUE cEdje = rb_define_class_under (mEdje, "Edje", cEvasObject);
-
-       rb_define_singleton_method (cEdje, "new", c_new, 1);
-       rb_define_method (cEdje, "load", c_load, 2);
-       rb_define_method (cEdje, "get_size_min", c_get_size_min, 0);
-       rb_define_method (cEdje, "get_size_max", c_get_size_max, 0);
-       rb_define_method (cEdje, "part_exists?", c_part_exists_get, 1);
-       rb_define_method (cEdje, "part_swallow", c_part_swallow, 2);
-       rb_define_method (cEdje, "part_unswallow", c_part_unswallow, 1);
-       rb_define_method (cEdje, "get_part_swallow", c_get_part_swallow, 1);
-       rb_define_method (cEdje, "get_part_text", c_get_part_text, 1);
-       rb_define_method (cEdje, "set_part_text", c_set_part_text, 2);
-       rb_define_method (cEdje, "on_text_changed", c_on_text_changed, 0);
-       rb_define_method (cEdje, "signal_emit", c_signal_emit, 1);
-       rb_define_method (cEdje, "on_signal", c_on_signal, 2);
-       rb_define_method (cEdje, "play?", c_play_get, 0);
-       rb_define_method (cEdje, "play=", c_play_set, 1);
-       rb_define_method (cEdje, "animation?", c_animation_get, 0);
-       rb_define_method (cEdje, "animation=", c_animation_set, 1);
+       VALUE c = rb_define_class_under (mEdje, "Edje", cEvasObject);
+
+       rb_define_singleton_method (c, "new", c_new, 1);
+       rb_define_method (c, "load", c_load, 2);
+       rb_define_method (c, "get_size_min", c_get_size_min, 0);
+       rb_define_method (c, "get_size_max", c_get_size_max, 0);
+       rb_define_method (c, "part_exists?", c_part_exists_get, 1);
+       rb_define_method (c, "part_swallow", c_part_swallow, 2);
+       rb_define_method (c, "part_unswallow", c_part_unswallow, 1);
+       rb_define_method (c, "get_part_swallow", c_get_part_swallow, 1);
+       rb_define_method (c, "get_part_text", c_get_part_text, 1);
+       rb_define_method (c, "set_part_text", c_set_part_text, 2);
+       rb_define_method (c, "on_text_changed", c_on_text_changed, 0);
+       rb_define_method (c, "signal_emit", c_signal_emit, 1);
+       rb_define_method (c, "on_signal", c_on_signal, 2);
+       rb_define_method (c, "play?", c_play_get, 0);
+       rb_define_method (c, "play=", c_play_set, 1);
+       rb_define_method (c, "animation?", c_animation_get, 0);
+       rb_define_method (c, "animation=", c_animation_set, 1);

 }
 }