Class instantiation fixes.

[ruby-evas.git] / src / rb_text.c

diff --git a/src/rb_text.c b/src/rb_text.c
index 7788465613d31a6d1356da461e74d80dfa93fa7d..14b22fa0d69d608b79db5fd6ffaa4bbadd656793 100644 (file)
--- a/src/rb_text.c
+++ b/src/rb_text.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_text.c 49 2004-08-01 10:17:39Z tilman $
+ * $Id: rb_text.c 354 2006-02-10 18:14:08Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -26,29 +26,31 @@
 #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)
+/*
+ * call-seq:
+ *  Evas::Text.new(evas) => text
+ *
+ * Creates an Evas::Text object.
+ */
+static VALUE c_init (VALUE self, VALUE evas)
 {
-       VALUE self, argv[1];
-       RbEvasObject *text;
-
        CHECK_CLASS (evas, cEvas);
        GET_OBJ (evas, RbEvas, e);
+       GET_OBJ (self, RbEvasObject, text);
 
-       self = Data_Make_Struct (klass, RbEvasObject, c_evas_object_mark,
-                                c_free, text);
        text->real = evas_object_text_add (e->real);
 
-       argv[0] = evas;
-       rb_obj_call_init (self, 1, argv);
+       rb_call_super (1, &evas);
 
        return self;
 }
 
+/*
+ * call-seq:
+ *  text.font_source => string or nil
+ *
+ * Returns the font source of <i>text</i>.
+ */
 static VALUE c_font_source_get (VALUE self)
 {
        const char *tmp;
@@ -61,6 +63,12 @@ static VALUE c_font_source_get (VALUE self)
                return rb_str_new2 (tmp);
 }
 
+/*
+ * call-seq:
+ *  text.font_source(source)
+ *
+ * Sets the font source of <i>text</i>.
+ */
 static VALUE c_font_source_set (VALUE self, VALUE val)
 {
        GET_OBJ (self, RbEvasObject, e);
@@ -72,6 +80,15 @@ static VALUE c_font_source_set (VALUE self, VALUE val)
        return Qnil;
 }
 
+/*
+ * call-seq:
+ *  text.get_font => array
+ *
+ * Returns the font name and font size of <i>text</i>.
+ *
+ *  text.set_font("vera", 10) #=> nil
+ *  text_get_font             #=> ["vera", 10]
+ */
 static VALUE c_get_font (VALUE self)
 {
        char *font = NULL;
@@ -85,12 +102,20 @@ static VALUE c_get_font (VALUE self)
                            INT2FIX (size));
 }
 
+/*
+ * call-seq:
+ *  text.set_font(font, size) => nil
+ *
+ * Sets the font name and font size of <i>text</i>.
+ *
+ *  text.set_font("vera", 10) #=> nil
+ */
 static VALUE c_set_font (VALUE self, VALUE font, VALUE size)
 {
        GET_OBJ (self, RbEvasObject, e);
 
        Check_Type (font, T_STRING);
-       Check_Type (font, T_FIXNUM);
+       Check_Type (size, T_FIXNUM);
 
        evas_object_text_font_set (e->real, StringValuePtr (font),
                                   FIX2INT (size));
@@ -98,6 +123,12 @@ static VALUE c_set_font (VALUE self, VALUE font, VALUE size)
        return Qnil;
 }
 
+/*
+ * call-seq:
+ *  text.text => string
+ *
+ * Returns the text of <i>text</i>.
+ */
 static VALUE c_text_get (VALUE self)
 {
        const char *tmp;
@@ -110,6 +141,12 @@ static VALUE c_text_get (VALUE self)
                return rb_str_new2 (tmp);
 }
 
+/*
+ * call-seq:
+ *  text.text(string)
+ *
+ * Sets the text of <i>text</i>.
+ */
 static VALUE c_text_set (VALUE self, VALUE val)
 {
        GET_OBJ (self, RbEvasObject, e);
@@ -125,7 +162,7 @@ void Init_Text (void)
 {
        VALUE c = rb_define_class_under (mEvas, "Text", cEvasObject);
 
-       rb_define_singleton_method (c, "new", c_new, 1);
+       rb_define_method (c, "initialize", c_init, 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);