Class instantiation fixes.

[ruby-esmart.git] / src / esmart_container / rb_esmart_container.c

diff --git a/src/esmart_container/rb_esmart_container.c b/src/esmart_container/rb_esmart_container.c
index 3269c37091bbc8105b5013027a3feca5af5d3211..85b9fdc79f35d5d44a9803104edf1ebd24165212 100644 (file)
--- a/src/esmart_container/rb_esmart_container.c
+++ b/src/esmart_container/rb_esmart_container.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_esmart_container.c 286 2005-03-15 18:05:42Z tilman $
+ * $Id: rb_esmart_container.c 356 2006-02-10 18:27:31Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -45,22 +45,25 @@ static void c_free (RbContainer *e)
        free (e);
 }
 
-static VALUE c_new (VALUE klass, VALUE evas)
+static VALUE c_alloc (VALUE klass)
 {
-       VALUE self, argv[1];
-       RbContainer *cont;
+       RbContainer *cont = NULL;
 
+       return Data_Make_Struct (klass, RbContainer, c_mark,
+                                c_free, cont);
+}
+
+static VALUE c_init (VALUE self, VALUE evas)
+{
        CHECK_CLASS (evas, cEvas);
        GET_OBJ (evas, RbEvas, e);
+       GET_OBJ (self, RbContainer, cont);
 
-       self = Data_Make_Struct (klass, RbContainer, c_mark,
-                                c_free, cont);
        cont->real.real = esmart_container_new (e->real);
 
-       argv[0] = evas;
-       rb_obj_call_init (self, 1, argv);
+       rb_call_super (1, &evas);
 
-       rb_iv_set (self, "@elements", rb_ary_new ());
+       cont->elements = rb_ary_new ();
 
        return self;
 }
@@ -250,6 +253,28 @@ static VALUE c_scroll (VALUE self, VALUE val)
        return Qnil;
 }
 
+static VALUE c_scroll_percent_get (VALUE self)
+{
+       double val;
+
+       GET_OBJ (self, RbContainer, e);
+
+       val = esmart_container_scroll_percent_get (e->real.real);
+
+       return rb_float_new (val);
+}
+
+static VALUE c_scroll_percent_set (VALUE self, VALUE val)
+{
+       GET_OBJ (self, RbContainer, e);
+
+       Check_Type (val, T_FLOAT);
+
+       esmart_container_scroll_percent_set (e->real.real, NUM2DBL (val));
+
+       return Qnil;
+}
+
 void Init_esmart_container (void)
 {
        VALUE c;
@@ -258,7 +283,8 @@ void Init_esmart_container (void)
 
        c = rb_define_class_under (mEsmart, "Container", cEvasObject);
 
-       rb_define_singleton_method (c, "new", c_new, 1);
+       rb_define_alloc_func (c, c_alloc);
+       rb_define_method (c, "initialize", c_init, 1);
        rb_define_method (c, "direction", c_direction_get, 0);
        rb_define_method (c, "direction=", c_direction_set, 1);
        rb_define_method (c, "spacing", c_spacing_get, 0);
@@ -277,6 +303,8 @@ void Init_esmart_container (void)
        rb_define_method (c, "elements_orig_length",
                          c_elements_orig_length_get, 0);
        rb_define_method (c, "scroll", c_scroll, 1);
+       rb_define_method (c, "scroll_percent", c_scroll_percent_get, 0);
+       rb_define_method (c, "scroll_percent=", c_scroll_percent_set, 1);
 
        rb_define_const (c, "HORIZONTAL",
                         INT2FIX (CONTAINER_DIRECTION_HORIZONTAL));