rwx 0.0.1.dev → 0.0.1.1.dev

data/ext/wxOwnerDrawnComboBox.hpp

@@ -0,0 +1,22 @@
+/*
+ * wxOwnerDrawnComboBox.hpp
+ *
+ *  Created on: 14.10.2014
+ *      Author: hanmac
+ */
+
+#ifndef WXOWNERDRAWNCOMBOBOX_HPP_
+#define WXOWNERDRAWNCOMBOBOX_HPP_
+
+#include "main.hpp"
+
+extern VALUE rb_cWXOwnerDrawnComboBox;
+
+void Init_WXOwnerDrawnComboBox(VALUE rb_mWX);
+
+#if wxUSE_ODCOMBOBOX
+#include <wx/odcombo.h>
+#endif
+
+
+#endif /* WXOWNERDRAWNCOMBOBOX_HPP_ */

data/ext/wxPalette.cpp

@@ -204,7 +204,7 @@ DLL_LOCAL void Init_WXPalette(VALUE rb_mWX)
 	rb_define_method(rb_cWXPalette,"each",RUBY_METHOD_FUNC(_each),0);
 
 	rb_define_method(rb_cWXPalette,"marshal_dump",RUBY_METHOD_FUNC(_marshal_dump),0);
-	rb_define_method(rb_cWXPalette,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),1);
+	rb_define_method(rb_cWXPalette,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),-2);
 
 	registerInfo<wxPalette>(rb_cWXPalette);
 #endif

data/ext/wxPanel.cpp

@@ -43,9 +43,10 @@ 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/wxPasswordEntryDialog.cpp

@@ -73,7 +73,7 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 		_self->Create(unwrap<wxWindow*>(parent),
 				message,caption,value,style | wxTE_PASSWORD);
 #endif
-		
+
 	}
 	rb_call_super(argc,argv);
 

data/ext/wxPen.cpp

@@ -8,6 +8,7 @@
 #include "wxPen.hpp"
 #include "wxColor.hpp"
 #include "wxBitmap.hpp"
+#include "wxApp.hpp"
 
 #define _self unwrap<wxPen*>(self)
 
@@ -43,14 +44,18 @@ wxPen* unwrap< wxPen* >(const VALUE &vbitmap)
 template <>
 wxPen unwrap< wxPen >(const VALUE &vbitmap)
 {
-	return NIL_P(vbitmap) ? wxNullPen : *unwrap<wxPen*>(vbitmap);
+	if(NIL_P(vbitmap))
+		return wxNullPen;
+	if(is_wrapable<wxColor>(vbitmap))
+		return wxPen(unwrap<wxColor>(vbitmap));
+	return *unwrap< wxPen* >(vbitmap);
 }
 
 
 namespace RubyWX {
 namespace Pen {
 DLL_LOCAL VALUE _alloc(VALUE self) {
-	return wrap(new wxPen(*wxBLACK));
+	return wrapTypedPtr(new wxPen, self);
 }
 
 macro_attr(Width,int)
@@ -61,6 +66,11 @@ macro_attr(Stipple,wxBitmap)
 
 void define_const()
 {
+#if 0
+	rb_mWX = rb_define_module("WX");
+	rb_cWXPen = rb_define_class_under(rb_mWX,"Pen",rb_cObject);
+#endif
+
 	if(rb_const_defined(rb_cWXPen,rb_intern("BLACK")))
 		return;
 
@@ -144,6 +154,22 @@ DLL_LOCAL VALUE _marshal_load(VALUE self, VALUE data)
     return Qnil;
 }
 
+
+struct equal_obj {
+	wxPen* self;
+	VALUE other;
+};
+
+VALUE _equal_block(equal_obj *obj)
+{
+	return wrap(*obj->self == unwrap<wxPen>(obj->other));
+}
+
+VALUE _equal_rescue(VALUE val)
+{
+	return Qfalse;
+}
+
 /*
  * call-seq:
  *   == pen -> bool
@@ -154,15 +180,24 @@ DLL_LOCAL VALUE _marshal_load(VALUE self, VALUE data)
  */
 DLL_LOCAL VALUE _equal(VALUE self, VALUE other)
 {
-	return wrap((*_self) == unwrap<wxPen>(other));
-}
+	equal_obj obj;
+	obj.self = _self;
+	obj.other = other;
 
+	return rb_rescue(
+		RUBY_METHOD_FUNC(_equal_block),(VALUE)&obj,
+		RUBY_METHOD_FUNC(_equal_rescue),Qnil
+	);
+}
 
 DLL_LOCAL VALUE _class_get(int argc,VALUE *argv,VALUE self)
 {
 
 	VALUE color,width,style;
 	rb_scan_args(argc, argv, "21",&color,&width,&style);
+
+	app_protected();
+
 	//TODO add refcounting
 	wxPen *pen = wxThePenList->FindOrCreatePen(
 		unwrap<wxColor>(color),
@@ -179,7 +214,7 @@ DLL_LOCAL VALUE _class_get(int argc,VALUE *argv,VALUE self)
 		return it->second;
 	} else {
 		//wrap wxPen pointer to ruby object
-		VALUE result = wrap(pen);
+		VALUE result = wrapTypedPtr(pen,self);
 
 		//PenList objects should not be changed
 		rb_obj_freeze(result);
@@ -254,6 +289,14 @@ DLL_LOCAL VALUE _class_get(int argc,VALUE *argv,VALUE self)
 
 DLL_LOCAL void Init_WXPen(VALUE rb_mWX)
 {
+#if 0
+	rb_mWX = rb_define_module("WX");
+#endif
+
+	using namespace RubyWX::Pen;
+	rb_cWXPen = rb_define_class_under(rb_mWX,"Pen",rb_cObject);
+	rb_define_alloc_func(rb_cWXPen,_alloc);
+
 #if 0
 	rb_define_attr(rb_cWXPen,"width",1,1);
 	rb_define_attr(rb_cWXPen,"color",1,1);
@@ -275,10 +318,6 @@ DLL_LOCAL void Init_WXPen(VALUE rb_mWX)
 	rb_define_const(rb_cWXPen,"WHITE",wrap(wxWHITE_PEN));
 #endif
 
-	using namespace RubyWX::Pen;
-	rb_cWXPen = rb_define_class_under(rb_mWX,"Pen",rb_cObject);
-	rb_define_alloc_func(rb_cWXPen,_alloc);
-
 	rb_define_method(rb_cWXPen,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 	rb_define_private_method(rb_cWXPen,"initialize_copy",RUBY_METHOD_FUNC(_initialize_copy),1);
 
@@ -289,7 +328,7 @@ DLL_LOCAL void Init_WXPen(VALUE rb_mWX)
 	rb_define_attr_method(rb_cWXPen,"stipple",_getStipple,_setStipple);
 
 	rb_define_method(rb_cWXPen,"marshal_dump",RUBY_METHOD_FUNC(_marshal_dump),0);
-	rb_define_method(rb_cWXPen,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),1);
+	rb_define_method(rb_cWXPen,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),-2);
 
 	rb_define_method(rb_cWXPen,"==",RUBY_METHOD_FUNC(_equal),1);
 

data/ext/wxPoint.cpp

@@ -193,16 +193,16 @@ DLL_LOCAL VALUE _marshal_load(VALUE self, VALUE data)
 DLL_LOCAL void Init_WXPoint(VALUE rb_mWX)
 {
 
-#if 0
-	rb_define_attr(rb_cwxPoint,"x",1,1);
-	rb_define_attr(rb_cwxPoint,"y",1,1);
-#endif
-
 	using namespace RubyWX::Point;
 	rb_cwxPoint = rb_define_class_under(rb_mWX,"Point",rb_cObject);
 
 	rb_define_alloc_func(rb_cwxPoint,_alloc);
 
+#if 0
+	rb_define_attr(rb_cwxPoint,"x",1,1);
+	rb_define_attr(rb_cwxPoint,"y",1,1);
+#endif
+
 	rb_define_method(rb_cwxPoint,"initialize",RUBY_METHOD_FUNC(_initialize),2);
 	rb_define_private_method(rb_cwxPoint,"initialize_copy",RUBY_METHOD_FUNC(_initialize_copy),1);
 
@@ -212,7 +212,7 @@ DLL_LOCAL void Init_WXPoint(VALUE rb_mWX)
 	rb_define_method(rb_cwxPoint,"inspect",RUBY_METHOD_FUNC(_inspect),0);
 
 	rb_define_method(rb_cwxPoint,"marshal_dump",RUBY_METHOD_FUNC(_marshal_dump),0);
-	rb_define_method(rb_cwxPoint,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),1);
+	rb_define_method(rb_cwxPoint,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),-2);
 
 	registerType<wxRealPoint>(rb_cwxPoint, true);
 

data/ext/wxPreferences.cpp

@@ -15,6 +15,10 @@ VALUE rb_cWXPreferences;
 
 #include <wx/preferences.h>
 
+#ifdef wxHAS_PREF_EDITOR_ICONS
+#include "wxBitmap.hpp"
+#endif
+
 template <>
 VALUE wrap< wxPreferencesEditor >(wxPreferencesEditor *point )
 {
@@ -43,7 +47,6 @@ public:
 
 		return unwrap<wxWindow*>(result);
 	}
-
 private:
 	VALUE mblock;
 	VALUE mklass;
@@ -52,8 +55,12 @@ private:
 class RubyPreferencesPage : public RubyPreferencesPageInterface,public wxPreferencesPage
 {
 public:
-	RubyPreferencesPage(VALUE block,VALUE klass,const wxString &title) :
-		RubyPreferencesPageInterface(block,klass),wxPreferencesPage(),mtitle(title) {}
+	RubyPreferencesPage(VALUE block,VALUE klass,const wxString &title, VALUE bitmap) :
+		RubyPreferencesPageInterface(block,klass),wxPreferencesPage(),mtitle(title)
+#ifdef wxHAS_PREF_EDITOR_ICONS
+	,mBitmap(unwrap<wxBitmap>(bitmap))
+#endif
+	{}
 
 	//using RubyPreferencesPageInterface::CreateWindow;
 	wxWindow *CreateWindow(wxWindow *parent)
@@ -61,9 +68,17 @@ public:
 		return RubyPreferencesPageInterface::CreateWindow(parent);
 	}
 
+#ifdef wxHAS_PREF_EDITOR_ICONS
+	virtual wxBitmap GetLargeIcon() const { return mBitmap; };
+#endif
+
 	wxString GetName() const {return mtitle;}
 private:
 	wxString mtitle;
+
+#ifdef wxHAS_PREF_EDITOR_ICONS
+	wxBitmap mBitmap;
+#endif
 };
 
 
@@ -85,8 +100,8 @@ namespace Preferences {
 
 DLL_LOCAL VALUE _add_page(int argc,VALUE *argv,VALUE self)
 {
-	VALUE kind, klass,block;
-	rb_scan_args(argc, argv, "20&",&kind,&klass,&block);
+	VALUE kind, klass, block, bitmap;
+	rb_scan_args(argc, argv, "21&",&kind,&klass,&bitmap,&block);
 	wxPreferencesPage *page = NULL;
 	//VALUE block = rb_block_proc();
 	if(SYMBOL_P(kind))
@@ -99,7 +114,7 @@ DLL_LOCAL VALUE _add_page(int argc,VALUE *argv,VALUE self)
 		page = new RubyStockPreferencesPage(block,klass,wxkind);
 	}else
 	{
-		page = new RubyPreferencesPage(block,klass,unwrap<wxString>(kind));
+		page = new RubyPreferencesPage(block,klass,unwrap<wxString>(kind), bitmap);
 	}
 
 	_self->AddPage(page);

data/ext/wxProperty.cpp

@@ -603,8 +603,12 @@ VALUE find_prop_class(VALUE self,VALUE name)
  */
 DLL_LOCAL void Init_WXProperty(VALUE rb_mWX)
 {
-#if 0
+#if wxUSE_PROPGRID
+	using namespace RubyWX::Property;
+	rb_cWXProperty = rb_define_class_under(rb_mWX,"Property",rb_cObject);
+	rb_define_alloc_func(rb_cWXProperty,_alloc);
 
+#if 0
 	rb_define_attr(rb_cWXProperty,"name",1,1);
 	rb_define_attr(rb_cWXProperty,"label",1,1);
 	rb_define_attr(rb_cWXProperty,"help_string",1,1);
@@ -625,14 +629,8 @@ DLL_LOCAL void Init_WXProperty(VALUE rb_mWX)
 
 	rb_define_attr(rb_cWXProperty,"depth",1,0);
 	rb_define_attr(rb_cWXProperty,"grid",1,0);
-
 #endif
 
-#if wxUSE_PROPGRID
-	using namespace RubyWX::Property;
-	rb_cWXProperty = rb_define_class_under(rb_mWX,"Property",rb_cObject);
-	rb_define_alloc_func(rb_cWXProperty,_alloc);
-
 	//TODO check if its possible to add this methods
 	rb_undef_method(rb_cWXProperty,"initialize_copy");
 	rb_undef_method(rb_cWXProperty,"_load");

data/ext/wxPropertyCell.cpp

@@ -69,6 +69,11 @@ DLL_LOCAL VALUE _inspect(VALUE self)
 DLL_LOCAL void Init_WXPropertyCell(VALUE rb_mWX)
 {
 #if wxUSE_PROPGRID
+
+	using namespace RubyWX::PropertyCell;
+	rb_cWXPropertyCell = rb_define_class_under(rb_mWX,"PropertyCell",rb_cObject);
+	rb_undef_alloc_func(rb_cWXPropertyCell);
+
 #if 0
 	rb_define_attr(rb_cWXPropertyCell,"text",1,1);
 	rb_define_attr(rb_cWXPropertyCell,"font",1,1);
@@ -77,10 +82,6 @@ DLL_LOCAL void Init_WXPropertyCell(VALUE rb_mWX)
 	rb_define_attr(rb_cWXPropertyCell,"bg_col",1,1);
 #endif
 
-	using namespace RubyWX::PropertyCell;
-	rb_cWXPropertyCell = rb_define_class_under(rb_mWX,"PropertyCell",rb_cObject);
-	rb_undef_alloc_func(rb_cWXPropertyCell);
-
 	rb_undef_method(rb_cWXPropertyCell,"_load");
 	rb_undef_method(rb_cWXPropertyCell,"_dump");
 

data/ext/wxPropertyGrid.cpp

@@ -81,9 +81,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);
@@ -112,25 +115,6 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 }
 #endif
 
-
-/* Document-method: root
- * call-seq:
- *   root -> WX::Property
- *
- * returns the root property of this WX::PropertyGrid
- * ===Return value
- * WX::Property
- */
-
-/* Document-method: status_bar
- * call-seq:
- *   status_bar -> WX::StatusBar
- *
- * returns the status bar of this WX::PropertyGrid when available.
- * ===Return value
- * WX::StatusBar
- */
-
 /* Document-method: caption_font
  * call-seq:
  *   caption_font -> WX::Font
@@ -140,6 +124,14 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
  * WX::Font
  */
 
+
+/* Document-attr: root
+ * the root property of this WX::PropertyGrid. WX::Property
+ */
+/* Document-attr: status_bar
+ * the status bar of this WX::PropertyGrid when available. WX::StatusBar
+ */
+
 /* Document-attr: caption_background_color
  * the caption background color of the PropertyGrid. WX::Color
  */
@@ -182,6 +174,16 @@ DLL_LOCAL void Init_WXPropertyGrid(VALUE rb_mWX)
 
 	rb_mWXPropertyGridInterface = rb_define_module_under(rb_mWX,"PropertyGridInterface");
 
+#endif
+#if wxUSE_PROPGRID
+	using namespace RubyWX::PropertyGrid;
+	rb_cWXPropertyGrid = rb_define_class_under(rb_mWX,"PropertyGrid",rb_cWXControl);
+	rb_define_alloc_func(rb_cWXPropertyGrid,_alloc);
+
+#if 0
+	rb_define_attr(rb_cWXPropertyGrid,"root",1,0);
+	rb_define_attr(rb_cWXPropertyGrid,"status_bar",1,0);
+
 	rb_define_attr(rb_cWXPropertyGrid,"caption_background_color",1,1);
 	rb_define_attr(rb_cWXPropertyGrid,"selection_background_color",1,1);
 
@@ -195,19 +197,16 @@ DLL_LOCAL void Init_WXPropertyGrid(VALUE rb_mWX)
 	rb_define_attr(rb_cWXPropertyGrid,"margin_color",1,1);
 
 #endif
-#if wxUSE_PROPGRID
-	using namespace RubyWX::PropertyGrid;
-	rb_cWXPropertyGrid = rb_define_class_under(rb_mWX,"PropertyGrid",rb_cWXControl);
-	rb_define_alloc_func(rb_cWXPropertyGrid,_alloc);
 
 	rb_include_module(rb_cWXPropertyGrid,rb_mWXPropertyGridInterface);
 
 	rb_define_method(rb_cWXPropertyGrid,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
-	rb_define_method(rb_cWXPropertyGrid,"root",RUBY_METHOD_FUNC(_GetRoot),0);
+	rb_define_attr_method(rb_cWXPropertyGrid,"root",_GetRoot,0);
 
 #if wxUSE_STATUSBAR
-	rb_define_method(rb_cWXPropertyGrid,"status_bar",RUBY_METHOD_FUNC(_GetStatusBar),0);
+	rb_define_attr_method(rb_cWXPropertyGrid,"status_bar",_GetStatusBar,0);
+
 #endif
 
 	rb_define_method(rb_cWXPropertyGrid,"caption_font",RUBY_METHOD_FUNC(_GetCaptionFont),0);

data/ext/wxPropertyGridManager.cpp

@@ -59,7 +59,10 @@ 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
+			);
 		
 	}
 
@@ -234,14 +237,19 @@ DLL_LOCAL void Init_WXPropertyGridManager(VALUE rb_mWX)
 	rb_cWXPropertyGridManager = rb_define_class_under(rb_mWX,"PropertyGridManager",rb_cWXPanel);
 	rb_define_alloc_func(rb_cWXPropertyGridManager,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXPropertyGridManager,"tool_bar",1,0);
+	rb_define_attr(rb_cWXPropertyGridManager,"grid",1,0);
+	rb_define_attr(rb_cWXPropertyGridManager,"current_page",1,0);
+#endif
+
 	rb_include_module(rb_cWXPropertyGridManager,rb_mWXPropertyGridInterface);
 
 	rb_define_method(rb_cWXPropertyGridManager,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
-	rb_define_method(rb_cWXPropertyGridManager,"tool_bar",RUBY_METHOD_FUNC(_GetToolBar),0);
-	rb_define_method(rb_cWXPropertyGridManager,"grid",RUBY_METHOD_FUNC(_GetGrid),0);
-
-	rb_define_method(rb_cWXPropertyGridManager,"current_page",RUBY_METHOD_FUNC(_GetCurrentPage),0);
+	rb_define_attr_method(rb_cWXPropertyGridManager,"tool_bar",_GetToolBar,0);
+	rb_define_attr_method(rb_cWXPropertyGridManager,"grid",_GetGrid,0);
+	rb_define_attr_method(rb_cWXPropertyGridManager,"current_page",_GetCurrentPage,0);
 
 	rb_define_method(rb_cWXPropertyGridManager,"add_page",RUBY_METHOD_FUNC(_add_page),-1);
 	rb_define_method(rb_cWXPropertyGridManager,"insert_page",RUBY_METHOD_FUNC(_insert_page),-1);