X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Frb_text.c;h=14b22fa0d69d608b79db5fd6ffaa4bbadd656793;hb=ff457c57c3ac469622c2fcd6bf9e66a55c1df678;hp=4224e9883180b4ea2a59a0d03322692a2b94f342;hpb=48ce7740aa5b73b1f58fbde3180f5f56d9022fcf;p=ruby-evas.git

diff --git a/src/rb_text.c b/src/rb_text.c
index 4224e98..14b22fa 100644
--- a/src/rb_text.c
+++ b/src/rb_text.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_text.c 38 2004-07-25 11:27:25Z tilman $
+ * $Id: rb_text.c 354 2006-02-10 18:14:08Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -26,92 +26,134 @@
 #include "rb_evas.h"
 #include "rb_evas_object.h"
 
-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];
-	Evas_Object **rect;
-
 	CHECK_CLASS (evas, cEvas);
-	GET_OBJ (evas, Evas *, e);
+	GET_OBJ (evas, RbEvas, e);
+	GET_OBJ (self, RbEvasObject, text);
 
-	self = Data_Make_Struct (klass, Evas_Object *, c_evas_object_mark,
-	                         c_evas_object_free, rect);
-	*rect = evas_object_text_add (*e);
+	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;
 
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	if (!(tmp = evas_object_text_font_source_get (*e)))
+	if (!(tmp = evas_object_text_font_source_get (e->real)))
 		return Qnil;
 	else
 		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, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
 	Check_Type (val, T_STRING);
 
-	evas_object_text_font_source_set (*e, StringValuePtr (val));
+	evas_object_text_font_source_set (e->real, StringValuePtr (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;
 	Evas_Font_Size size = 0;
 
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	evas_object_text_font_get (*e, &font, &size);
+	evas_object_text_font_get (e->real, &font, &size);
 
 	return rb_ary_new3 (2, font ? rb_str_new2 (font) : Qnil,
 	                    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, Evas_Object *, e);
+	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, StringValuePtr (font),
+	evas_object_text_font_set (e->real, StringValuePtr (font),
 	                           FIX2INT (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;
 
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	if (!(tmp = evas_object_text_text_get (*e)))
+	if (!(tmp = evas_object_text_text_get (e->real)))
 		return Qnil;
 	else
 		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, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
 	Check_Type (val, T_STRING);
 
-	evas_object_text_text_set (*e, StringValuePtr (val));
+	evas_object_text_text_set (e->real, StringValuePtr (val));
 
 	return Qnil;
 }
@@ -120,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);