X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Frb_text.c;h=4224e9883180b4ea2a59a0d03322692a2b94f342;hb=1b56a6791ef0e24b38fb32678115fb83b174ef30;hp=dfb5cc7b1b90d5158177967f15b311ac79c57347;hpb=0ab509cfd10cd260793e7bd6d00ace66b8085962;p=ruby-evas.git diff --git a/src/rb_text.c b/src/rb_text.c index dfb5cc7..4224e98 100644 --- a/src/rb_text.c +++ b/src/rb_text.c @@ -1,5 +1,5 @@ /* - * $Id: rb_text.c 32 2004-07-10 14:07:49Z tilman $ + * $Id: rb_text.c 38 2004-07-25 11:27:25Z tilman $ * * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de) * @@ -31,8 +31,8 @@ static VALUE c_new (VALUE klass, VALUE evas) VALUE self, argv[1]; Evas_Object **rect; - CHECK_CLASS(evas, cEvas); - GET_OBJ (evas, Evas, e); + CHECK_CLASS (evas, cEvas); + GET_OBJ (evas, Evas *, e); self = Data_Make_Struct (klass, Evas_Object *, c_evas_object_mark, c_evas_object_free, rect); @@ -48,7 +48,7 @@ static VALUE c_font_source_get (VALUE self) { const char *tmp; - GET_OBJ (self, Evas_Object, e); + GET_OBJ (self, Evas_Object *, e); if (!(tmp = evas_object_text_font_source_get (*e))) return Qnil; @@ -58,7 +58,7 @@ static VALUE c_font_source_get (VALUE self) static VALUE c_font_source_set (VALUE self, VALUE val) { - GET_OBJ (self, Evas_Object, e); + GET_OBJ (self, Evas_Object *, e); Check_Type (val, T_STRING); @@ -72,7 +72,7 @@ static VALUE c_get_font (VALUE self) char *font = NULL; Evas_Font_Size size = 0; - GET_OBJ (self, Evas_Object, e); + GET_OBJ (self, Evas_Object *, e); evas_object_text_font_get (*e, &font, &size); @@ -82,7 +82,7 @@ static VALUE c_get_font (VALUE self) static VALUE c_set_font (VALUE self, VALUE font, VALUE size) { - GET_OBJ (self, Evas_Object, e); + GET_OBJ (self, Evas_Object *, e); Check_Type (font, T_STRING); Check_Type (font, T_FIXNUM); @@ -97,7 +97,7 @@ static VALUE c_text_get (VALUE self) { const char *tmp; - GET_OBJ (self, Evas_Object, e); + GET_OBJ (self, Evas_Object *, e); if (!(tmp = evas_object_text_text_get (*e))) return Qnil; @@ -107,7 +107,7 @@ static VALUE c_text_get (VALUE self) static VALUE c_text_set (VALUE self, VALUE val) { - GET_OBJ (self, Evas_Object, e); + GET_OBJ (self, Evas_Object *, e); Check_Type (val, T_STRING); @@ -118,13 +118,13 @@ static VALUE c_text_set (VALUE self, VALUE val) void Init_Text (void) { - VALUE cText = rb_define_class_under (mEvas, "Text", cEvasObject); - - rb_define_singleton_method (cText, "new", c_new, 1); - rb_define_method (cText, "font_source", c_font_source_get, 0); - rb_define_method (cText, "font_source=", c_font_source_set, 1); - rb_define_method (cText, "get_font", c_get_font, 0); - rb_define_method (cText, "set_font", c_set_font, 2); - rb_define_method (cText, "text", c_text_get, 0); - rb_define_method (cText, "text=", c_text_set, 1); + VALUE c = rb_define_class_under (mEvas, "Text", cEvasObject); + + rb_define_singleton_method (c, "new", c_new, 1); + rb_define_method (c, "font_source", c_font_source_get, 0); + rb_define_method (c, "font_source=", c_font_source_set, 1); + rb_define_method (c, "get_font", c_get_font, 0); + rb_define_method (c, "set_font", c_set_font, 2); + rb_define_method (c, "text", c_text_get, 0); + rb_define_method (c, "text=", c_text_set, 1); }