rwx 0.0.1.dev → 0.0.1.1.dev

data/ext/wxColor.cpp

@@ -12,6 +12,13 @@
 VALUE rb_cWXColor;
 ID rwxID_red,rwxID_blue,rwxID_green,rwxID_alpha;
 
+template <>
+VALUE wrap< wxColor >(const wxColor& color )
+{
+	if(!color.IsOk())
+		return Qnil;
+	return wrapTypedPtr(new wxColor(color), rb_cWXColor);
+}
 template <>
 VALUE wrap< wxColor >(wxColor *color )
 {
@@ -21,10 +28,15 @@ VALUE wrap< wxColor >(wxColor *color )
 template <>
 bool is_wrapable< wxColor >(const VALUE &vcolor)
 {
-	if (rb_obj_is_kind_of(vcolor, rb_cWXColor) ||
-		rb_obj_is_kind_of(vcolor, rb_cString) || FIXNUM_P(vcolor)){
+	if(rb_obj_is_kind_of(vcolor, rb_cWXColor) || FIXNUM_P(vcolor)){
 		return true;
-	} else if(rb_respond_to(vcolor,rwxID_red) &&
+	}else if(rb_obj_is_kind_of(vcolor, rb_cString)){
+		wxLogNull logNo;
+		wxString name(unwrap<wxString>(vcolor));
+		wxColor col(name);
+		return col.IsOk();
+	}
+	else if(rb_respond_to(vcolor,rwxID_red) &&
 		rb_respond_to(vcolor,rwxID_blue) &&
 		rb_respond_to(vcolor,rwxID_green)){
 		return true;
@@ -50,6 +62,10 @@ void set_color_part(char& cv,const VALUE &val, const ID &id)
 template <>
 wxColor unwrap< wxColor >(const VALUE &vcolor)
 {
+	//NULLColor is not wanted
+	//	if(NIL_P(vcolor))
+	//		return wxNullColour;
+
 	if(rb_obj_is_kind_of(vcolor, rb_cString)){
 		wxLogNull logNo;
 		wxString name(unwrap<wxString>(vcolor));
@@ -81,7 +97,10 @@ wxColor unwrap< wxColor >(const VALUE &vcolor)
 
 		return color;
 	}else{
-		return *unwrap<wxColor*>(vcolor);
+		wxColor *col = unwrap<wxColor*>(vcolor);
+		if(!col->IsOk())
+			rb_raise(rb_eTypeError,"invalid %"PRIsVALUE, rb_cWXColor);
+		return *col;
 	}
 
 
@@ -90,11 +109,16 @@ wxColor unwrap< wxColor >(const VALUE &vcolor)
 namespace RubyWX {
 namespace Color {
 DLL_LOCAL VALUE _alloc(VALUE self) {
-	return wrap(new wxColor);
+	return wrapTypedPtr(new wxColor,self);
 }
 
 void define_const()
 {
+#if 0
+	rb_mWX = rb_define_module("WX");
+	rb_cWXColor = rb_define_class_under(rb_mWX,"Color",rb_cObject);
+#endif
+
 	if(rb_const_defined(rb_cWXColor,rb_intern("BLACK")))
 		return;
 
@@ -140,6 +164,17 @@ DLL_LOCAL VALUE _getAlpha(VALUE self)
 		return CHR2FIX(0);
 }
 
+DLL_LOCAL void init_values(wxColor *self, char &red, char &green, char &blue, char &alpha)
+{
+	if(self->IsOk()) {
+		red = self->Red();
+		green = self->Green();
+		blue = self->Blue();
+		alpha = self->Alpha();
+	}
+}
+
+
 DLL_LOCAL char val_to_char(VALUE val)
 {
 	char cval(0);
@@ -154,42 +189,43 @@ DLL_LOCAL VALUE _setRed(VALUE self,VALUE val)
 {
 	rb_check_frozen(self);
 
-	if(_self->IsOk())
-		_self->Set(val_to_char(val),_self->Green(),_self->Blue(),_self->Alpha());
-	else
-		_self->Set(val_to_char(val),0,0,0);
+	char red(0), green(0), blue(0), alpha(0);
+	init_values(_self, red, green, blue, alpha);
+	red = val_to_char(val);
+	_self->Set(red, green, blue, alpha);
+
 	return val;
 }
 
 DLL_LOCAL VALUE _setGreen(VALUE self,VALUE val)
 {
 	rb_check_frozen(self);
-	if(_self->IsOk())
-		_self->Set(_self->Red(),val_to_char(val),_self->Blue(),_self->Alpha());
-	else
-		_self->Set(0,val_to_char(val),0,0);
+
+	char red(0), green(0), blue(0), alpha(0);
+	init_values(_self, red, green, blue, alpha);
+	green = val_to_char(val);
+	_self->Set(red, green, blue, alpha);
+
 	return val;
 }
 DLL_LOCAL VALUE _setBlue(VALUE self,VALUE val)
 {
 	rb_check_frozen(self);
-	if(_self->IsOk())
-		_self->Set(_self->Red(),_self->Green(),val_to_char(val),_self->Alpha());
-	else
-		_self->Set(0,0,val_to_char(val),0);
+
+	char red(0), green(0), blue(0), alpha(0);
+	init_values(_self, red, green, blue, alpha);
+	blue = val_to_char(val);
+	_self->Set(red, green, blue, alpha);
+
 	return val;
 }
 DLL_LOCAL VALUE _setAlpha(VALUE self,VALUE val)
 {
 	rb_check_frozen(self);
 
-	int red(0), green(0), blue(0), alpha(0);
+	char red(0), green(0), blue(0), alpha(0);
 
-	if(_self->IsOk()) {
-		red = _self->Red();
-		green = _self->Green();
-		blue = _self->Blue();
-	}
+	init_values(_self, red, green, blue, alpha);
 
 	if(!RTEST(val))
 		alpha = wxALPHA_OPAQUE;
@@ -360,6 +396,9 @@ DLL_LOCAL VALUE _equal(VALUE self, VALUE other)
 /* Document-attr: alpha
  * returns the alpha value of Color.
  */
+/* Document-attr: name
+ * returns the name of the Color or nil if no name found
+ */
 
 /* Document-const: BLACK
  * predefined Color constant.
@@ -387,6 +426,9 @@ DLL_LOCAL VALUE _equal(VALUE self, VALUE other)
  */
 DLL_LOCAL void Init_WXColor(VALUE rb_mWX)
 {
+#if 0
+	rb_mWX = rb_define_module("WX");
+#endif
 	using namespace RubyWX::Color;
 	rb_cWXColor = rb_define_class_under(rb_mWX,"Color",rb_cObject);
 
@@ -395,6 +437,7 @@ DLL_LOCAL void Init_WXColor(VALUE rb_mWX)
 	rb_define_attr(rb_cWXColor,"green",1,1);
 	rb_define_attr(rb_cWXColor,"blue",1,1);
 	rb_define_attr(rb_cWXColor,"alpha",1,1);
+	rb_define_attr(rb_cWXColor,"name",1,0);
 
 	rb_define_const(rb_cWXColor,"BLACK",wrap(wxBLACK));
 	rb_define_const(rb_cWXColor,"BLUE",wrap(wxBLUE));
@@ -417,12 +460,13 @@ DLL_LOCAL void Init_WXColor(VALUE rb_mWX)
 	rb_define_attr_method(rb_cWXColor,"blue",_getBlue,_setBlue);
 	rb_define_attr_method(rb_cWXColor,"alpha",_getAlpha,_setAlpha);
 
+	rb_define_attr_method(rb_cWXColor,"name",_name,NULL);
+
 	rb_define_method(rb_cWXColor,"to_s",RUBY_METHOD_FUNC(_tos),0);
-	rb_define_method(rb_cWXColor,"name",RUBY_METHOD_FUNC(_name),0);
 	rb_define_method(rb_cWXColor,"inspect",RUBY_METHOD_FUNC(_inspect),0);
 
 	rb_define_method(rb_cWXColor,"marshal_dump",RUBY_METHOD_FUNC(_marshal_dump),0);
-	rb_define_method(rb_cWXColor,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),1);
+	rb_define_method(rb_cWXColor,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),-2);
 
 	rb_define_method(rb_cWXColor,"==",RUBY_METHOD_FUNC(_equal),1);
 

data/ext/wxColor.hpp

@@ -14,6 +14,9 @@ extern VALUE rb_cWXColor;
 void Init_WXColor(VALUE rb_mWX);
 
 
+template <>
+VALUE wrap< wxColor >(const wxColor& color );
+
 template <>
 VALUE wrap< wxColor >(wxColor *color );
 

data/ext/wxColorPicker.cpp

@@ -58,7 +58,11 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 
 		}
 
-		_self->Create(unwrap<wxWindow*>(parent),id,color,wxDefaultPosition,wxDefaultSize,style);
+		if(nil_check(parent)) {
+			_self->Create(unwrap<wxWindow*>(parent),id,color,
+				wxDefaultPosition,wxDefaultSize,style
+			);
+		}
 	}
 
 	rb_call_super(argc,argv);
@@ -100,15 +104,18 @@ DLL_LOCAL void Init_WXColorPicker(VALUE rb_mWX)
 	rb_cWXControl = rb_define_class_under(rb_mWX,"Control",rb_cWXWindow);
 
 	rb_cWXPickerBase = rb_define_class_under(rb_mWX,"PickerBase",rb_cWXControl);
-
-	rb_define_attr(rb_cWXColorPicker,"color",1,1);
-	rb_define_attr(rb_cWXColorPickerEvent,"color",1,1);
 #endif
 
 #if wxUSE_COLOURPICKERCTRL
 	using namespace RubyWX::ColorPicker;
 	rb_cWXColorPicker = rb_define_class_under(rb_mWX,"ColorPicker",rb_cWXPickerBase);
 	rb_define_alloc_func(rb_cWXColorPicker,_alloc);
+	rb_cWXColorPickerEvent = rb_define_class_under(rb_cWXEvent,"ColorPicker",rb_cWXEvent);
+
+#if 0
+	rb_define_attr(rb_cWXColorPicker,"color",1,1);
+	rb_define_attr(rb_cWXColorPickerEvent,"color",1,1);
+#endif
 
 	rb_define_method(rb_cWXColorPicker,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
@@ -117,7 +124,6 @@ DLL_LOCAL void Init_WXColorPicker(VALUE rb_mWX)
 	rb_define_const(rb_cWXColorPicker,"DEFAULT_STYLE",INT2NUM(wxCLRP_DEFAULT_STYLE));
 	rb_define_const(rb_cWXColorPicker,"SHOW_LABEL",INT2NUM(wxCLRP_SHOW_LABEL));
 
-	rb_cWXColorPickerEvent = rb_define_class_under(rb_cWXEvent,"ColorPicker",rb_cWXEvent);
 	registerEventType("colorpicker_changed",wxEVT_COLOURPICKER_CHANGED,rb_cWXColorPickerEvent);
 
 	rb_define_attr_method(rb_cWXColorPickerEvent,"color",

data/ext/wxColorPickerWidget.cpp

@@ -51,11 +51,12 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 
 		}
 
-		_self->Create(
-			unwrap<wxWindow*>(parent),id,color,
-			wxDefaultPosition,wxDefaultSize,style
-		);
-
+		if(nil_check(parent)) {
+			_self->Create(
+				unwrap<wxWindow*>(parent),id,color,
+				wxDefaultPosition,wxDefaultSize,style
+			);
+		}
 	}
 
 	rb_call_super(argc,argv);
@@ -84,9 +85,6 @@ DLL_LOCAL void Init_WXColorPickerWidget(VALUE rb_mWX)
 	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_cWXColorPickerWidget,"color",1,1);
-
 #endif
 
 #if wxUSE_COLOURPICKERCTRL
@@ -94,6 +92,10 @@ DLL_LOCAL void Init_WXColorPickerWidget(VALUE rb_mWX)
 	rb_cWXColorPickerWidget = rb_define_class_under(rb_mWX,"ColorPickerWidget",rb_cWXButton);
 	rb_define_alloc_func(rb_cWXColorPickerWidget,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXColorPickerWidget,"color",1,1);
+#endif
+
 	rb_define_method(rb_cWXColorPickerWidget,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_attr_method(rb_cWXColorPickerWidget,"color",_getColour,_setColour);

data/ext/wxComboBox.cpp

@@ -179,6 +179,9 @@ DLL_LOCAL void Init_WXComboBox(VALUE rb_mWX)
 
 	rb_define_method(rb_cWXComboBox,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
+	rb_include_module(rb_cWXComboBox,rb_mWXItemContainer);
+	rb_include_module(rb_cWXComboBox,rb_mWXTextEntry);
+
 	rb_define_method(rb_cWXComboBox,"clear",RUBY_METHOD_FUNC(_Clear),0);
 	rb_define_method(rb_cWXComboBox,"popup",RUBY_METHOD_FUNC(_Popup),0);
 	rb_define_method(rb_cWXComboBox,"dismiss",RUBY_METHOD_FUNC(_Dismiss),0);
@@ -188,9 +191,6 @@ DLL_LOCAL void Init_WXComboBox(VALUE rb_mWX)
 	rb_define_method(rb_cWXComboBox,"list_empty?",RUBY_METHOD_FUNC(_IsListEmpty),0);
 	rb_define_method(rb_cWXComboBox,"text_empty?",RUBY_METHOD_FUNC(_IsTextEmpty),0);
 
-	rb_include_module(rb_cWXComboBox,rb_mWXItemContainer);
-	rb_include_module(rb_cWXComboBox,rb_mWXTextEntry);
-
 	//define Choice constants
 	rb_define_const(rb_cWXComboBox,"SORT",INT2NUM(wxCB_SORT));
 	rb_define_const(rb_cWXComboBox,"READONLY",INT2NUM(wxCB_READONLY));

data/ext/wxComboCtrl.cpp

@@ -0,0 +1,220 @@
+/*
+ * wxComboCtrl.cpp
+ *
+ *  Created on: 14.10.2014
+ *      Author: hanmac
+ */
+
+
+
+#include "wxEvtHandler.hpp"
+#include "wxTextEntry.hpp"
+#include "wxTextCtrl.hpp"
+#include "wxComboCtrl.hpp"
+
+VALUE rb_cWXComboCtrl;
+
+#if wxUSE_COMBOCTRL
+#define _self unwrap<wxComboCtrl*>(self)
+
+namespace RubyWX {
+namespace ComboCtrl {
+
+APP_PROTECT(wxComboCtrl)
+
+singlefunc(Popup)
+singlefunc(Dismiss)
+
+singlereturn(GetPopupWindow)
+singlereturn(GetTextCtrl)
+singlereturn(GetButton)
+
+singlereturn(GetBitmapNormal)
+singlereturn(GetBitmapPressed)
+singlereturn(GetBitmapHover)
+singlereturn(GetBitmapDisabled)
+
+//macro_attr(PopupMinWidth,int)
+macro_attr(CustomPaintWidth,int)
+
+
+DLL_LOCAL VALUE _set_bitmap_normal(VALUE self, VALUE val)
+{
+	_self->SetButtonBitmaps(
+		unwrap<wxBitmap>(val),
+		false,
+		_self->GetBitmapPressed(),
+		_self->GetBitmapHover(),
+		_self->GetBitmapDisabled()
+    );
+	return val;
+}
+DLL_LOCAL VALUE _set_bitmap_pressed(VALUE self, VALUE val)
+{
+	_self->SetButtonBitmaps(
+		_self->GetBitmapNormal(),
+		false,
+		unwrap<wxBitmap>(val),
+		_self->GetBitmapHover(),
+		_self->GetBitmapDisabled()
+    );
+	return val;
+}
+DLL_LOCAL VALUE _set_bitmap_hover(VALUE self, VALUE val)
+{
+	_self->SetButtonBitmaps(
+		_self->GetBitmapNormal(),
+		false,
+		_self->GetBitmapPressed(),
+		unwrap<wxBitmap>(val),
+		_self->GetBitmapDisabled()
+    );
+	return val;
+}
+DLL_LOCAL VALUE _set_bitmap_disabled(VALUE self, VALUE val)
+{
+	_self->SetButtonBitmaps(
+		_self->GetBitmapNormal(),
+		false,
+		_self->GetBitmapPressed(),
+		_self->GetBitmapHover(),
+		unwrap<wxBitmap>(val)
+    );
+	return val;
+}
+
+/*
+ * call-seq:
+ *   ComboCtrl.new(parent, name, [options])
+ *   ComboCtrl.new(parent, [options])
+ *
+ * creates a new ComboCtrl widget.
+ * ===Arguments
+ * * parent of this window or nil
+ * * name is a String describing a resource in a loaded xrc
+ *
+ * *options: Hash with possible options to set:
+ *   * items [String]
+ *   * select Integer
+ *   * value String
+*/
+DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
+{
+	VALUE parent,name,hash;
+	rb_scan_args(argc, argv, "11:",&parent,&name,&hash);
+
+	if(!_created  && !rb_obj_is_kind_of(name,rb_cString)) {
+		wxWindowID id(wxID_ANY);
+		wxString value;
+		int style(0);
+
+		if(rb_obj_is_kind_of(hash,rb_cHash)) {
+			set_hash_option(hash,"id",id,unwrapID);
+			set_hash_option(hash,"value",value);
+			set_hash_option(hash,"style",style);
+
+			TextCtrl::set_style_flags(hash,style);
+		}
+		_self->Create(
+			unwrap<wxWindow*>(parent),id,value,
+			wxDefaultPosition,wxDefaultSize,style
+		);
+		
+	}
+
+	rb_call_super(argc,argv);
+
+	if(rb_obj_is_kind_of(hash,rb_cHash)) {
+		VALUE temp;
+		set_option(value,Value,wxString)
+
+	}
+
+	return self;
+}
+
+}
+}
+#endif
+
+/* Document-method: popup
+ * call-seq:
+ *   popup -> self
+ *
+ * Shows the list box portion of the combo box.
+ * ===Return value
+ * self
+*/
+/* Document-method: dismiss
+ * call-seq:
+ *   dismiss -> self
+ *
+ * Hides the list box portion of the combo box.
+ * ===Return value
+ * self
+*/
+/* Document-const: MULTILINE
+ *   The text control allows multiple lines. If this style is not specified, line break characters should not be used in the controls value.
+ */
+/* Document-const: PROCESS_TAB
+ *   The control will receive :char events for TAB pressed - normally, TAB is used for passing to the next control in a dialog instead. For the control created with this style, you can still use Ctrl-Enter to pass to the next control from the keyboard.
+ */
+/* Document-const: PROCESS_ENTER
+ *  The control will generate the event :text_enter (otherwise pressing Enter key is either processed internally by the control or used for navigation between dialog controls).
+ */
+/* Document-const: PASSWORD
+ *   The text will be echoed as asterisks.
+ */
+DLL_LOCAL void Init_WXComboCtrl(VALUE rb_mWX)
+{
+#if 0
+	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_mWXTextEntry = rb_define_module_under(rb_mWX,"TextEntry");
+#endif
+#if wxUSE_COMBOCTRL
+	using namespace RubyWX::ComboCtrl;
+	rb_cWXComboCtrl = rb_define_class_under(rb_mWX,"ComboCtrl",rb_cWXControl);
+	rb_define_alloc_func(rb_cWXComboCtrl,_alloc);
+
+#if 0
+	rb_define_attr(rb_cWXComboCtrl,"popup_window",1,0);
+	rb_define_attr(rb_cWXComboCtrl,"text_ctrl",1,0);
+	rb_define_attr(rb_cWXComboCtrl,"button",1,0);
+
+	rb_define_attr(rb_cWXComboCtrl,"bitmap_normal",1,1);
+	rb_define_attr(rb_cWXComboCtrl,"bitmap_pressed",1,1);
+	rb_define_attr(rb_cWXComboCtrl,"bitmap_hover",1,1);
+	rb_define_attr(rb_cWXComboCtrl,"bitmap_disabled",1,1);
+#endif
+
+	rb_define_attr_method(rb_cWXComboCtrl,"popup_window",_GetPopupWindow,0);
+	rb_define_attr_method(rb_cWXComboCtrl,"text_ctrl",_GetTextCtrl,0);
+	rb_define_attr_method(rb_cWXComboCtrl,"button",_GetButton,0);
+
+	rb_define_attr_method(rb_cWXComboCtrl,"bitmap_normal",_GetBitmapNormal,_set_bitmap_normal);
+	rb_define_attr_method(rb_cWXComboCtrl,"bitmap_pressed",_GetBitmapPressed,_set_bitmap_pressed);
+	rb_define_attr_method(rb_cWXComboCtrl,"bitmap_hover",_GetBitmapHover,_set_bitmap_hover);
+	rb_define_attr_method(rb_cWXComboCtrl,"bitmap_disabled",_GetBitmapDisabled,_set_bitmap_disabled);
+
+	rb_define_method(rb_cWXComboCtrl,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
+
+	rb_define_method(rb_cWXComboCtrl,"popup",RUBY_METHOD_FUNC(_Popup),0);
+	rb_define_method(rb_cWXComboCtrl,"dismiss",RUBY_METHOD_FUNC(_Dismiss),0);
+
+	rb_include_module(rb_cWXComboCtrl,rb_mWXTextEntry);
+
+	//define TextCtrl constants
+	rb_define_const(rb_cWXComboCtrl,"MULTILINE",INT2NUM(wxTE_MULTILINE));
+	rb_define_const(rb_cWXComboCtrl,"PROCESS_TAB",INT2NUM(wxTE_PROCESS_TAB));
+	rb_define_const(rb_cWXComboCtrl,"PROCESS_ENTER",INT2NUM(wxTE_PROCESS_ENTER));
+	rb_define_const(rb_cWXComboCtrl,"PASSWORD",INT2NUM(wxTE_PASSWORD));
+
+	registerInfo<wxComboCtrl>(rb_cWXComboCtrl);
+
+#endif
+
+}
+