rwx 0.0.1.dev → 0.0.1.1.dev

data/ext/wxBitmapToggleButton.cpp

@@ -46,9 +46,11 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			temp = rb_hash_aref(hash,ID2SYM(rb_intern("bitmap")));
 			bitmap = wrapBitmap(temp,id,WRAP_BITMAP_ID,wxART_BUTTON);
 		}
-
-		_self->Create(unwrap<wxWindow*>(parent),id,bitmap);
 		
+		if(nil_check(parent)) {
+			_self->Create(unwrap<wxWindow*>(parent),id,bitmap);
+		}
+
 	}
 
 	rb_call_super(argc,argv);

data/ext/wxBookCtrl.cpp

@@ -195,7 +195,7 @@ DLL_LOCAL VALUE _get_page_image(VALUE self,VALUE idx)
 #if wxUSE_AUI
 	//TODO should be fixed in wx
 	if(rb_obj_is_kind_of(self,rb_cWXAuiNotebook))
-		rb_raise(rb_eArgError,"get_page_image is not supported for %s",rb_class2name(rb_cWXAuiNotebook));
+		rb_raise(rb_eArgError,"get_page_image is not supported for %"PRIsVALUE,rb_cWXAuiNotebook);
 #endif
 	int cidx(NUM2INT(idx));
 	if(check_index(cidx,_self->GetPageCount()))
@@ -560,18 +560,9 @@ DLL_LOCAL void Init_WXBookCtrl(VALUE rb_mWX)
 	rb_cWXWindow = rb_define_class_under(rb_mWX,"Window",rb_cObject);
 	rb_cWXControl = rb_define_class_under(rb_mWX,"Control",rb_cWXWindow);
 
-	rb_define_attr(rb_cWXBookCtrlBase,"selection",1,1);
-	rb_define_attr(rb_cWXBookCtrlBase,"image_list",1,1);
-	rb_define_attr(rb_cWXBookCtrlBase,"intenal_border",1,1);
-	rb_define_attr(rb_cWXBookCtrlBase,"control_margin",1,1);
-
-	rb_define_attr(rb_cWXBookCtrlEvent,"selection",1,1);
-	rb_define_attr(rb_cWXBookCtrlEvent,"old_selection",1,1);
-
 	rb_cWXEvent = rb_define_class_under(rb_mWX,"Event",rb_cObject);
 	rb_cWXCommandEvent = rb_define_class_under(rb_cWXEvent,"Command",rb_cWXEvent);
 	rb_cWXNotifyEvent = rb_define_class_under(rb_cWXEvent,"Notify",rb_cWXCommandEvent);
-
 #endif
 
 #if wxUSE_BOOKCTRL
@@ -579,6 +570,18 @@ DLL_LOCAL void Init_WXBookCtrl(VALUE rb_mWX)
 	rb_cWXBookCtrlBase = rb_define_class_under(rb_mWX,"BookCtrl",rb_cWXControl);
 	rb_undef_alloc_func(rb_cWXBookCtrlBase);
 
+	rb_cWXBookCtrlEvent = rb_define_class_under(rb_cWXEvent,"BookCtrl",rb_cWXNotifyEvent);
+
+#if 0
+	rb_define_attr(rb_cWXBookCtrlBase,"selection",1,1);
+	rb_define_attr(rb_cWXBookCtrlBase,"image_list",1,1);
+	rb_define_attr(rb_cWXBookCtrlBase,"intenal_border",1,1);
+	rb_define_attr(rb_cWXBookCtrlBase,"control_margin",1,1);
+
+	rb_define_attr(rb_cWXBookCtrlEvent,"selection",1,1);
+	rb_define_attr(rb_cWXBookCtrlEvent,"old_selection",1,1);
+#endif
+
 	rb_define_method(rb_cWXBookCtrlBase,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_attr_method(rb_cWXBookCtrlBase,"selection",_getSelection,_setSelection);
@@ -617,9 +620,6 @@ DLL_LOCAL void Init_WXBookCtrl(VALUE rb_mWX)
 	rb_define_const(rb_cWXBookCtrlBase,"LEFT",INT2NUM(wxBK_LEFT));
 	rb_define_const(rb_cWXBookCtrlBase,"RIGHT",INT2NUM(wxBK_RIGHT));
 
-
-	rb_cWXBookCtrlEvent = rb_define_class_under(rb_cWXEvent,"BookCtrl",rb_cWXNotifyEvent);
-
 	rb_define_attr_method(rb_cWXBookCtrlEvent,"selection",Event::_getSelection,Event::_setSelection);
 	rb_define_attr_method(rb_cWXBookCtrlEvent,"old_selection",Event::_getOldSelection,Event::_setOldSelection);
 

data/ext/wxBrush.cpp

@@ -8,6 +8,7 @@
 #include "wxBrush.hpp"
 #include "wxColor.hpp"
 #include "wxBitmap.hpp"
+#include "wxApp.hpp"
 
 #define _self unwrap<wxBrush*>(self)
 
@@ -16,16 +17,40 @@ VALUE rb_cWXBrush;
 typedef std::map<wxBrush*,VALUE> brushlisttype;
 brushlisttype brushlistholder;
 
+
+template <>
+VALUE wrap< wxBrush >(wxBrush *bitmap )
+{
+	if(!bitmap || !bitmap->IsOk())
+		return Qnil;
+	return wrapTypedPtr(bitmap,rb_cWXBrush);
+}
+
+template <>
+VALUE wrap< wxBrush >(const wxBrush &bitmap )
+{
+	if(bitmap.IsOk())
+		return wrapTypedPtr(const_cast<wxBrush*>(&bitmap),rb_cWXBrush);
+	return Qnil;
+}
+
 template <>
 wxBrush unwrap< wxBrush >(const VALUE &vbrush)
 {
-	return NIL_P(vbrush) ? wxNullBrush : *unwrap< wxBrush* >(vbrush);
+	if(NIL_P(vbrush))
+		return wxNullBrush;
+	if(is_wrapable<wxColor>(vbrush))
+		return wxBrush(unwrap<wxColor>(vbrush));
+	if(rb_obj_is_kind_of(vbrush,rb_cWXBrush))
+		return *unwrap< wxBrush* >(vbrush);
+	else
+		return wxBrush(unwrap<wxBitmap>(vbrush));
 }
 
 namespace RubyWX {
 namespace Brush {
 DLL_LOCAL VALUE _alloc(VALUE self) {
-	return wrap(new wxBrush(*wxBLACK));
+	return wrapTypedPtr(new wxBrush,self);
 }
 
 macro_attr(Colour,wxColour)
@@ -37,6 +62,11 @@ singlereturn(IsHatch)
 
 void define_const()
 {
+#if 0
+	rb_mWX = rb_define_module("WX");
+	rb_cWXBrush = rb_define_class_under(rb_mWX,"Brush",rb_cObject);
+#endif
+
 	if(rb_const_defined(rb_cWXBrush,rb_intern("BLACK")))
 		return;
 
@@ -115,6 +145,21 @@ DLL_LOCAL VALUE _marshal_load(VALUE self, VALUE data)
 }
 
 
+struct equal_obj {
+	wxBrush* self;
+	VALUE other;
+};
+
+VALUE _equal_block(equal_obj *obj)
+{
+	return wrap(*obj->self == unwrap<wxBrush>(obj->other));
+}
+
+VALUE _equal_rescue(VALUE val)
+{
+	return Qfalse;
+}
+
 /*
  * call-seq:
  *   == brush -> bool
@@ -125,15 +170,24 @@ DLL_LOCAL VALUE _marshal_load(VALUE self, VALUE data)
  */
 DLL_LOCAL VALUE _equal(VALUE self, VALUE other)
 {
-	return wrap((*_self) == unwrap<wxBrush>(other));
-}
+	equal_obj obj;
+	obj.self = _self;
+	obj.other = other;
 
+	return rb_rescue(
+		RUBY_METHOD_FUNC(_equal_block),(VALUE)&obj,
+		RUBY_METHOD_FUNC(_equal_rescue),Qnil
+	);
+}
 
 DLL_LOCAL VALUE _class_get(int argc,VALUE *argv,VALUE self)
 {
 
 	VALUE color,style;
 	rb_scan_args(argc, argv, "11",&color,&style);
+
+	app_protected();
+
 	//TODO add refcounting
 	wxBrush *brush = wxTheBrushList->FindOrCreateBrush(
 		unwrap<wxColor>(color),
@@ -149,7 +203,7 @@ DLL_LOCAL VALUE _class_get(int argc,VALUE *argv,VALUE self)
 		return it->second;
 	} else {
 		//wrap wxBrush pointer to ruby object
-		VALUE result = wrap(brush);
+		VALUE result = wrapTypedPtr(brush, self);
 
 		//BrushList objects should not be changed
 		rb_obj_freeze(result);
@@ -218,12 +272,18 @@ DLL_LOCAL VALUE _class_get(int argc,VALUE *argv,VALUE self)
 DLL_LOCAL void Init_WXBrush(VALUE rb_mWX)
 {
 #if 0
+	rb_mWX = rb_define_module("WX");
+#endif
 
+	using namespace RubyWX::Brush;
+	rb_cWXBrush = rb_define_class_under(rb_mWX,"Brush",rb_cObject);
+	rb_define_alloc_func(rb_cWXBrush,_alloc);
+
+#if 0
 	rb_define_attr(rb_cWXBrush,"color",1,1);
 	rb_define_attr(rb_cWXBrush,"style",1,1);
 	rb_define_attr(rb_cWXBrush,"stipple",1,1);
 
-	//need to
 	rb_define_const(rb_cWXBrush,"BLACK",wrap(wxBLACK_BRUSH));
 	rb_define_const(rb_cWXBrush,"BLUE",wrap(wxBLUE_BRUSH));
 	rb_define_const(rb_cWXBrush,"CYAN",wrap(wxCYAN_BRUSH));
@@ -237,10 +297,6 @@ DLL_LOCAL void Init_WXBrush(VALUE rb_mWX)
 	rb_define_const(rb_cWXBrush,"WHITE",wrap(wxWHITE_BRUSH));
 #endif
 
-	using namespace RubyWX::Brush;
-	rb_cWXBrush = rb_define_class_under(rb_mWX,"Brush",rb_cObject);
-	rb_define_alloc_func(rb_cWXBrush,_alloc);
-
 	rb_define_method(rb_cWXBrush,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 	rb_define_private_method(rb_cWXBrush,"initialize_copy",RUBY_METHOD_FUNC(_initialize_copy),1);
 
@@ -251,7 +307,7 @@ DLL_LOCAL void Init_WXBrush(VALUE rb_mWX)
 	rb_define_method(rb_cWXBrush,"hatch?",RUBY_METHOD_FUNC(_IsHatch),0);
 
 	rb_define_method(rb_cWXBrush,"marshal_dump",RUBY_METHOD_FUNC(_marshal_dump),0);
-	rb_define_method(rb_cWXBrush,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),1);
+	rb_define_method(rb_cWXBrush,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),-2);
 
 	rb_define_method(rb_cWXBrush,"==",RUBY_METHOD_FUNC(_equal),1);
 
@@ -272,7 +328,8 @@ DLL_LOCAL void Init_WXBrush(VALUE rb_mWX)
 		->add(wxBRUSHSTYLE_FDIAGONAL_HATCH,"fdiagonal_hatch")
 		->add(wxBRUSHSTYLE_CROSS_HATCH,"cross_hatch")
 		->add(wxBRUSHSTYLE_HORIZONTAL_HATCH,"horizontal_hatch")
-		->add(wxBRUSHSTYLE_VERTICAL_HATCH,"vertical_hatch");
+		->add(wxBRUSHSTYLE_VERTICAL_HATCH,"vertical_hatch")
+		->allow_array = false;
 
 }
 

data/ext/wxBrush.hpp

@@ -14,6 +14,12 @@
 extern VALUE rb_cWXBrush;
 void Init_WXBrush(VALUE rb_mWX);
 
+template <>
+VALUE wrap< wxBrush >(wxBrush *bitmap );
+
+template <>
+VALUE wrap< wxBrush >(const wxBrush &bitmap );
+
 template <>
 wxBrush unwrap< wxBrush >(const VALUE &vbrush);
 

data/ext/wxButton.cpp

@@ -42,9 +42,10 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_option(hash,"id",id,unwrapID);
 			set_hash_option(hash,"label",label);
 		}
-
-		_self->Create(unwrap<wxWindow*>(parent),id,label);
 		
+		if(nil_check(parent)) {
+			_self->Create(unwrap<wxWindow*>(parent),id,label);
+		}
 	}
 
 	rb_call_super(argc,argv);

data/ext/wxCalendarCtrl.cpp

@@ -46,12 +46,13 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_option(hash,"style",style);
 		}
 
-		_self->Create(
-			unwrap<wxWindow*>(parent),id,date,
-			wxDefaultPosition,wxDefaultSize,
-			style
-		);
-
+		if(nil_check(parent)) {
+			_self->Create(
+				unwrap<wxWindow*>(parent),id,date,
+				wxDefaultPosition,wxDefaultSize,
+				style
+			);
+		}
 	}
 
 	rb_call_super(argc,argv);

data/ext/wxCalendarCtrlBase.cpp

@@ -38,8 +38,6 @@ DLL_LOCAL void Init_WXCalendarCtrlBase(VALUE rb_mWX)
 	rb_cWXWindow = rb_define_class_under(rb_mWX,"Window",rb_cObject);
 
 	rb_cWXControl = rb_define_class_under(rb_mWX,"Control",rb_cWXWindow);
-
-	rb_define_attr(rb_cWXCalendarCtrlBase,"date",1,1);
 #endif
 
 #if wxUSE_CALENDARCTRL
@@ -47,6 +45,10 @@ DLL_LOCAL void Init_WXCalendarCtrlBase(VALUE rb_mWX)
 	rb_cWXCalendarCtrlBase = rb_define_class_under(rb_mWX,"CalendarCtrlBase",rb_cWXControl);
 	rb_undef_alloc_func(rb_cWXCalendarCtrlBase);
 
+#if 0
+	rb_define_attr(rb_cWXCalendarCtrlBase,"date",1,1);
+#endif
+
 	rb_define_attr_method(rb_cWXCalendarCtrlBase,"date",_getDate,_setDate);
 
 	registerType<wxCalendarCtrlBase>(rb_cWXCalendarCtrlBase);

data/ext/wxCalendarCtrlGeneric.cpp

@@ -47,12 +47,13 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_option(hash,"style",style);
 		}
 
-		_self->Create(
-			unwrap<wxWindow*>(parent),id,date,
-			wxDefaultPosition,wxDefaultSize,
-			style
-		);
-
+		if(nil_check(parent)) {
+			_self->Create(
+				unwrap<wxWindow*>(parent),id,date,
+				wxDefaultPosition,wxDefaultSize,
+				style
+			);
+		}
 	}
 
 	rb_call_super(argc,argv);
@@ -82,7 +83,9 @@ DLL_LOCAL void Init_WXCalendarCtrlGeneric(VALUE rb_mWX)
 	rb_cWXCalendarCtrlBase = rb_define_class_under(rb_mWX,"CalendarCtrlBase",rb_cWXControl);
 #endif
 #if wxUSE_CALENDARCTRL
-#ifdef wxHAS_NATIVE_CALENDARCTRL
+#ifndef wxHAS_NATIVE_CALENDARCTRL
+	rb_define_const(rb_mWX,"CalendarCtrlGeneric",rb_cWXCalendarCtrl);
+#else
 	using namespace RubyWX::GenericCalendarCtrl;
 	rb_cWXCalendarCtrlGeneric = rb_define_class_under(rb_mWX,"CalendarCtrlGeneric",rb_cWXCalendarCtrlBase);
 	rb_define_alloc_func(rb_cWXCalendarCtrlGeneric,_alloc);
@@ -90,8 +93,6 @@ DLL_LOCAL void Init_WXCalendarCtrlGeneric(VALUE rb_mWX)
 	rb_define_method(rb_cWXCalendarCtrlGeneric,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	registerInfo<wxGenericCalendarCtrl>(rb_cWXCalendarCtrlGeneric);
-#else
-	rb_define_const(rb_mWX,"CalendarCtrlGeneric",rb_cWXCalendarCtrl);
 #endif
 #endif
 

data/ext/wxCheckBox.cpp

@@ -65,8 +65,11 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			}
 
 		}
-
-		_self->Create(unwrap<wxWindow*>(parent),id,label,wxDefaultPosition,wxDefaultSize,style);
+		if(nil_check(parent)) {
+			_self->Create(unwrap<wxWindow*>(parent),id,label,
+				wxDefaultPosition,wxDefaultSize,style
+			);
+		}
 	}
 	
 	rb_call_super(argc,argv);
@@ -122,9 +125,6 @@ DLL_LOCAL void Init_WXCheckBox(VALUE rb_mWX)
 	rb_cWXWindow = rb_define_class_under(rb_mWX,"Window",rb_cObject);
 
 	rb_cWXControl = rb_define_class_under(rb_mWX,"Control",rb_cWXWindow);
-
-	rb_define_attr(rb_cWXCheckBox,"value",1,1);
-	rb_define_attr(rb_cWXCheckBox,"third_state",1,1);
 #endif
 
 #if wxUSE_CHECKBOX
@@ -132,6 +132,11 @@ DLL_LOCAL void Init_WXCheckBox(VALUE rb_mWX)
 	rb_cWXCheckBox = rb_define_class_under(rb_mWX,"CheckBox",rb_cWXControl);
 	rb_define_alloc_func(rb_cWXCheckBox,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXCheckBox,"value",1,1);
+	rb_define_attr(rb_cWXCheckBox,"third_state",1,1);
+#endif
+
 	rb_define_method(rb_cWXCheckBox,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_attr_method(rb_cWXCheckBox,"value",_getValue,_setValue);

data/ext/wxCheckListBox.cpp

@@ -49,15 +49,16 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 
 			ListBox::set_style_flags(hash,style);
 		}
-		_self->Create(
-			unwrap<wxWindow*>(parent),id,
-			wxDefaultPosition,wxDefaultSize,
-			choices,style
-		);
-		
-		if(selflag && check_index(selection,_self->GetCount()))
-			_self->SetSelection(selection);
-
+		if(nil_check(parent)) {
+			_self->Create(
+				unwrap<wxWindow*>(parent),id,
+				wxDefaultPosition,wxDefaultSize,
+				choices,style
+			);
+
+			if(selflag && check_index(selection,_self->GetCount()))
+				_self->SetSelection(selection);
+		}
 	}
 	rb_call_super(argc,argv);
 	return self;

data/ext/wxChoice.cpp

@@ -65,15 +65,16 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_style_flags(hash,style);
 		}
 
-		_self->Create(
-			unwrap<wxWindow*>(parent),id,
-			wxDefaultPosition,wxDefaultSize,
-			choices,style
-		);
-		
-		if(selflag && check_index(selection,_self->GetCount()))
-			_self->SetSelection(selection);
-
+		if(nil_check(parent)) {
+			_self->Create(
+				unwrap<wxWindow*>(parent),id,
+				wxDefaultPosition,wxDefaultSize,
+				choices,style
+			);
+
+			if(selflag && check_index(selection,_self->GetCount()))
+				_self->SetSelection(selection);
+		}
 	}
 
 	rb_call_super(argc,argv);

data/ext/wxChoiceBook.cpp

@@ -47,7 +47,11 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_option(hash,"style",style);
 		}
 
-		_self->Create(unwrap<wxWindow*>(parent),id,wxDefaultPosition,wxDefaultSize,style);
+		if(nil_check(parent)) {
+			_self->Create(unwrap<wxWindow*>(parent),id,
+				wxDefaultPosition,wxDefaultSize,style
+			);
+		}
 		
 	}
 

data/ext/wxCollapsiblePane.cpp

@@ -78,14 +78,19 @@ DLL_LOCAL void Init_WXCollapsiblePane(VALUE rb_mWX)
 	rb_mWX = rb_define_module("WX");
 	rb_cWXWindow = rb_define_class_under(rb_mWX,"Window",rb_cObject);
 	rb_cWXControl = rb_define_class_under(rb_mWX,"Control",rb_cWXWindow);
-
-	rb_define_attr(rb_cWXCollapsiblePane,"collapsed",1,1);
-	rb_define_attr(rb_cWXCollapsiblePaneEvent,"collapsed",1,1);
+	rb_cWXEvent = rb_define_class_under(rb_mWX,"Event",rb_cObject);
 #endif
+
 #if wxUSE_COLLPANE
 	using namespace RubyWX::CollapsiblePane;
 	rb_cWXCollapsiblePane = rb_define_class_under(rb_mWX,"CollapsiblePane",rb_cWXControl);
 	rb_define_alloc_func(rb_cWXCollapsiblePane,_alloc);
+	rb_cWXCollapsiblePaneEvent = rb_define_class_under(rb_cWXEvent,"CollapsiblePane",rb_cWXCommandEvent);
+
+#if 0
+	rb_define_attr(rb_cWXCollapsiblePane,"collapsed",1,1);
+	rb_define_attr(rb_cWXCollapsiblePaneEvent,"collapsed",1,1);
+#endif
 
 	rb_define_method(rb_cWXCollapsiblePane,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
@@ -93,8 +98,6 @@ DLL_LOCAL void Init_WXCollapsiblePane(VALUE rb_mWX)
 
 	rb_define_method(rb_cWXCollapsiblePane,"pane",RUBY_METHOD_FUNC(_GetPane),0);
 
-	rb_cWXCollapsiblePaneEvent = rb_define_class_under(rb_cWXEvent,"CollapsiblePane",rb_cWXCommandEvent);
-
 	rb_define_attr_method(rb_cWXCollapsiblePaneEvent,"collapsed",Event::_getCollapsed,Event::_setCollapsed);