projects
/
ruby-evas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We now use real structs to wrap objects.
[ruby-evas.git]
/
src
/
rb_image.c
diff --git
a/src/rb_image.c
b/src/rb_image.c
index 1f894dc917b0acefe751467f5a32b1013d34faa8..c5d58ec6a9938fcba53b2475b4c1822f05704852 100644
(file)
--- a/
src/rb_image.c
+++ b/
src/rb_image.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: rb_image.c
23 2004-06-26 22:55:31
Z tilman $
+ * $Id: rb_image.c
49 2004-08-01 10:17:39
Z tilman $
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
@@
-26,23
+26,22
@@
#include "rb_evas.h"
#include "rb_evas_object.h"
#include "rb_evas.h"
#include "rb_evas_object.h"
+static void c_free (RbEvasObject *e)
+{
+ c_evas_object_free (e, true);
+}
+
static VALUE c_new (VALUE klass, VALUE evas)
{
VALUE self, argv[1];
static VALUE c_new (VALUE klass, VALUE evas)
{
VALUE self, argv[1];
- Evas_Object **rect;
-
- if (!rb_obj_is_kind_of (evas, cEvas)) {
- rb_raise (rb_eTypeError,
- "wrong argument type %s (expected Evas)",
- rb_obj_classname (evas));
- return Qnil;
- }
+ RbEvasObject *img;
- GET_OBJ (evas, Evas, e, "Evas");
+ CHECK_CLASS (evas, cEvas);
+ GET_OBJ (evas, RbEvas, e);
- self = Data_Make_Struct (klass,
Evas_Object *
, c_evas_object_mark,
- c_
evas_object_free, rect
);
-
*rect = evas_object_image_add (*e
);
+ self = Data_Make_Struct (klass,
RbEvasObject
, c_evas_object_mark,
+ c_
free, img
);
+
img->real = evas_object_image_add (e->real
);
argv[0] = evas;
rb_obj_call_init (self, 1, argv);
argv[0] = evas;
rb_obj_call_init (self, 1, argv);
@@
-52,7
+51,7
@@
static VALUE c_new (VALUE klass, VALUE evas)
void Init_Image (void)
{
void Init_Image (void)
{
- VALUE c
Image
= rb_define_class_under (mEvas, "Image", cEvasObject);
+ VALUE c = rb_define_class_under (mEvas, "Image", cEvasObject);
- rb_define_singleton_method (c
Image
, "new", c_new, 1);
+ rb_define_singleton_method (c, "new", c_new, 1);
}
}