ext/wxRect.cpp in rwx-0.0.1.dev vs ext/wxRect.cpp in rwx-0.0.1.1.dev

@@ -219,11 +219,18 @@
 DLL_LOCAL void Init_WXRect(VALUE rb_mWX)
 {
 
 #if 0
 	rb_mWX = rb_define_module("WX");
+#endif
 
+	using namespace RubyWX::Rect;
+	rb_cWXRect = rb_define_class_under(rb_mWX,"Rect",rb_cObject);
+
+	rb_define_alloc_func(rb_cWXRect,_alloc);
+
+#if 0
 	rb_define_attr(rb_cWXRect,"x",1,1);
 	rb_define_attr(rb_cWXRect,"y",1,1);
 	rb_define_attr(rb_cWXRect,"width",1,1);
 	rb_define_attr(rb_cWXRect,"height",1,1);
 
@@ -237,18 +244,12 @@
 
 	rb_define_attr(rb_cWXRect,"top_left",1,1);
 	rb_define_attr(rb_cWXRect,"top_right",1,1);
 	rb_define_attr(rb_cWXRect,"bottom_left",1,1);
 	rb_define_attr(rb_cWXRect,"bottom_right",1,1);
-
 #endif
 
-	using namespace RubyWX::Rect;
-	rb_cWXRect = rb_define_class_under(rb_mWX,"Rect",rb_cObject);
-
-	rb_define_alloc_func(rb_cWXRect,_alloc);
-
 	rb_define_method(rb_cWXRect,"initialize",RUBY_METHOD_FUNC(_initialize),4);
 	rb_define_private_method(rb_cWXRect,"initialize_copy",RUBY_METHOD_FUNC(_initialize_copy),1);
 
 	rb_define_attr_method(rb_cWXRect,"x",_getX,_setX);
 	rb_define_attr_method(rb_cWXRect,"y",_getY,_setY);
@@ -270,10 +271,10 @@
 	rb_define_attr_method(rb_cWXRect,"bottom_right",_getBottomRight,_setBottomRight);
 
 	rb_define_method(rb_cWXRect,"inspect",RUBY_METHOD_FUNC(_inspect),0);
 
 	rb_define_method(rb_cWXRect,"marshal_dump",RUBY_METHOD_FUNC(_marshal_dump),0);
-	rb_define_method(rb_cWXRect,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),1);
+	rb_define_method(rb_cWXRect,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),-2);
 
 	registerType<wxRect>(rb_cWXRect, true);
 }