rwx 0.0.1.dev → 0.0.1.1.dev

data/ext/wxHyperLink.cpp

@@ -66,11 +66,11 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_option(hash,"url",url);
 			set_hash_option(hash,"style",style);
 		}
-
-		_self->Create(
-			unwrap<wxWindow*>(parent),id,label,url,
-			wxDefaultPosition,wxDefaultSize,style
-		);
+		if(nil_check(parent))
+			_self->Create(
+				unwrap<wxWindow*>(parent),id,label,url,
+				wxDefaultPosition,wxDefaultSize,style
+			);
 
 	}
 	
@@ -116,21 +116,22 @@ DLL_LOCAL void Init_WXHyperLink(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_HYPERLINKCTRL
+	using namespace RubyWX::HyperLink;
+	rb_cWXHyperLink = rb_define_class_under(rb_mWX,"HyperLink",rb_cWXControl);
+	rb_define_alloc_func(rb_cWXHyperLink,_alloc);
 
+#if 0
 	rb_define_attr(rb_cWXHyperLink,"hover_color",1,1);
 	rb_define_attr(rb_cWXHyperLink,"normal_color",1,1);
 	rb_define_attr(rb_cWXHyperLink,"visited_color",1,1);
 
 	rb_define_attr(rb_cWXHyperLink,"url",1,1);
 	rb_define_attr(rb_cWXHyperLink,"visited",1,1);
-
 #endif
 
-#if wxUSE_HYPERLINKCTRL
-	using namespace RubyWX::HyperLink;
-	rb_cWXHyperLink = rb_define_class_under(rb_mWX,"HyperLink",rb_cWXControl);
-	rb_define_alloc_func(rb_cWXHyperLink,_alloc);
-
 	rb_define_method(rb_cWXHyperLink,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_attr_method(rb_cWXHyperLink,"hover_color",_getHoverColour,_setHoverColour);

data/ext/wxImage.cpp

@@ -5,6 +5,7 @@
  *      Author: hanmac
  */
 
+#include "wxApp.hpp"
 #include "wxSize.hpp"
 #include "wxRect.hpp"
 #include "wxPoint.hpp"
@@ -684,6 +685,9 @@ DLL_LOCAL VALUE _save(int argc,VALUE *argv,VALUE self)
 
 DLL_LOCAL VALUE _draw(VALUE self)
 {
+	app_protected();
+	rb_check_frozen(self);
+
 	wxDC *dc;
 
 #if wxUSE_GRAPHICS_CONTEXT
@@ -816,6 +820,14 @@ DLL_LOCAL VALUE _marshal_load(VALUE self,VALUE data)
 
 DLL_LOCAL void Init_WXImage(VALUE rb_mWX)
 {
+#if wxUSE_IMAGE
+
+	wxInitAllImageHandlers();
+
+	using namespace RubyWX::Image;
+	rb_cWXImage = rb_define_class_under(rb_mWX,"Image",rb_cObject);
+	rb_define_alloc_func(rb_cWXImage,_alloc);
+
 #if 0
 	rb_define_attr(rb_cWXImage,"width",1,0);
 	rb_define_attr(rb_cWXImage,"height",1,0);
@@ -827,15 +839,6 @@ DLL_LOCAL void Init_WXImage(VALUE rb_mWX)
 	rb_define_attr(rb_cWXImage,"palette",1,1);
 #endif
 
-#if wxUSE_IMAGE
-
-	wxInitAllImageHandlers();
-
-	using namespace RubyWX::Image;
-	rb_cWXImage = rb_define_class_under(rb_mWX,"Image",rb_cObject);
-	rb_define_alloc_func(rb_cWXImage,_alloc);
-
-
 	rb_define_method(rb_cWXImage,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 	rb_define_private_method(rb_cWXImage,"initialize_copy",RUBY_METHOD_FUNC(_initialize_copy),1);
 
@@ -845,11 +848,13 @@ DLL_LOCAL void Init_WXImage(VALUE rb_mWX)
 	rb_define_attr_method(rb_cWXImage,"data",_getData,NULL);
 	rb_define_attr_method(rb_cWXImage,"alpha",_getAlpha,NULL);
 
+	rb_define_method(rb_cWXImage,"draw",RUBY_METHOD_FUNC(_draw),0);
+
 	rb_define_method(rb_cWXImage,"to_image",RUBY_METHOD_FUNC(_to_image),0);
 	rb_define_method(rb_cWXImage,"to_bitmap",RUBY_METHOD_FUNC(_to_bitmap),0);
 
 	rb_define_method(rb_cWXImage,"marshal_dump",RUBY_METHOD_FUNC(_marshal_dump),0);
-	rb_define_method(rb_cWXImage,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),1);
+	rb_define_method(rb_cWXImage,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),-2);
 
 	rb_define_attr_method(rb_cWXImage,"mask",_getMask,_setMask);
 #if wxUSE_PALETTE

data/ext/wxInfoBar.cpp

@@ -48,7 +48,8 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 		{
 			set_hash_option(hash,"id",id,unwrapID);
 		}
-		_self->Create(unwrap<wxWindow*>(parent),id);
+		if(nil_check(parent))
+			_self->Create(unwrap<wxWindow*>(parent),id);
 
 	}
 	

data/ext/wxInfoBarGeneric.cpp

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

data/ext/wxItemContainer.cpp

@@ -12,6 +12,7 @@
 #include "wxChoice.hpp"
 #include "wxBitmapComboBox.hpp"
 #include "wxComboBox.hpp"
+#include "wxOwnerDrawnComboBox.hpp"
 
 VALUE rb_mWXItemContainer;
 #if wxUSE_CONTROLS
@@ -35,6 +36,10 @@ wxItemContainer* unwrap< wxItemContainer* >(const VALUE &obj)
 #if wxUSE_COMBOBOX
 	if(rb_obj_is_kind_of(obj,rb_cWXComboBox))
 		return unwrap<wxComboBox*>(obj);
+#endif
+#if wxUSE_ODCOMBOBOX
+	if(rb_obj_is_kind_of(obj,rb_cWXOwnerDrawnComboBox))
+		return unwrap<wxOwnerDrawnComboBox*>(obj);
 #endif
 		return unwrapTypedPtr<wxItemContainer>(obj,rb_mWXItemContainer);
  return NULL;

data/ext/wxListBook.cpp

@@ -45,9 +45,12 @@ 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
+			);
+
 	}
 
 	rb_call_super(argc,argv);

data/ext/wxListBox.cpp

@@ -60,14 +60,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/wxMenu.cpp

@@ -544,10 +544,6 @@ DLL_LOCAL void Init_WXMenu(VALUE rb_mWX)
 {
 #if 0
 	rb_mWXEvtHandler = rb_define_module_under(rb_mWX,"EvtHandler");
-
-	rb_define_attr(rb_cWXMenu,"title",1,1);
-	rb_define_attr(rb_cWXMenu,"parent",1,1);
-
 #endif
 
 #if wxUSE_MENUS
@@ -555,6 +551,11 @@ DLL_LOCAL void Init_WXMenu(VALUE rb_mWX)
 	rb_cWXMenu = rb_define_class_under(rb_mWX,"Menu",rb_cObject);
 	rb_define_alloc_func(rb_cWXMenu,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXMenu,"title",1,1);
+	rb_define_attr(rb_cWXMenu,"parent",1,1);
+#endif
+
 	rb_define_method(rb_cWXMenu,"initialize",RUBY_METHOD_FUNC(_initialize),1);
 
 	rb_include_module(rb_cWXMenu,rb_mWXEvtHandler);

data/ext/wxMenuItem.cpp

@@ -133,7 +133,15 @@ DLL_LOCAL void Init_WXMenuItem(VALUE rb_mWX)
 {
 #if 0
 	rb_cWXMenu = rb_define_class_under(rb_mWX,"Menu",rb_cObject);
+#endif
+
+#if wxUSE_MENUS
+	using namespace RubyWX::MenuItem;
+	//
+	rb_cWXMenuItem = rb_define_class_under(rb_cWXMenu,"Item",rb_cObject);
+	rb_define_alloc_func(rb_cWXMenuItem,_alloc);
 
+#if 0
 	rb_define_attr(rb_cWXMenuItem,"menu",1,1);
 	rb_define_attr(rb_cWXMenuItem,"label",1,1);
 	rb_define_attr(rb_cWXMenuItem,"id",1,1);
@@ -146,12 +154,6 @@ DLL_LOCAL void Init_WXMenuItem(VALUE rb_mWX)
 
 #endif
 
-#if wxUSE_MENUS
-	using namespace RubyWX::MenuItem;
-	//
-	rb_cWXMenuItem = rb_define_class_under(rb_cWXMenu,"Item",rb_cObject);
-	rb_define_alloc_func(rb_cWXMenuItem,_alloc);
-
 	rb_define_private_method(rb_cWXMenuItem,"initialize_copy",RUBY_METHOD_FUNC(_initialize_copy),0);
 
 	rb_define_attr_method(rb_cWXMenuItem,"menu",_getMenu,_setMenu);
@@ -165,7 +167,7 @@ DLL_LOCAL void Init_WXMenuItem(VALUE rb_mWX)
 	rb_define_attr_method(rb_cWXMenuItem,"bitmap",_GetBitmap,_SetBitmap);
 
 	rb_define_method(rb_cWXMenuItem,"marshal_dump",RUBY_METHOD_FUNC(_marshal_dump),0);
-	rb_define_method(rb_cWXMenuItem,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),1);
+	rb_define_method(rb_cWXMenuItem,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),-2);
 
 
 	registerInfo<wxMenuItem>(rb_cWXMenuItem);

data/ext/wxMultiChoiceDialog.cpp

@@ -62,7 +62,7 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_option(hash,"caption",caption);
 		}
 		_self->Create(unwrap<wxWindow*>(parent),message,caption,choices,style);
-		
+
 		_self->SetSelections(selections);
 
 	}
@@ -119,8 +119,6 @@ DLL_LOCAL void Init_WXMultiChoiceDialog(VALUE rb_mWX)
 {
 #if 0
 	rb_cWXAnyChoiceDialog = rb_define_class_under(rb_mWX,"AnyChoiceDialog",rb_cWXDialog);
-
-	rb_define_attr(rb_cWXMultiChoiceDialog,"selections",1,1);
 #endif
 
 #if wxUSE_CHOICEDLG
@@ -128,6 +126,10 @@ DLL_LOCAL void Init_WXMultiChoiceDialog(VALUE rb_mWX)
 	rb_cWXMultiChoiceDialog = rb_define_class_under(rb_mWX,"MultiChoiceDialog",rb_cWXAnyChoiceDialog);
 	rb_define_alloc_func(rb_cWXMultiChoiceDialog,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXMultiChoiceDialog,"selections",1,1);
+#endif
+
 	rb_define_method(rb_cWXMultiChoiceDialog,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_attr_method(rb_cWXMultiChoiceDialog,"selections",_getSelections,_setSelections);

data/ext/wxNoteBook.cpp

@@ -44,8 +44,10 @@ 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/wxOwnerDrawnComboBox.cpp

@@ -0,0 +1,223 @@
+/*
+ * wxComboBox.cpp
+ *
+ *  Created on: 03.05.2012
+ *      Author: hanmac
+ */
+
+
+
+#include "wxEvtHandler.hpp"
+#include "wxOwnerDrawnComboBox.hpp"
+#include "wxItemContainer.hpp"
+#include "wxTextEntry.hpp"
+#include "wxChoice.hpp"
+#include "wxComboCtrl.hpp"
+#include "wxTextCtrl.hpp"
+
+VALUE rb_cWXOwnerDrawnComboBox;
+
+#if wxUSE_ODCOMBOBOX
+#define _self unwrap<wxOwnerDrawnComboBox*>(self)
+
+namespace RubyWX {
+namespace OwnerDrawnComboBox {
+
+APP_PROTECT(wxOwnerDrawnComboBox)
+
+//need to define it again to prevent Shadowing
+singlefunc(Clear)
+
+#ifdef HAVE_WXOWNERDRAWNCOMBOBOX_ISLISTEMPTY
+singlereturn(IsListEmpty)
+singlereturn(IsTextEmpty)
+#else
+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());
+}
+#endif
+/*
+ * call-seq:
+ *   OwnerDrawnComboBox.new(parent, name, [options])
+ *   OwnerDrawnComboBox.new(parent, [options])
+ *
+ * creates a new OwnerDrawnComboBox 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;
+		wxArrayString choices;
+		int style(0);
+		int selection(-1);
+
+		bool selflag(false);
+
+		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,"items",choices);
+			set_hash_option(hash,"style",style);
+			selflag = set_hash_option(hash,"selection",selection);
+
+			Choice::set_style_flags(hash,style);
+			TextCtrl::set_style_flags(hash,style);
+		}
+
+		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);
+
+	if(rb_obj_is_kind_of(hash,rb_cHash)) {
+		VALUE temp;
+		set_option(items,,wxArrayString)
+		set_option(select,Selection,int)
+		set_option(value,Value,wxString)
+
+	}
+
+	return self;
+}
+
+}
+}
+#endif
+
+/* Document-method: clear
+ * call-seq:
+ *   clear -> self
+ *
+ * Removes all items from the control.
+ * ===Return value
+ * self
+*/
+/* 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-method: list_empty?
+ * call-seq:
+ *   list_empty? -> true/false
+ *
+ * Returns true if the list of combobox choices is empty.
+ * ===Return value
+ * true/false
+*/
+/* Document-method: text_empty?
+ * call-seq:
+ *   text_empty? -> true/false
+ *
+ * Returns true if the text of the combobox is empty.
+ * ===Return value
+ * true/false
+*/
+
+/* Document-const: SORT
+ *   Sorts the entries alphabetically.
+ */
+/* Document-const: READONLY
+ *   The text will not be user-editable.
+ */
+/* Document-const: DROPDOWN
+ *   Creates a combobox with a drop-down list.
+ */
+
+/* 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_WXOwnerDrawnComboBox(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_cWXComboCtrl = rb_define_class_under(rb_mWX,"ComboCtrl",rb_cWXControl);
+
+	rb_mWXItemContainer = rb_define_module_under(rb_mWX,"ItemContainer");
+#endif
+#if wxUSE_COMBOBOX
+	using namespace RubyWX::OwnerDrawnComboBox;
+	rb_cWXOwnerDrawnComboBox = rb_define_class_under(rb_mWX,"OwnerDrawnComboBox",rb_cWXComboCtrl);
+	rb_define_alloc_func(rb_cWXOwnerDrawnComboBox,_alloc);
+
+	rb_define_method(rb_cWXOwnerDrawnComboBox,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
+
+
+	rb_include_module(rb_cWXOwnerDrawnComboBox,rb_mWXItemContainer);
+
+	rb_define_method(rb_cWXOwnerDrawnComboBox,"clear",RUBY_METHOD_FUNC(_Clear),0);
+
+	rb_define_method(rb_cWXOwnerDrawnComboBox,"list_empty?",RUBY_METHOD_FUNC(_IsListEmpty),0);
+	rb_define_method(rb_cWXOwnerDrawnComboBox,"text_empty?",RUBY_METHOD_FUNC(_IsTextEmpty),0);
+
+	rb_undef_method(rb_cWXOwnerDrawnComboBox,"empty?");
+
+	//define Choice constants
+	rb_define_const(rb_cWXOwnerDrawnComboBox,"SORT",INT2NUM(wxCB_SORT));
+	rb_define_const(rb_cWXOwnerDrawnComboBox,"READONLY",INT2NUM(wxCB_READONLY));
+	rb_define_const(rb_cWXOwnerDrawnComboBox,"DROPDOWN",INT2NUM(wxCB_DROPDOWN));
+
+	//define TextCtrl constants
+	rb_define_const(rb_cWXOwnerDrawnComboBox,"MULTILINE",INT2NUM(wxTE_MULTILINE));
+	rb_define_const(rb_cWXOwnerDrawnComboBox,"PROCESS_TAB",INT2NUM(wxTE_PROCESS_TAB));
+	rb_define_const(rb_cWXOwnerDrawnComboBox,"PROCESS_ENTER",INT2NUM(wxTE_PROCESS_ENTER));
+	rb_define_const(rb_cWXOwnerDrawnComboBox,"PASSWORD",INT2NUM(wxTE_PASSWORD));
+
+	registerInfo<wxOwnerDrawnComboBox>(rb_cWXOwnerDrawnComboBox);
+
+	registerEventType("combobox",wxEVT_COMBOBOX);
+	registerEventType("combobox_dropdown",wxEVT_COMBOBOX_DROPDOWN);
+	registerEventType("combobox_closeup",wxEVT_COMBOBOX_CLOSEUP);
+
+#endif
+
+}
+