rwx 0.0.1.dev → 0.0.1.1.dev

data/ext/wxTextEntry.cpp

@@ -11,6 +11,7 @@
 #include "wxSearchCtrl.hpp"
 #include "wxBitmapComboBox.hpp"
 #include "wxComboBox.hpp"
+#include "wxComboCtrl.hpp"
 #include "wxSTC.hpp"
 #include "wxPoint.hpp"
 
@@ -39,6 +40,10 @@ wxTextEntryBase* unwrap< wxTextEntryBase* >(const VALUE &obj)
 	if(rb_obj_is_kind_of(obj,rb_cWXComboBox))
 		return unwrap<wxComboBox*>(obj);
 #endif
+#if wxUSE_COMBOCTRL
+	if(rb_obj_is_kind_of(obj,rb_cWXComboCtrl))
+		return unwrap<wxComboCtrl*>(obj);
+#endif
 #if wxUSE_STC
 	if(rb_obj_is_kind_of(obj,rb_cWXSTC))
 		return unwrap<wxStyledTextCtrl*>(obj);
@@ -214,15 +219,15 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
  */
 DLL_LOCAL void Init_WXTextEntry(VALUE rb_mWX)
 {
+	using namespace RubyWX::TextEntry;
+	rb_mWXTextEntry = rb_define_module_under(rb_mWX,"TextEntry");
+
 #if 0
 	rb_define_attr(rb_mWXTextEntry,"hint",1,1);
 	rb_define_attr(rb_mWXTextEntry,"editable",1,1);
 	rb_define_attr(rb_mWXTextEntry,"margins",1,1);
 #endif
 
-	using namespace RubyWX::TextEntry;
-	rb_mWXTextEntry = rb_define_module_under(rb_mWX,"TextEntry");
-
 	rb_define_method(rb_mWXTextEntry,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_method(rb_mWXTextEntry,"cut",RUBY_METHOD_FUNC(_Cut),0);

data/ext/wxTimePicker.cpp

@@ -49,12 +49,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);
@@ -84,8 +85,6 @@ DLL_LOCAL void Init_WXTimePicker(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_cWXTimePicker,"value",1,1);
 #endif
 
 #if wxUSE_TIMEPICKCTRL
@@ -93,6 +92,10 @@ DLL_LOCAL void Init_WXTimePicker(VALUE rb_mWX)
 	rb_cWXTimePicker = rb_define_class_under(rb_mWX,"TimePicker",rb_cWXControl);
 	rb_define_alloc_func(rb_cWXTimePicker,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXTimePicker,"value",1,1);
+#endif
+
 	rb_define_method(rb_cWXTimePicker,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_attr_method(rb_cWXTimePicker,"value",_getValue,_setValue);

data/ext/wxTimer.cpp

@@ -66,8 +66,6 @@ singlereturn(GetInterval)
 DLL_LOCAL void Init_WXTimer(VALUE rb_mWX)
 {
 #if 0
-	rb_define_attr(rb_cWXTimer,"owner",1,1);
-
 	rb_mWXEvtHandler = rb_define_module_under(rb_mWX,"EvtHandler");
 #endif
 
@@ -77,6 +75,10 @@ DLL_LOCAL void Init_WXTimer(VALUE rb_mWX)
 	rb_cWXTimer = rb_define_class_under(rb_mWX,"Timer",rb_cObject);
 	rb_define_alloc_func(rb_cWXTimer,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXTimer,"owner",1,1);
+#endif
+
 	rb_undef_method(rb_cWXTimer,"initialize_copy");
 	rb_undef_method(rb_cWXTimer,"_load");
 	rb_undef_method(rb_cWXTimer,"_dump");

data/ext/wxToggleButton.cpp

@@ -45,7 +45,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);
+		}
 		
 	}
 

data/ext/wxToolBar.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,wxDefaultPosition,wxDefaultSize,style);
+		if(nil_check(parent)) {
+			_self->Create(unwrap<wxWindow*>(parent),id,
+				wxDefaultPosition,wxDefaultSize,style
+			);
+		}
 	}
 
 	rb_call_super(argc,argv);

data/ext/wxToolBarTool.cpp

@@ -127,7 +127,16 @@ DLL_LOCAL void Init_WXToolBarTool(VALUE rb_mWX)
 {
 #if 0
 	rb_cWXToolBarBase = rb_define_class_under(rb_mWX,"ToolBarBase",rb_cWXControl);
+#endif
+
+#if wxUSE_TOOLBAR
+	using namespace RubyWX::ToolBarTool;
+	rb_cWXToolBarTool = rb_define_class_under(rb_cWXToolBarBase,"Tool",rb_cObject);
 
+	//should that really have alloc?
+	rb_define_alloc_func(rb_cWXToolBarTool,_alloc);
+
+#if 0
 	rb_define_attr(rb_cWXToolBarTool,"normal_bitmap",1,1);
 	rb_define_attr(rb_cWXToolBarTool,"disabled_bitmap",1,1);
 
@@ -139,16 +148,8 @@ DLL_LOCAL void Init_WXToolBarTool(VALUE rb_mWX)
 	rb_define_attr(rb_cWXToolBarTool,"toggled",1,1);
 
 	rb_define_attr(rb_cWXToolBarTool,"dropdown_menu",1,1);
-
 #endif
 
-#if wxUSE_TOOLBAR
-	using namespace RubyWX::ToolBarTool;
-	rb_cWXToolBarTool = rb_define_class_under(rb_cWXToolBarBase,"Tool",rb_cObject);
-
-	//should that really have alloc?
-	rb_define_alloc_func(rb_cWXToolBarTool,_alloc);
-
 	rb_undef_method(rb_cWXToolBarTool,"initialize_copy");
 	rb_undef_method(rb_cWXToolBarTool,"_load");
 	rb_undef_method(rb_cWXToolBarTool,"_dump");

data/ext/wxToolBook.cpp

@@ -49,8 +49,11 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_option(hash,"id",id,unwrapID);
 			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/wxTreeBook.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/wxTreeCtrl.cpp

@@ -50,12 +50,13 @@ 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
+			);
+		}
 	}
 
 	rb_call_super(argc,argv);
@@ -331,7 +332,7 @@ VALUE RubyTreeCtrlItem::GetPrevSibling()
 void RubyTreeCtrlItem::checkDestroyed()
 {
 	if(!GetId().IsOk())
-		rb_raise(rb_eTypeError,"%s has been destroyed",rb_class2name(rb_cWXTreeCtrlItem));
+		rb_raise(rb_eTypeError,"%"PRIsVALUE" has been destroyed",rb_cWXTreeCtrlItem);
 }
 
 

data/ext/wxWindow.cpp

@@ -263,7 +263,9 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 #if wxUSE_XRC
 		if(!loadxrc(_self,name,unwrap<wxWindow*>(parent)))
 #endif
-		_self->Create(unwrap<wxWindow*>(parent),id);
+		if(nil_check(parent)) {
+			_self->Create(unwrap<wxWindow*>(parent),id);
+		}
 		
 	}
 

data/ext/wxWizard.cpp

@@ -270,20 +270,22 @@ DLL_LOCAL void Init_WXWizard(VALUE rb_mWX)
 	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_WIZARDDLG
+	using namespace RubyWX::Wizard;
+	rb_cWXWizard = rb_define_class_under(rb_mWX,"Wizard",rb_cWXDialog);
+	rb_define_alloc_func(rb_cWXWizard,_alloc);
+	rb_cWXWizardEvent = rb_define_class_under(rb_cWXEvent,"Wizard",rb_cWXNotifyEvent);
 
+#if 0
 	rb_define_attr(rb_cWXWizard, "bitmap",1,1);
 	rb_define_attr(rb_cWXWizard, "page_size",1,1);
 
 	rb_define_attr(rb_cWXWizardEvent, "direction",1,0);
 	rb_define_attr(rb_cWXWizardEvent, "page",1,0);
-
 #endif
 
-#if wxUSE_WIZARDDLG
-	using namespace RubyWX::Wizard;
-	rb_cWXWizard = rb_define_class_under(rb_mWX,"Wizard",rb_cWXDialog);
-	rb_define_alloc_func(rb_cWXWizard,_alloc);
-
 	rb_define_attr_method(rb_cWXWizard, "bitmap",_getBitmap,_setBitmap);
 	rb_define_attr_method(rb_cWXWizard, "page_size",_getPageSize,_setPageSize);
 
@@ -304,10 +306,8 @@ DLL_LOCAL void Init_WXWizard(VALUE rb_mWX)
 
 	registerInfo<wxWizard>(rb_cWXWizard);
 
-	rb_cWXWizardEvent = rb_define_class_under(rb_cWXEvent,"Wizard",rb_cWXNotifyEvent);
-
-	rb_define_method(rb_cWXWizardEvent,"direction",RUBY_METHOD_FUNC(Event::_GetDirection),0);
-	rb_define_method(rb_cWXWizardEvent,"page",RUBY_METHOD_FUNC(Event::_GetPage),0);
+	rb_define_attr_method(rb_cWXWizardEvent,"direction",Event::_GetDirection,NULL);
+	rb_define_attr_method(rb_cWXWizardEvent,"page",Event::_GetPage,NULL);
 
 	registerEventType("wizard_page_changed",wxEVT_WIZARD_PAGE_CHANGED,rb_cWXWizardEvent);
 	registerEventType("wizard_page_changing",wxEVT_WIZARD_PAGE_CHANGING,rb_cWXWizardEvent);

data/ext/wxWizardPage.cpp

@@ -79,9 +79,10 @@ 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))
-	{
-		_self->Create(unwrap<wxWizard*>(parent));
+	if(!_created && !rb_obj_is_kind_of(name,rb_cString)) {
+		if(nil_check(parent)) {
+			_self->Create(unwrap<wxWizard*>(parent));
+		}
 	}
 	
 	rb_call_super(argc,argv);
@@ -110,12 +111,6 @@ DLL_LOCAL void Init_WXWizardPage(VALUE rb_mWX)
 	rb_mWX = rb_define_module("WX");
 	rb_cWXWindow = rb_define_class_under(rb_mWX,"Window",rb_cObject);
 	rb_cWXPanel = rb_define_class_under(rb_mWX,"Panel",rb_cWXWindow);
-
-	rb_define_attr(rb_cWXWizardPage,"prev",1,1);
-	rb_define_attr(rb_cWXWizardPage,"next",1,1);
-
-	rb_define_attr(rb_cWXWizardPage,"bitmap",1,1);
-
 #endif
 
 #if wxUSE_WIZARDDLG
@@ -123,6 +118,13 @@ DLL_LOCAL void Init_WXWizardPage(VALUE rb_mWX)
 	rb_cWXWizardPage = rb_define_class_under(rb_mWX,"WizardPage",rb_cWXPanel);
 	rb_define_alloc_func(rb_cWXWizardPage,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXWizardPage,"prev",1,1);
+	rb_define_attr(rb_cWXWizardPage,"next",1,1);
+
+	rb_define_attr(rb_cWXWizardPage,"bitmap",1,1);
+#endif
+
 	rb_define_method(rb_cWXWizardPage,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_attr_method(rb_cWXWizardPage,"prev",_getPrev,_setPrev);

data/rwx.gemspec

@@ -22,13 +22,15 @@ newest Binding for wxWidgets 3.0+, it was made after wxRuby died.
   spec.add_development_dependency "rdoc", '~> 4.0'
   spec.add_development_dependency "rake", '~> 10.0'
   spec.add_development_dependency "test-unit", '~> 3.0'
-
+  spec.add_development_dependency "rspec", '~> 3.0'
+  
   # Gem contents
   begin
     spec.files         = `git ls-files`.split("\n")
   ensure
     spec.files         = Dir["*.rdoc", "COPYING", "Rakefile", "VERSION",
-      "rwx.gemspec", "ext/extconf.rb", "ext/*.*pp", "samples/**/**", "tests/**"
+      "rwx.gemspec", "ext/extconf.rb", "ext/*.*pp", "samples/**/**", "tests/**",
+      ".rspec", "spec/*"
     ] if spec.files.empty?
   end
   

data/samples/controls/controls.rb

@@ -1,11 +1,6 @@
 #Encoding: UTF-8
-
-
-STDERR.reopen(STDOUT)
-
 require "../../ext/rwx"
 
-
 class A < WX::App
   
   def on_init

data/samples/dialog/dialog_sample.rb

@@ -222,6 +222,3 @@ LICENCE
 end
 
 A.new.main_loop
-
-
-GC.start

data/spec/color_spec.rb

@@ -0,0 +1,55 @@
+
+RSpec.describe WX::Color do
+  it "overflow on bounderies" do
+    c = WX::Color.new(40, 0, 0)
+    
+    expect(c.alpha).to eq(255)
+    
+    expect { c.red = 300 }.to change { c.red }.
+      from( 40 ).
+      to( 44 )
+    expect { c.blue += 256 }.not_to change { c.blue }
+    
+    expect { c.green = -26 }.to change { c.green }.
+      from( 0 ).
+      to( 230 )
+    
+    expect { c.alpha = true }.to change { c.alpha }.
+      from( 255 ).
+      to( 0 )
+  end
+  
+  it "not equal to color name before app-init" do
+    c = WX::Color.new(255, 0, 0)
+    expect(c.name).not_to eq("red")
+    expect(c.name).to be_nil
+  #  expect(c).not_to eq("red")
+  end
+
+  it "undefined color constants before app-init" do
+    expect { WX::Color::RED }.to raise_error(NameError)
+    expect { WX::Color::BLUE }.to raise_error(NameError)
+  end
+  
+  it "start app" do
+    WX::App() { break }
+  end
+  
+  it "equal to color name after app-init" do
+    c1 = WX::Color.new(255, 0, 0)
+    expect(c1.name).to eq("red")
+    expect(c1).to eq("red")
+
+    c2 = WX::Color.new(254, 0, 0)
+    expect(c2.name).not_to eq("red")
+    expect(c2.name).to be_nil
+    expect(c2).not_to eq("red")
+  end
+
+  it "defined color constants after app-init" do
+    expect { WX::Color::RED }.to_not raise_error
+    expect { WX::Color::BLUE }.to_not raise_error
+    expect { WX::Color::NOTHING }.to raise_error(NameError)
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+require_relative "../ext/rwx"
+
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rwx
 version: !ruby/object:Gem::Version
-  version: 0.0.1.dev
+  version: 0.0.1.1.dev
 platform: ruby
 authors:
 - Hanmac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-12 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: |
   newest Binding for wxWidgets 3.0+, it was made after wxRuby died.
 email: hanmac@gmx.de
@@ -63,6 +77,7 @@ extra_rdoc_files:
 - COPYING
 files:
 - ".gitignore"
+- ".rspec"
 - COPYING
 - README.rdoc
 - Rakefile
@@ -132,6 +147,8 @@ files:
 - ext/wxColorPickerWidget.hpp
 - ext/wxComboBox.cpp
 - ext/wxComboBox.hpp
+- ext/wxComboCtrl.cpp
+- ext/wxComboCtrl.hpp
 - ext/wxCommandEvent.cpp
 - ext/wxCommandEvent.hpp
 - ext/wxConfig.cpp
@@ -152,6 +169,8 @@ files:
 - ext/wxDatePicker.hpp
 - ext/wxDialog.cpp
 - ext/wxDialog.hpp
+- ext/wxDirCtrl.cpp
+- ext/wxDirCtrl.hpp
 - ext/wxDirDialog.cpp
 - ext/wxDirDialog.hpp
 - ext/wxDirPicker.cpp
@@ -240,6 +259,8 @@ files:
 - ext/wxNotifyEvent.hpp
 - ext/wxNumberEntryDialog.cpp
 - ext/wxNumberEntryDialog.hpp
+- ext/wxOwnerDrawnComboBox.cpp
+- ext/wxOwnerDrawnComboBox.hpp
 - ext/wxPalette.cpp
 - ext/wxPalette.hpp
 - ext/wxPanel.cpp
@@ -312,6 +333,8 @@ files:
 - ext/wxSpinButton.hpp
 - ext/wxSpinCtrl.cpp
 - ext/wxSpinCtrl.hpp
+- ext/wxSpinCtrlDouble.cpp
+- ext/wxSpinCtrlDouble.hpp
 - ext/wxStartUpTip.cpp
 - ext/wxStartUpTip.hpp
 - ext/wxStaticBitmap.cpp
@@ -435,6 +458,8 @@ files:
 - samples/widgets/widgets.rb
 - samples/xrc/samples.xrc
 - samples/xrc/xrc_sample.rb
+- spec/color_spec.rb
+- spec/spec_helper.rb
 - test/test_color.rb
 homepage: https://github.com/Hanmac/rwx
 licenses:
@@ -463,7 +488,7 @@ requirements:
 - git
 - C++ compiler
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Ruby newest wxWidgets Binding