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

- old
+ new

@@ -59,17 +59,17 @@ FilePicker::set_style_flags(hash,style); } FileDirPicker::check_style_flags(style); + if(nil_check(parent)) + _self->Create( + unwrap<wxWindow*>(parent),id,label,path, + message,wildCard, + wxDefaultPosition,wxDefaultSize,style + ); - _self->Create( - unwrap<wxWindow*>(parent),id,label,path, - message,wildCard, - wxDefaultPosition,wxDefaultSize,style - ); - } rb_call_super(argc,argv); return self; } @@ -110,18 +110,19 @@ rb_cWXWindow = rb_define_class_under(rb_mWX,"Window",rb_cObject); rb_cWXControl = rb_define_class_under(rb_mWX,"Control",rb_cWXWindow); rb_cWXAnyButton = rb_define_class_under(rb_mWX,"AnyButton",rb_cWXControl); rb_cWXButton = rb_define_class_under(rb_mWX,"Button",rb_cWXAnyButton); - - rb_define_attr(rb_cWXFilePickerWidget,"path",1,1); - #endif #if wxUSE_FILEPICKERCTRL using namespace RubyWX::FilePickerWidget; rb_cWXFilePickerWidget = rb_define_class_under(rb_mWX,"FilePickerWidget",rb_cWXButton); rb_define_alloc_func(rb_cWXFilePickerWidget,_alloc); + +#if 0 + rb_define_attr(rb_cWXFilePickerWidget,"path",1,1); +#endif rb_define_method(rb_cWXFilePickerWidget,"initialize",RUBY_METHOD_FUNC(_initialize),-1); rb_define_attr_method(rb_cWXFilePickerWidget,"path",_getPath,_setPath);