rwx 0.0.1.dev → 0.0.1.1.dev

data/ext/wxSpinButton.hpp

@@ -10,7 +10,7 @@
 
 #include "wxControl.hpp"
 
-extern VALUE rb_cWXSpinButton;
+extern VALUE rb_cWXSpinButton, rb_cWXSpinEvent;
 
 void Init_WXSpinButton(VALUE rb_mWX);
 #if wxUSE_SPINBTN

data/ext/wxSpinCtrl.cpp

@@ -7,6 +7,7 @@
 
 
 #include "wxSpinCtrl.hpp"
+#include "wxSpinButton.hpp"
 
 
 VALUE rb_cWXSpinCtrl;
@@ -39,10 +40,10 @@ APP_PROTECT(wxSpinCtrl)
 
 /*
  * call-seq:
- *   SpinButton.new(parent, name, [options])
- *   SpinButton.new(parent, [options])
+ *   SpinCtrl.new(parent, name, [options])
+ *   SpinCtrl.new(parent, [options])
  *
- * creates a new SpinButton widget.
+ * creates a new SpinCtrl widget.
  * ===Arguments
  * * parent of this window or nil
  * * name is a String describing a resource in a loaded xrc
@@ -73,10 +74,12 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_option(hash,"style",style);
 		}
 
-		_self->Create(unwrap<wxWindow*>(parent),id,
-			wxEmptyString,wxDefaultPosition,wxDefaultSize,
-			style,min,max,value
-		);
+		if(nil_check(parent)) {
+			_self->Create(unwrap<wxWindow*>(parent),id,
+				wxEmptyString,wxDefaultPosition,wxDefaultSize,
+				style,min,max,value
+			);
+		}
 	}
 
 	rb_call_super(argc,argv);
@@ -105,10 +108,6 @@ DLL_LOCAL void Init_WXSpinCtrl(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_cWXSpinCtrl,"value",1,1);
-	rb_define_attr(rb_cWXSpinCtrl,"min",1,1);
-	rb_define_attr(rb_cWXSpinCtrl,"max",1,1);
 #endif
 
 #if wxUSE_SPINCTRL
@@ -116,6 +115,12 @@ DLL_LOCAL void Init_WXSpinCtrl(VALUE rb_mWX)
 	rb_cWXSpinCtrl = rb_define_class_under(rb_mWX,"SpinCtrl",rb_cWXControl);
 	rb_define_alloc_func(rb_cWXSpinCtrl,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXSpinCtrl,"value",1,1);
+	rb_define_attr(rb_cWXSpinCtrl,"min",1,1);
+	rb_define_attr(rb_cWXSpinCtrl,"max",1,1);
+#endif
+
 	rb_define_method(rb_cWXSpinCtrl,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_attr_method(rb_cWXSpinCtrl,"value",_getValue,_setValue);
@@ -123,6 +128,8 @@ DLL_LOCAL void Init_WXSpinCtrl(VALUE rb_mWX)
 	rb_define_attr_method(rb_cWXSpinCtrl,"max",_GetMax,_setMax);
 
 	registerInfo<wxSpinCtrl>(rb_cWXSpinCtrl);
+
+	registerEventType("spinctrl", wxEVT_SPINCTRL,rb_cWXSpinEvent);
 #endif
 
 }

data/ext/wxSpinCtrlDouble.cpp

@@ -0,0 +1,161 @@
+/*
+ * wxSpinCtrlDouble.cpp
+ *
+ *  Created on: 18.10.2014
+ *      Author: hanmac
+ */
+
+
+#include "wxSpinCtrlDouble.hpp"
+#include "wxNotifyEvent.hpp"
+
+VALUE rb_cWXSpinCtrlDouble, rb_cWXSpinDoubleEvent;
+
+#if wxUSE_SPINCTRL
+#define _self unwrap<wxSpinCtrlDouble*>(self)
+
+namespace RubyWX {
+namespace SpinCtrlDouble {
+
+macro_attr(Value,double)
+macro_attr(Increment,double)
+macro_attr(Digits,int)
+
+singlereturn(GetMax)
+singlereturn(GetMin)
+
+DLL_LOCAL VALUE _setMin(VALUE self,VALUE val)
+{
+	rb_check_frozen(self);
+	_self->SetRange(NUM2DBL(val),_self->GetMax());
+	return val;
+}
+
+DLL_LOCAL VALUE _setMax(VALUE self,VALUE val)
+{
+	rb_check_frozen(self);
+	_self->SetRange(_self->GetMin(), NUM2DBL(val));
+	return val;
+}
+
+APP_PROTECT(wxSpinCtrlDouble)
+
+/*
+ * call-seq:
+ *   SpinCtrlDouble.new(parent, name, [options])
+ *   SpinCtrlDouble.new(parent, [options])
+ *
+ * creates a new SpinCtrlDouble 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:
+ *   * min Float
+ *   * max Float
+ *   * value Float
+ *
+*/
+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(hash,rb_cHash))
+	{
+		wxWindowID id(wxID_ANY);
+		double value(0), min(0), max(100), inc(1);
+
+		long style(wxSP_ARROW_KEYS | wxALIGN_RIGHT);
+
+		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,"min",min);
+			set_hash_option(hash,"max",max);
+			set_hash_option(hash,"increment",inc);
+			set_hash_option(hash,"style",style);
+		}
+
+		if(nil_check(parent)) {
+			_self->Create(unwrap<wxWindow*>(parent),id,
+				wxEmptyString,wxDefaultPosition,wxDefaultSize,
+				style,min,max,value,inc
+			);
+		}
+	}
+
+	rb_call_super(argc,argv);
+
+	return self;
+}
+
+
+namespace Event
+{
+#undef _self
+#define _self unwrap<wxSpinDoubleEvent*>(self)
+macro_attr(Value,double)
+}
+
+
+}
+}
+#endif
+
+/* Document-attr: value
+ * the value of the SpinCtrlDouble. Integer
+ */
+/* Document-attr: min
+ * the minimum value of the SpinCtrlDouble. Integer
+ */
+/* Document-attr: max
+ * the maximum value of the SpinCtrlDouble. Integer
+ */
+
+DLL_LOCAL void Init_WXSpinCtrlDouble(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);
+#endif
+
+#if wxUSE_SPINCTRL
+	using namespace RubyWX::SpinCtrlDouble;
+	rb_cWXSpinCtrlDouble = rb_define_class_under(rb_mWX,"SpinCtrlDouble",rb_cWXControl);
+	rb_define_alloc_func(rb_cWXSpinCtrlDouble,_alloc);
+
+	rb_cWXSpinDoubleEvent = rb_define_class_under(rb_cWXEvent,"SpinDouble",rb_cWXNotifyEvent);
+
+
+#if 0
+	rb_define_attr(rb_cWXSpinCtrlDouble,"value",1,1);
+	rb_define_attr(rb_cWXSpinCtrlDouble,"increment",1,1);
+	rb_define_attr(rb_cWXSpinCtrlDouble,"digits",1,1);
+	rb_define_attr(rb_cWXSpinCtrlDouble,"min",1,1);
+	rb_define_attr(rb_cWXSpinCtrlDouble,"max",1,1);
+
+	rb_define_attr(rb_cWXSpinDoubleEvent,"value",1,1);
+
+#endif
+
+	rb_define_method(rb_cWXSpinCtrlDouble,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
+
+	rb_define_attr_method(rb_cWXSpinCtrlDouble,"value",_getValue,_setValue);
+	rb_define_attr_method(rb_cWXSpinCtrlDouble,"increment",_getIncrement,_setIncrement);
+	rb_define_attr_method(rb_cWXSpinCtrlDouble,"digits",_getDigits,_setDigits);
+	rb_define_attr_method(rb_cWXSpinCtrlDouble,"min",_GetMin,_setMin);
+	rb_define_attr_method(rb_cWXSpinCtrlDouble,"max",_GetMax,_setMax);
+
+	rb_define_attr_method(rb_cWXSpinDoubleEvent,"value",Event::_getValue,Event::_setValue);
+
+	registerInfo<wxSpinCtrlDouble>(rb_cWXSpinCtrlDouble);
+#endif
+
+}
+
+
+
+

data/ext/wxSpinCtrlDouble.hpp

@@ -0,0 +1,21 @@
+/*
+ * wxSpinCtrlDouble.hpp
+ *
+ *  Created on: 18.10.2014
+ *      Author: hanmac
+ */
+
+#ifndef WXSPINCTRLDOUBLE_HPP_
+#define WXSPINCTRLDOUBLE_HPP_
+
+#include "wxControl.hpp"
+
+extern VALUE rb_cWXSpinCtrlDouble;
+
+DLL_LOCAL void Init_WXSpinCtrlDouble(VALUE rb_mWX);
+#if wxUSE_SPINCTRL
+#include <wx/spinctrl.h>
+
+#endif
+
+#endif /* WXSPINCTRLDOUBLE_HPP_ */

data/ext/wxStaticBitmap.cpp

@@ -47,7 +47,9 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_option(hash,"bitmap",bitmap);
 		}
 
-		_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/wxStaticBitmapBase.cpp

@@ -29,13 +29,15 @@ DLL_LOCAL void Init_WXStaticBitmapBase(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_cWXStaticBitmapBase,"bitmap",1,1);
 #endif
 #if wxUSE_STATBMP
 	using namespace RubyWX::StaticBitmapBase;
 	rb_cWXStaticBitmapBase = rb_define_class_under(rb_mWX,"StaticBitmapBase",rb_cWXControl);
 
+#if 0
+	rb_define_attr(rb_cWXStaticBitmapBase,"bitmap",1,1);
+#endif
+
 	rb_define_attr_method(rb_cWXStaticBitmapBase,"bitmap",_getBitmap,_setBitmap);
 
 #endif

data/ext/wxStaticBitmapGeneric.cpp

@@ -47,7 +47,9 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_option(hash,"bitmap",bitmap);
 		}
 
-		_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/wxStaticBox.cpp

@@ -44,7 +44,9 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_option(hash,"label",label);
 		}
 
-		_self->Create(unwrap<wxWindow*>(parent),id,label);
+		if(nil_check(parent)) {
+			_self->Create(unwrap<wxWindow*>(parent),id,label);
+		}
 
 	}
 
@@ -54,11 +56,10 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 
 DLL_LOCAL VALUE _GetContainingSizer(VALUE self)
 {
-	wxSizer * result = _self->GetContainingSizer();
-	if(result)
-		return wrap(result);
-	else
-		return wrap(dynamic_cast<wxBoxSizer*>(new wxStaticBoxSizer(_self,wxHORIZONTAL)));
+	wxSizer *result = _self->GetContainingSizer();
+	if(!result)
+		result = new wxStaticBoxSizer(_self,wxHORIZONTAL);
+	return wrap(result);
 }
 
 }

data/ext/wxStaticLine.cpp

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

data/ext/wxStaticText.cpp

@@ -48,7 +48,11 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_option(hash,"style",style);
 		}
 
-		_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);

data/ext/wxStatusBar.cpp

@@ -53,7 +53,9 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_flag_option(hash,"show_tips",wxSTB_SHOW_TIPS,style);
 		}
 
-		_self->Create(unwrap<wxWindow*>(parent),id,style);
+		if(nil_check(parent)) {
+			_self->Create(unwrap<wxWindow*>(parent),id,style);
+		}
 	}
 	rb_call_super(argc,argv);
 	return self;
@@ -357,23 +359,26 @@ DLL_LOCAL void Init_WXStatusBar(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);
+#endif
+#if wxUSE_STATUSBAR
+	using namespace RubyWX::StatusBar;
+	rb_cWXStatusBar = rb_define_class_under(rb_mWX,"StatusBar",rb_cWXControl);
+	rb_define_alloc_func(rb_cWXStatusBar,_alloc);
 
+	rb_cWXStatusBarPane = rb_define_class_under(rb_cWXStatusBar,"Pane",rb_cObject);
+	rb_undef_alloc_func(rb_cWXStatusBarPane);
+
+#if 0
 	rb_define_attr(rb_cWXStatusBar,"status_text",1,1);
 	rb_define_attr(rb_cWXStatusBar,"fields_count",1,1);
 
 	rb_define_attr(rb_cWXStatusBarPane,"width",1,1);
 	rb_define_attr(rb_cWXStatusBarPane,"style",1,1);
 	rb_define_attr(rb_cWXStatusBarPane,"text",1,1);
-
 #endif
-#if wxUSE_STATUSBAR
-	using namespace RubyWX::StatusBar;
-	rb_cWXStatusBar = rb_define_class_under(rb_mWX,"StatusBar",rb_cWXControl);
-	rb_define_alloc_func(rb_cWXStatusBar,_alloc);
 
 	rb_define_method(rb_cWXStatusBar,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
-
 	rb_define_attr_method(rb_cWXStatusBar,"status_text",_getStatusText,_setStatusText);
 	rb_define_attr_method(rb_cWXStatusBar,"fields_count",_getFieldsCount,_setFieldsCount);
 
@@ -391,9 +396,6 @@ DLL_LOCAL void Init_WXStatusBar(VALUE rb_mWX)
 
 	rb_define_method(rb_cWXStatusBar,"each_statuspane",RUBY_METHOD_FUNC(_each),0);
 
-	rb_cWXStatusBarPane = rb_define_class_under(rb_cWXStatusBar,"Pane",rb_cObject);
-	rb_undef_alloc_func(rb_cWXStatusBarPane);
-
 	using namespace Pane;
 	rb_define_attr_method(rb_cWXStatusBarPane,"width",_getWidth,_setWidth);
 	rb_define_attr_method(rb_cWXStatusBarPane,"style",_getStyle,_setStyle);

data/ext/wxTaskBar.cpp

@@ -65,10 +65,6 @@ DLL_LOCAL void Init_WXTaskBar(VALUE rb_mWX)
 {
 #if wxUSE_TASKBARICON
 #if 0
-	rb_define_attr(rb_cWXTaskBar,"menu",1,1);
-	rb_define_attr(rb_cWXTaskBar,"icon",1,1);
-	rb_define_attr(rb_cWXTaskBar,"tooltip",1,1);
-
 	rb_mWXEvtHandler = rb_define_module_under(rb_mWX,"EvtHandler");
 #endif
 	using namespace RubyWX::TaskBar;
@@ -76,6 +72,12 @@ DLL_LOCAL void Init_WXTaskBar(VALUE rb_mWX)
 	rb_cWXTaskBar = rb_define_class_under(rb_mWX,"TaskBar",rb_cObject);
 	rb_define_alloc_func(rb_cWXTaskBar,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXTaskBar,"menu",1,1);
+	rb_define_attr(rb_cWXTaskBar,"icon",1,1);
+	rb_define_attr(rb_cWXTaskBar,"tooltip",1,1);
+#endif
+
 	rb_undef_method(rb_cWXTaskBar,"initialize_copy");
 	rb_undef_method(rb_cWXTaskBar,"_load");
 	rb_undef_method(rb_cWXTaskBar,"_dump");

data/ext/wxTextCtrl.cpp

@@ -75,7 +75,11 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_style_flags(hash,style);
 		}
 
-		_self->Create(unwrap<wxWindow*>(parent),id,value,wxDefaultPosition,wxDefaultSize,style);
+		if(nil_check(parent)) {
+			_self->Create(unwrap<wxWindow*>(parent),id,value,
+				wxDefaultPosition,wxDefaultSize,style
+			);
+		}
 	}
 
 	rb_call_super(argc,argv);
@@ -141,8 +145,6 @@ DLL_LOCAL void Init_WXTextCtrl(VALUE rb_mWX)
 
 	rb_mWXTextArea = rb_define_module_under(rb_mWX,"TextArea");
 	rb_mWXTextEntry = rb_define_module_under(rb_mWX,"TextEntry");
-
-	rb_define_attr(rb_cWXTextCtrl,"value",1,1);
 #endif
 
 #if wxUSE_TEXTCTRL
@@ -150,6 +152,10 @@ DLL_LOCAL void Init_WXTextCtrl(VALUE rb_mWX)
 	rb_cWXTextCtrl = rb_define_class_under(rb_mWX,"TextCtrl",rb_cWXControl);
 	rb_define_alloc_func(rb_cWXTextCtrl,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXTextCtrl,"value",1,1);
+#endif
+
 	rb_include_module(rb_cWXTextCtrl,rb_mWXTextArea);
 	rb_include_module(rb_cWXTextCtrl,rb_mWXTextEntry);