Fixed class instantiation.

[ruby-ecore.git] / src / ecore_x / rb_window.c

diff --git a/src/ecore_x/rb_window.c b/src/ecore_x/rb_window.c
index 6aca50968d09484e0f0b51572a125bd6f9343049..204d3014444db9e32a8d5972bc6dca4d32e48de5 100644 (file)
--- a/src/ecore_x/rb_window.c
+++ b/src/ecore_x/rb_window.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_window.c 111 2004-09-02 18:47:00Z tilman $
+ * $Id: rb_window.c 351 2006-02-10 15:25:40Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -60,14 +60,21 @@ VALUE TO_ECORE_X_WINDOW (VALUE parent, Ecore_X_Window w)
        return self;
 }
 
-static VALUE c_new (int argc, VALUE *argv, VALUE klass)
+static VALUE c_alloc (VALUE klass)
 {
-       VALUE self, parent, geom[4];
-       RbWindow *window = NULL, *p = NULL;
+       RbWindow *window = NULL;
+
+       return Data_Make_Struct (cWindow, RbWindow, c_mark, c_free, window);
+}
+
+static VALUE c_init (int argc, VALUE *argv, VALUE self)
+{
+       VALUE parent, geom[4];
+       RbWindow *p = NULL;
        int i, igeom[4] = {0, 0, 0, 0};
        Ecore_X_Window pwin = 0;
 
-       self = Data_Make_Struct (cWindow, RbWindow, c_mark, c_free, window);
+       GET_OBJ (self, RbWindow, win);
 
        rb_scan_args (argc, argv, "05",
                      &parent, &geom[0], &geom[1], &geom[2], &geom[3]);
@@ -84,17 +91,10 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
                        igeom[i] = FIX2INT (geom[i]);
                }
 
-       window->real = ecore_x_window_new (pwin, igeom[0], igeom[1],
-                                          igeom[2], igeom[3]);
-       window->parent = parent;
+       win->real = ecore_x_window_new (pwin, igeom[0], igeom[1],
+                                       igeom[2], igeom[3]);
+       win->parent = parent;
 
-       rb_obj_call_init (self, 0, NULL);
-
-       return self;
-}
-
-static VALUE c_init (int argc, VALUE *argv, VALUE self)
-{
        rb_iv_set (self, "@cursor", Qnil);
 
        return self;
@@ -330,6 +330,7 @@ static VALUE c_parent_get (VALUE self)
                                  ecore_x_window_parent_get (win->real));
 }
 
+#if 0
 static VALUE c_title_get (VALUE self)
 {
        char *s;
@@ -351,6 +352,7 @@ static VALUE c_title_set (VALUE self, VALUE val)
 
        return Qnil;
 }
+#endif
 
 static VALUE c_set_event_mask (VALUE self, VALUE val)
 {
@@ -374,6 +376,7 @@ static VALUE c_unset_event_mask (VALUE self, VALUE val)
        return Qnil;
 }
 
+#if 0
 static VALUE c_set_protocol (VALUE self, VALUE proto, VALUE on)
 {
        GET_OBJ (self, RbWindow, win);
@@ -386,6 +389,7 @@ static VALUE c_set_protocol (VALUE self, VALUE proto, VALUE on)
 
        return Qnil;
 }
+#endif
 
 static VALUE c_get_protocol (VALUE self, VALUE proto)
 {
@@ -398,6 +402,7 @@ static VALUE c_get_protocol (VALUE self, VALUE proto)
        return s ? Qtrue : Qfalse;
 }
 
+#if 0
 static VALUE c_sticky_get (VALUE self)
 {
        int s;
@@ -442,6 +447,7 @@ static VALUE c_borderless_set (VALUE self, VALUE val)
 
        return Qnil;
 }
+#endif
 
 static VALUE c_cursor_set (VALUE self, VALUE val)
 {
@@ -505,7 +511,7 @@ void Init_Window (void)
 {
        cWindow = rb_define_class_under (mX, "Window", rb_cObject);
 
-       rb_define_singleton_method (cWindow, "new", c_new, -1);
+       rb_define_alloc_func (cWindow, c_alloc);
        rb_define_method (cWindow, "initialize", c_init, -1);
        rb_define_method (cWindow, "inspect", c_inspect, 0);
        rb_define_method (cWindow, "eql?", c_equal_value, 1);
@@ -530,17 +536,23 @@ void Init_Window (void)
        rb_define_method (cWindow, "border_width=", c_border_width_set, 1);
        rb_define_method (cWindow, "depth", c_depth_get, 0);
        rb_define_method (cWindow, "parent", c_parent_get, 0);
+#if 0
        rb_define_method (cWindow, "title", c_title_get, 0);
        rb_define_method (cWindow, "title=", c_title_set, 1);
+#endif
        rb_define_method (cWindow, "set_event_mask", c_set_event_mask, 1);
        rb_define_method (cWindow, "unset_event_mask",
                          c_unset_event_mask, 1);
+#if 0
        rb_define_method (cWindow, "set_protocol", c_set_protocol, 2);
+#endif
        rb_define_method (cWindow, "get_protocol", c_get_protocol, 1);
+#if 0
        rb_define_method (cWindow, "sticky?", c_sticky_get, 0);
        rb_define_method (cWindow, "sticky=", c_sticky_set, 1);
        rb_define_method (cWindow, "borderless?", c_borderless_get, 0);
        rb_define_method (cWindow, "borderless=", c_borderless_set, 1);
+#endif
        rb_define_method (cWindow, "cursor=", c_cursor_set, 1);
        rb_define_method (cWindow, "manage", c_manage, 0);
        rb_define_method (cWindow, "manage_container", c_manage_container, 0);