rwx 0.0.1.dev → 0.0.1.1.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7daea4298f8fa4179a561773567028921b532dfa
-  data.tar.gz: 086761364b235c6e588cdccfe7642861dc17b2f7
+  metadata.gz: 62bb4050b38b7f1e7b288cedacfddd13ee25c63e
+  data.tar.gz: eb494f8e224d34094cd6667e993f2d86736cb011
 SHA512:
-  metadata.gz: 5b613965f1aeb188536fa7ad27cb6b9dca2d69a2bcf0283c6cc23339414335142d6a8c4e2c39372aab544a5b2c5dc94dbb272b81733d2367b68238f9810c65c4
-  data.tar.gz: 0ee62eed5e4e037f9f88f171de4fbdb85bfbed0656887a02f01fb1b0dcbf5cbc77b356d6ff102e309a6718751b8346596d6d133a359e7071544bab82f7ccf452
+  metadata.gz: c67e8df721c80d812e545a0d7639c3677d6279c2bc2a20ba06fe016419e0a97ce9418da845f890ed2eb7c74f9d4ac2b123c623449f9a5be4042f14a48678607c
+  data.tar.gz: d779255587399de39fc5d014d07f19e932b4d4a528af0e1acc1451722e1b3298a4a9e207179e0540c785eacfa2c3bc7f7c528437585d57cbec66e2b68ee97f1d

data/.gitignore

@@ -47,3 +47,6 @@ tmp
 _yardoc
 doc/
 /Debug
+
+#old and tested data
+old_ext/

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/Rakefile

@@ -7,6 +7,11 @@ require "rake/testtask"
 require "rubygems/package_task"
 require "rdoc/task"
 
+begin
+require "rspec/core/rake_task"
+rescue LoadError
+end
+
 begin
 require 'rake/extensiontask'
 rescue LoadError
@@ -56,6 +61,9 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
+RSpec::Core::RakeTask.new if Object.const_defined?(:RSpec)
+
+
 RDoc::Task.new do |rdoc|
   rdoc.title = "rwx RDocs"
   rdoc.main = "README.rdoc"

data/VERSION

@@ -1 +1 @@
-0.0.1-dev
+0.0.1.1-dev

data/ext/extconf.rb

@@ -88,10 +88,14 @@ if(wx_config = find_executable('wx-config'))
 		have_member_func("wxFontPickerCtrl","GetSelectedColour","wx/fontpicker.h")
 		have_member_func("wxInfoBar","GetButtonCount","wx/infobar.h")
 		
+    have_member_func("wxOwnerDrawnComboBox","IsListEmpty","wx/odcombo.h")
+		
 		#check for enum flags
 		have_const("wxFD_NO_FOLLOW","wx/filedlg.h")
 		have_const("wxDIRCTRL_DEFAULT_STYLE",["wx/wx.h", "wx/dirctrl.h"])
-		
+		have_func("wxDirCtrl()",["wx/wx.h", "wx/dirctrl.h"])
+    have_const("wxSTC_LEX_DMAP",["wx/wx.h", "wx/stc/stc.h"])
+    
 	}
 else
 		abort("wx-config executable not found!")

data/ext/main.cpp

@@ -113,12 +113,12 @@ rb_data_type_t* unwrapDataType(const VALUE& klass)
 }
 
 
-VALUE wrapTypedPtr(void *arg,VALUE klass)
+VALUE wrapTypedPtr(void *arg,VALUE klass, bool allowNull)
 {
-	if(arg){
+	if(arg || allowNull){
 		rb_data_type_t* datatype = unwrapDataType(klass);
 		if(!datatype)
-			rb_fatal("%s unknown datatype",rb_class2name(klass));
+			rb_fatal("%"PRIsVALUE" unknown datatype", klass);
 
 		return TypedData_Wrap_Struct(klass, datatype, arg);
 	}

data/ext/main.hpp

@@ -94,7 +94,7 @@ extern VALUE global_holder;
 void rwx_refobject(VALUE object);
 bool rwx_unrefobject(VALUE object);
 
-VALUE wrapTypedPtr(void *arg,VALUE klass);
+VALUE wrapTypedPtr(void *arg,VALUE klass, bool allowNull = false);
 VALUE wrapTypedPtr(wxObject *object,VALUE klass);
 VALUE wrapTypedPtr(wxEvtHandler *handler,VALUE klass);
 
@@ -377,6 +377,30 @@ DLL_LOCAL bool set_hash_option(VALUE hash,const char* name,T& val,T func(const V
 
 }
 
+template <typename C, typename T>
+DLL_LOCAL bool set_hash_option(VALUE hash,const char* name,void (C::*set)(const T&), C& obj,T func(const VALUE&) = unwrap<T> )
+{
+	T val;
+	bool result = set_hash_option(hash,name,val,func);
+	if(result) {
+		(obj.*set)(val);
+	}
+	return result;
+
+}
+template <typename C, typename T>
+DLL_LOCAL bool set_hash_option(VALUE hash,const char* name,void (C::*set)(T), C& obj,T func(const VALUE&) = unwrap<T> )
+{
+	T val;
+	bool result = set_hash_option(hash,name,val,func);
+	if(result) {
+		(obj.*set)(val);
+	}
+	return result;
+
+}
+
+
 DLL_LOCAL bool set_hash_flag_option(VALUE hash,const char* name,const int& flag,int& val);
 
 #define macro_attr(attr,type) macro_attr_func(attr,Get##attr(),Set##attr,wrap,unwrap<type>,true)
@@ -438,6 +462,15 @@ DLL_LOCAL VALUE _##func(VALUE self)\
 	return wrap(_self->func());\
 }
 
+#define singlereturn_array(func,T) \
+DLL_LOCAL VALUE _##func(VALUE self)\
+{\
+	T ary;\
+	_self->func(ary);\
+	return wrap(ary);\
+}
+
+
 #define singlereturn_frozen(func) \
 DLL_LOCAL VALUE _##func(VALUE self)\
 {\

data/ext/rwx.cpp

@@ -112,12 +112,15 @@
 
 #include "wxChoice.hpp"
 #include "wxComboBox.hpp"
+#include "wxComboCtrl.hpp"
+#include "wxOwnerDrawnComboBox.hpp"
 #include "wxBitmapComboBox.hpp"
 
 #include "wxSlider.hpp"
 
 #include "wxSpinButton.hpp"
 #include "wxSpinCtrl.hpp"
+#include "wxSpinCtrlDouble.hpp"
 
 #include "wxTextArea.hpp"
 #include "wxTextEntry.hpp"
@@ -146,6 +149,7 @@
 #include "wxFileCtrlBase.hpp"
 #include "wxFileCtrl.hpp"
 #include "wxFileCtrlGeneric.hpp"
+#include "wxDirCtrl.hpp"
 
 #include "wxCalendarCtrlBase.hpp"
 #include "wxCalendarCtrl.hpp"
@@ -207,6 +211,8 @@
 
 #include "wxPreferences.hpp"
 
+#include <wx/apptrait.h>
+
 VALUE rb_mWX;
 
 void rb_define_attr_method(VALUE klass,std::string name,VALUE(get)(VALUE),VALUE(set)(VALUE,VALUE))
@@ -314,6 +320,7 @@ extern "C" void Init_rwx()
 	Init_WXFileCtrlBase(rb_mWX);
 	Init_WXFileCtrl(rb_mWX);
 	Init_WXFileCtrlGeneric(rb_mWX);
+	Init_WXDirCtrl(rb_mWX);
 
 	Init_WXCalendarCtrlBase(rb_mWX);
 	Init_WXCalendarCtrl(rb_mWX);
@@ -338,6 +345,7 @@ extern "C" void Init_rwx()
 	Init_WXSlider(rb_mWX);
 	Init_WXSpinButton(rb_mWX);
 	Init_WXSpinCtrl(rb_mWX);
+	Init_WXSpinCtrlDouble(rb_mWX);
 
 	Init_WXHyperLink(rb_mWX);
 
@@ -379,6 +387,8 @@ extern "C" void Init_rwx()
 
 	Init_WXChoice(rb_mWX);
 	Init_WXComboBox(rb_mWX);
+	Init_WXComboCtrl(rb_mWX);
+	Init_WXOwnerDrawnComboBox(rb_mWX);
 	Init_WXBitmapComboBox(rb_mWX);
 
 	Init_WXTreeCtrl(rb_mWX);
@@ -469,4 +479,11 @@ extern "C" void Init_rwx()
 		->add(wxICON_ASTERISK,"asterisk")
 		->allow_array = false;
 
+/*
+	int min,max;
+	wxString port(wxPlatformInfo::GetPortIdName(wxGUIAppTraits().GetToolkitVersion(&min,&max), false));
+
+	rb_warn("%s %d.%d", port.c_str().AsChar(), min, max);
+//*/
+
 }

data/ext/wxAnyButton.cpp

@@ -108,7 +108,14 @@ DLL_LOCAL void Init_WXAnyButton(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);
+#endif
 
+#ifdef wxHAS_ANY_BUTTON
+	using namespace RubyWX::AnyButton;
+	rb_cWXAnyButton = rb_define_class_under(rb_mWX,"AnyButton",rb_cWXControl);
+	rb_undef_alloc_func(rb_cWXAnyButton);
+
+#if 0
 	rb_define_attr(rb_cWXAnyButton,"bitmap_label",1,1);
 	rb_define_attr(rb_cWXAnyButton,"bitmap_pressed",1,1);
 	rb_define_attr(rb_cWXAnyButton,"bitmap_disabled",1,1);
@@ -116,14 +123,8 @@ DLL_LOCAL void Init_WXAnyButton(VALUE rb_mWX)
 	rb_define_attr(rb_cWXAnyButton,"bitmap_focus",1,1);
 	rb_define_attr(rb_cWXAnyButton,"bitmap_selected",1,1);
 	rb_define_attr(rb_cWXAnyButton,"bitmap_hover",1,1);
-
 #endif
 
-#ifdef wxHAS_ANY_BUTTON
-	using namespace RubyWX::AnyButton;
-	rb_cWXAnyButton = rb_define_class_under(rb_mWX,"AnyButton",rb_cWXControl);
-	rb_undef_alloc_func(rb_cWXAnyButton);
-
 	rb_define_method(rb_cWXAnyButton,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_attr_method(rb_cWXAnyButton,"bitmap_label",_getBitmapLabel,_setBitmapLabel);

data/ext/wxApp.cpp

@@ -53,7 +53,7 @@ public:
 void app_protected()
 {
 	if(!ruby_app_inited)
-		rb_raise(rb_eArgError,"%s is not running.",rb_class2name(rb_cWXApp));\
+		rb_raise(rb_eArgError,"%"PRIsVALUE" is not running.",rb_cWXApp);
 }
 
 

data/ext/wxApp.hpp

@@ -42,7 +42,7 @@ void app_protected();
 #define APP_PROTECT_NULL DLL_LOCAL VALUE _alloc(VALUE self)\
 {\
 	app_protected();\
-	return wrapTypedPtr((void*)NULL,self);\
+	return wrapTypedPtr((void*)NULL,self, true);\
 }
 
 #endif /* WXAPP_HPP_ */

data/ext/wxAuiBook.cpp

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

data/ext/wxAuiPane.cpp

@@ -241,6 +241,13 @@ DLL_LOCAL VALUE _setMaximized(VALUE self, VALUE val)
 
 DLL_LOCAL void Init_WXAuiPane(VALUE rb_mWX)
 {
+
+#if wxUSE_AUI
+	using namespace RubyWX::AuiPane;
+	rb_cWXAuiPane = rb_define_class_under(rb_mWX,"AuiPane",rb_cObject);
+	rb_define_alloc_func(rb_cWXAuiPane,_alloc);
+	//rb_define_method(rb_cWXAuiManager,"[]=",RUBY_METHOD_FUNC(_set),2);
+
 #if 0
 	rb_define_attr(rb_cWXAuiPane,"caption",1,1);
 	rb_define_attr(rb_cWXAuiPane,"name",1,1);
@@ -282,12 +289,6 @@ DLL_LOCAL void Init_WXAuiPane(VALUE rb_mWX)
 
 #endif
 
-#if wxUSE_AUI
-	using namespace RubyWX::AuiPane;
-	rb_cWXAuiPane = rb_define_class_under(rb_mWX,"AuiPane",rb_cObject);
-	rb_define_alloc_func(rb_cWXAuiPane,_alloc);
-	//rb_define_method(rb_cWXAuiManager,"[]=",RUBY_METHOD_FUNC(_set),2);
-
 	rb_define_attr_method(rb_cWXAuiPane,"caption",_get_caption,_set_caption);
 	rb_define_attr_method(rb_cWXAuiPane,"name",_get_name,_set_name);
 	rb_define_attr_method(rb_cWXAuiPane,"icon",_get_icon,_set_icon);

data/ext/wxBitmap.cpp

@@ -5,8 +5,9 @@
  *      Author: hanmac
  */
 
-
+#include "wxApp.hpp"
 #include "wxBitmap.hpp"
+#include "wxColor.hpp"
 #include "wxPalette.hpp"
 #include "wxDC.hpp"
 #include <map>
@@ -14,7 +15,7 @@
 
 #define _self unwrap<wxBitmap*>(self)
 
-VALUE rb_cWXBitmap;
+VALUE rb_cWXBitmap, rb_cWXMask;
 
 typedef std::map<wxWindowID,wxArtID> WindowArt;
 WindowArt windowArtHolder;
@@ -136,24 +137,42 @@ macro_attr(Height,int)
 macro_attr(Width,int)
 macro_attr(Depth,int)
 
-macro_attr(Mask,wxMask*)
+singlereturn(GetMask)
+
 #if wxUSE_PALETTE
 macro_attr(Palette,wxPalette)
 #endif
 
+DLL_LOCAL VALUE _setMask(VALUE self, VALUE val) {
+	if(rb_obj_is_kind_of(val, rb_cWXMask))
+		_self->SetMask(unwrap<wxMask*>(val));
+	else if(is_wrapable<wxColor>(val))
+		_self->SetMask(new wxMask(*_self, unwrap<wxColor>(val)));
+#if wxUSE_PALETTE
+	else if(FIXNUM_P(val))
+		_self->SetMask(new wxMask(*_self, NUM2INT(val)));
+#endif
+	else
+		_self->SetMask(new wxMask(unwrap<wxBitmap>(val)));
+	return val;
+}
+
 DLL_LOCAL VALUE _alloc(VALUE self) {
-	return wrap(new wxBitmap);
+	return wrapTypedPtr(new wxBitmap, self);
 }
 
 DLL_LOCAL VALUE _draw(VALUE self)
 {
+	app_protected();
+	rb_check_frozen(self);
+
 	wxDC *dc;
 	wxMemoryDC *mdc = new wxMemoryDC;
 	mdc->SelectObject(*_self);
 #if wxUSE_GRAPHICS_CONTEXT
 	dc = new wxGCDC(*mdc);
 #else
-	dc = &mdc;
+	dc = mdc;
 #endif
 	rb_yield(wrap(dc));
 	mdc->SelectObject(wxNullBitmap);
@@ -284,11 +303,17 @@ DLL_LOCAL void Init_WXBitmap(VALUE rb_mWX)
 	rb_define_method(rb_cWXBitmap,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 	rb_define_private_method(rb_cWXBitmap,"initialize_copy",RUBY_METHOD_FUNC(_initialize_copy),1);
 
+	rb_define_attr_method(rb_cWXBitmap,"height",_getHeight,_setHeight);
+	rb_define_attr_method(rb_cWXBitmap,"width",_getWidth,_setWidth);
+	rb_define_attr_method(rb_cWXBitmap,"depth",_getDepth,_setDepth);
+
+	rb_define_attr_method(rb_cWXBitmap,"mask",_GetMask,_setMask);
+
 #if wxUSE_IMAGE
 	rb_define_method(rb_cWXBitmap,"to_image",RUBY_METHOD_FUNC(_to_image),0);
 
 	rb_define_method(rb_cWXBitmap,"marshal_dump",RUBY_METHOD_FUNC(_marshal_dump),0);
-	rb_define_method(rb_cWXBitmap,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),1);
+	rb_define_method(rb_cWXBitmap,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),-2);
 #else
 	rb_undef_method(rb_cWXBitmap,"_load");
 	rb_undef_method(rb_cWXBitmap,"_dump");
@@ -298,10 +323,21 @@ DLL_LOCAL void Init_WXBitmap(VALUE rb_mWX)
 	rb_define_attr_method(rb_cWXBitmap,"palette",_getPalette,_setPalette);
 #endif
 
+	rb_define_method(rb_cWXBitmap,"draw",RUBY_METHOD_FUNC(_draw),0);
+
 	rb_define_method(rb_cWXBitmap,"to_bitmap",RUBY_METHOD_FUNC(_to_bitmap),0);
 
 	rb_define_method(rb_cWXBitmap,"save_file",RUBY_METHOD_FUNC(_save_file),-1);
 
+	registerInfo<wxBitmap>(rb_cWXBitmap);
+
+	rb_cWXMask = rb_define_class_under(rb_mWX,"Mask",rb_cObject);
+	rb_undef_alloc_func(rb_cWXMask);
+	rb_undef_method(rb_cWXMask,"initialize_copy");
+	rb_undef_method(rb_cWXMask,"_load");
+	rb_undef_method(rb_cWXMask,"_dump");
+
+	registerInfo<wxMask>(rb_cWXMask);
 
 	registerArtID("folder",wxART_FOLDER);
 

data/ext/wxBitmapButton.cpp

@@ -45,8 +45,9 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			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/wxBitmapComboBox.cpp

@@ -28,8 +28,19 @@ singlefunc(Clear)
 singlefunc(Popup)
 singlefunc(Dismiss)
 
+#if defined(wxBITMAPCOMBOBOX_OWNERDRAWN_BASED) && !defined(HAVE_WXOWNERDRAWNCOMBOBOX_ISLISTEMPTY)
+DLL_LOCAL VALUE _IsListEmpty(VALUE self)
+{
+	return wrap(dynamic_cast<wxItemContainer*>(_self)->IsEmpty());
+}
+DLL_LOCAL VALUE _IsTextEmpty(VALUE self)
+{
+	return wrap(dynamic_cast<wxTextEntry*>(_self)->IsEmpty());
+}
+#else
 singlereturn(IsListEmpty)
 singlereturn(IsTextEmpty)
+#endif
 
 /*
  * call-seq:
@@ -70,15 +81,17 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			Choice::set_style_flags(hash,style);
 			TextCtrl::set_style_flags(hash,style);
 		}
-		_self->Create(
-			unwrap<wxWindow*>(parent),id,value,
-			wxDefaultPosition,wxDefaultSize,
-			choices,style
-		);
 		
-		if(selflag && check_index(selection,_self->GetCount()))
-			_self->SetSelection(selection);
-
+		if(nil_check(parent)) {
+			_self->Create(
+				unwrap<wxWindow*>(parent),id,value,
+				wxDefaultPosition,wxDefaultSize,
+				choices,style
+			);
+
+			if(selflag && check_index(selection,_self->GetCount()))
+				_self->SetSelection(selection);
+		}
 	}
 
 	rb_call_super(argc,argv);
@@ -252,14 +265,15 @@ DLL_LOCAL void Init_WXBitmapComboBox(VALUE rb_mWX)
 	rb_define_method(rb_cWXBitmapComboBox,"popup",RUBY_METHOD_FUNC(_Popup),0);
 	rb_define_method(rb_cWXBitmapComboBox,"dismiss",RUBY_METHOD_FUNC(_Dismiss),0);
 
+
+	rb_include_module(rb_cWXBitmapComboBox,rb_mWXItemContainer);
+	rb_include_module(rb_cWXBitmapComboBox,rb_mWXTextEntry);
+
 	rb_undef_method(rb_cWXBitmapComboBox,"empty?");
 
 	rb_define_method(rb_cWXBitmapComboBox,"list_empty?",RUBY_METHOD_FUNC(_IsListEmpty),0);
 	rb_define_method(rb_cWXBitmapComboBox,"text_empty?",RUBY_METHOD_FUNC(_IsTextEmpty),0);
 
-	rb_include_module(rb_cWXBitmapComboBox,rb_mWXItemContainer);
-	rb_include_module(rb_cWXBitmapComboBox,rb_mWXTextEntry);
-
 	rb_define_method(rb_cWXBitmapComboBox,"get_item_bitmap",RUBY_METHOD_FUNC(_getItemBitmap),1);
 	rb_define_method(rb_cWXBitmapComboBox,"set_item_bitmap",RUBY_METHOD_FUNC(_setItemBitmap),2);
 	rb_define_method(rb_cWXBitmapComboBox,"each_item_bitmap",RUBY_METHOD_FUNC(_each_bitmap),0);