rwx 0.0.1.dev → 0.0.1.1.dev

data/ext/wxFileDialog.cpp

@@ -102,6 +102,8 @@ macro_attr(Message,wxString)
 macro_attr(Path,wxString)
 
 singlereturn(GetFilterIndex)
+singlereturn_array(GetFilenames, wxArrayString)
+singlereturn_array(GetPaths, wxArrayString)
 
 
 VALUE _setFilterIndex(VALUE self,VALUE other)
@@ -115,22 +117,6 @@ VALUE _setFilterIndex(VALUE self,VALUE other)
 	return other;
 }
 
-
-DLL_LOCAL VALUE _getFilenames(VALUE self)
-{
-	wxArrayString result;
-	_self->GetFilenames(result);
-	return wrap(result);
-}
-
-DLL_LOCAL VALUE _getPaths(VALUE self)
-{
-	wxArrayString result;
-	_self->GetPaths(result);
-	return wrap(result);
-}
-
-
 DLL_LOCAL VALUE _saveFileSelector(int argc,VALUE *argv,VALUE self)
 {
 	VALUE what,extension,default_name,parent;
@@ -176,6 +162,12 @@ DLL_LOCAL VALUE _loadFileSelector(int argc,VALUE *argv,VALUE self)
 /* Document-attr: path
  * the path of the FileDialog. String
  */
+/* Document-attr: filenames
+ * the filenamex of the FileDialog. Array<String>
+ */
+/* Document-attr: paths
+ * the paths of the FileDialog. Array<String>
+ */
 
 
 /* Document-const: OPEN
@@ -218,22 +210,25 @@ DLL_LOCAL void Init_WXFileDialog(VALUE rb_mWX)
 
 	rb_cWXTopLevel = rb_define_class_under(rb_mWX,"TopLevel",rb_cWXWindow);
 	rb_cWXDialog = rb_define_class_under(rb_mWX,"Dialog",rb_cWXTopLevel);
+#endif
 
+#if wxUSE_FILEDLG
+	using namespace RubyWX::FileDialog;
+	rb_cWXFileDialog = rb_define_class_under(rb_mWX,"FileDialog",rb_cWXDialog);
+	rb_define_alloc_func(rb_cWXFileDialog,_alloc);
+	rb_define_method(rb_cWXFileDialog,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
+
+#if 0
 	rb_define_attr(rb_cWXFileDialog,"directory",1,1);
 	rb_define_attr(rb_cWXFileDialog,"filename",1,1);
 	rb_define_attr(rb_cWXFileDialog,"filter_index",1,1);
 	rb_define_attr(rb_cWXFileDialog,"wildcard",1,1);
 	rb_define_attr(rb_cWXFileDialog,"message",1,1);
 	rb_define_attr(rb_cWXFileDialog,"path",1,1);
-
+	rb_define_attr(rb_cWXFileDialog,"filenames",1,0);
+	rb_define_attr(rb_cWXFileDialog,"paths",1,0);
 #endif
 
-#if wxUSE_FILEDLG
-	using namespace RubyWX::FileDialog;
-	rb_cWXFileDialog = rb_define_class_under(rb_mWX,"FileDialog",rb_cWXDialog);
-	rb_define_alloc_func(rb_cWXFileDialog,_alloc);
-	rb_define_method(rb_cWXFileDialog,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
-
 	rb_define_attr_method(rb_cWXFileDialog,"directory",_getDirectory,_setDirectory);
 	rb_define_attr_method(rb_cWXFileDialog,"filename",_getFilename,_setFilename);
 	rb_define_attr_method(rb_cWXFileDialog,"wildcard",_getWildcard,_setWildcard);
@@ -241,8 +236,8 @@ DLL_LOCAL void Init_WXFileDialog(VALUE rb_mWX)
 	rb_define_attr_method(rb_cWXFileDialog,"message",_getMessage,_setMessage);
 	rb_define_attr_method(rb_cWXFileDialog,"path",_getPath,_setPath);
 
-	rb_define_method(rb_cWXFileDialog,"filenames",RUBY_METHOD_FUNC(_getFilenames),0);
-	rb_define_method(rb_cWXFileDialog,"paths",RUBY_METHOD_FUNC(_getPaths),0);
+	rb_define_attr_method(rb_cWXFileDialog,"filenames",_GetFilenames,NULL);
+	rb_define_attr_method(rb_cWXFileDialog,"paths",_GetPaths,NULL);
 
 	rb_define_module_function(rb_mWX,"load_dialog",RUBY_METHOD_FUNC(_loadFileSelector),-1);
 	rb_define_module_function(rb_mWX,"save_dialog",RUBY_METHOD_FUNC(_saveFileSelector),-1);

data/ext/wxFileDirPicker.cpp

@@ -63,20 +63,20 @@ DLL_LOCAL void Init_WXFileDirPicker(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_cWXPickerBase = rb_define_class_under(rb_mWX,"PickerBase",rb_cWXControl);
-
-
-	rb_define_attr(rb_cWXFileDirPicker,"path",1,1);
-	rb_define_attr(rb_cWXFileDirPickerEvent,"path",1,1);
 #endif
 
 #if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
 	using namespace RubyWX::FileDirPicker;
 	rb_cWXFileDirPicker = rb_define_class_under(rb_mWX,"FileDirPicker",rb_cWXPickerBase);
 	rb_undef_alloc_func(rb_cWXFileDirPicker);
+	rb_cWXFileDirPickerEvent = rb_define_class_under(rb_cWXEvent,"FileDirPicker",rb_cWXEvent);
 
-	rb_define_attr_method(rb_cWXFileDirPicker,"path",_getPath,_setPath);
+#if 0
+	rb_define_attr(rb_cWXFileDirPicker,"path",1,1);
+	rb_define_attr(rb_cWXFileDirPickerEvent,"path",1,1);
+#endif
 
-	rb_cWXFileDirPickerEvent = rb_define_class_under(rb_cWXEvent,"FileDirPicker",rb_cWXEvent);
+	rb_define_attr_method(rb_cWXFileDirPicker,"path",_getPath,_setPath);
 
 	rb_define_attr_method(rb_cWXFileDirPickerEvent,"path",
 			Event::_getPath,Event::_setPath);

data/ext/wxFilePicker.cpp

@@ -83,12 +83,12 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 		}
 
 		FileDirPicker::check_style_flags(style);
-
-		_self->Create(
-			unwrap<wxWindow*>(parent),id,path,
-			message,wildCard,
-			wxDefaultPosition,wxDefaultSize,style
-		);
+		if(nil_check(parent))
+			_self->Create(
+				unwrap<wxWindow*>(parent),id,path,
+				message,wildCard,
+				wxDefaultPosition,wxDefaultSize,style
+			);
 
 	}
 	rb_call_super(argc,argv);

data/ext/wxFilePickerWidget.cpp

@@ -61,12 +61,12 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 		}
 
 		FileDirPicker::check_style_flags(style);
-
-		_self->Create(
-			unwrap<wxWindow*>(parent),id,label,path,
-			message,wildCard,
-			wxDefaultPosition,wxDefaultSize,style
-		);
+		if(nil_check(parent))
+			_self->Create(
+				unwrap<wxWindow*>(parent),id,label,path,
+				message,wildCard,
+				wxDefaultPosition,wxDefaultSize,style
+			);
 
 	}
 
@@ -112,9 +112,6 @@ DLL_LOCAL void Init_WXFilePickerWidget(VALUE rb_mWX)
 	rb_cWXAnyButton = rb_define_class_under(rb_mWX,"AnyButton",rb_cWXControl);
 
 	rb_cWXButton = rb_define_class_under(rb_mWX,"Button",rb_cWXAnyButton);
-
-	rb_define_attr(rb_cWXFilePickerWidget,"path",1,1);
-
 #endif
 
 #if wxUSE_FILEPICKERCTRL
@@ -122,6 +119,10 @@ DLL_LOCAL void Init_WXFilePickerWidget(VALUE rb_mWX)
 	rb_cWXFilePickerWidget = rb_define_class_under(rb_mWX,"FilePickerWidget",rb_cWXButton);
 	rb_define_alloc_func(rb_cWXFilePickerWidget,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXFilePickerWidget,"path",1,1);
+#endif
+
 	rb_define_method(rb_cWXFilePickerWidget,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_attr_method(rb_cWXFilePickerWidget,"path",_getPath,_setPath);

data/ext/wxFont.cpp

@@ -414,6 +414,11 @@ DLL_LOCAL VALUE _class_get(int argc,VALUE *argv,VALUE self)
 
 DLL_LOCAL void Init_WXFont(VALUE rb_mWX)
 {
+
+	using namespace RubyWX::Font;
+	rb_cWXFont = rb_define_class_under(rb_mWX,"Font",rb_cObject);
+	rb_define_alloc_func(rb_cWXFont,_alloc);
+
 #if 0
 	rb_define_attr(rb_cWXFont,"point_size",1,1);
 	rb_define_attr(rb_cWXFont,"pixel_size",1,1);
@@ -431,10 +436,6 @@ DLL_LOCAL void Init_WXFont(VALUE rb_mWX)
 	rb_define_const(rb_cWXFont,"SWISS",wrap(wxSWISS_FONT));
 #endif
 
-	using namespace RubyWX::Font;
-	rb_cWXFont = rb_define_class_under(rb_mWX,"Font",rb_cObject);
-	rb_define_alloc_func(rb_cWXFont,_alloc);
-
 	rb_define_method(rb_cWXFont,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_method(rb_cWXFont,"smaller",RUBY_METHOD_FUNC(_Smaller),0);
@@ -469,7 +470,7 @@ DLL_LOCAL void Init_WXFont(VALUE rb_mWX)
 	rb_define_attr_method(rb_cWXFont,"encoding",_getEncoding,_setEncoding);
 #endif
 	rb_define_method(rb_cWXFont,"marshal_dump",RUBY_METHOD_FUNC(_marshal_dump),0);
-	rb_define_method(rb_cWXFont,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),1);
+	rb_define_method(rb_cWXFont,"marshal_load",RUBY_METHOD_FUNC(_marshal_load),-2);
 
 	rb_define_singleton_method(rb_cWXFont,"[]",RUBY_METHOD_FUNC(_class_get),-1);
 

data/ext/wxFontDialog.cpp

@@ -47,23 +47,11 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 
 		if(rb_obj_is_kind_of(hash,rb_cHash))
 		{
-			wxColour color(wxNullColour);
-			wxFont font(wxNullFont);
-			bool symbols(false);
-			bool show_help(false);
 
-			set_hash_option(hash,"color",color);
-			set_hash_option(hash,"font",font);
-			set_hash_option(hash,"symbols",symbols);
-			set_hash_option(hash,"show_help",show_help);
-
-			if(color.IsOk())
-				data.SetColour(color);
-			if(font.IsOk())
-				data.SetInitialFont(font);
-
-			data.SetAllowSymbols(symbols);
-			data.SetShowHelp(show_help);
+			set_hash_option(hash,"color",&wxFontData::SetColour, data);
+			set_hash_option(hash,"font",&wxFontData::SetInitialFont, data);
+			set_hash_option(hash,"symbols",&wxFontData::SetAllowSymbols, data);
+			set_hash_option(hash,"show_help",&wxFontData::SetShowHelp, data);
 
 		}
 		_self->Create(unwrap<wxWindow*>(parent),data);
@@ -111,7 +99,14 @@ DLL_LOCAL void Init_WXFontDialog(VALUE rb_mWX)
 	rb_cWXTopLevel = rb_define_class_under(rb_mWX,"TopLevel",rb_cWXWindow);
 
 	rb_cWXDialog = rb_define_class_under(rb_mWX,"Dialog",rb_cWXTopLevel);
+#endif
+#if wxUSE_FONTDLG
+	using namespace RubyWX::FontDialog;
+	rb_cWXFontDialog = rb_define_class_under(rb_mWX,"FontDialog",rb_cWXDialog);
+	rb_define_alloc_func(rb_cWXFontDialog,_alloc);
+	rb_define_method(rb_cWXFontDialog,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
+#if 0
 	rb_define_attr(rb_cWXFontDialog,"initial_font",1,1);
 	rb_define_attr(rb_cWXFontDialog,"chosen_font",1,1);
 
@@ -121,12 +116,6 @@ DLL_LOCAL void Init_WXFontDialog(VALUE rb_mWX)
 	rb_define_attr(rb_cWXFontDialog,"show_help",1,1);
 #endif
 
-#if wxUSE_FONTDLG
-	using namespace RubyWX::FontDialog;
-	rb_cWXFontDialog = rb_define_class_under(rb_mWX,"FontDialog",rb_cWXDialog);
-	rb_define_alloc_func(rb_cWXFontDialog,_alloc);
-	rb_define_method(rb_cWXFontDialog,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
-
 	rb_define_attr_method(rb_cWXFontDialog,"initial_font",_getInitialFont,_setInitialFont);
 	rb_define_attr_method(rb_cWXFontDialog,"chosen_font",_getChosenFont,_setChosenFont);
 

data/ext/wxFontPicker.cpp

@@ -63,8 +63,10 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_flag_option(hash,"fontdesc_as_label",wxFNTP_FONTDESC_AS_LABEL,style);
 			set_hash_flag_option(hash,"font_for_label",wxFNTP_USEFONT_FOR_LABEL,style);
 		}
-
-		_self->Create(unwrap<wxWindow*>(parent),id,font,wxDefaultPosition,wxDefaultSize,style);
+		if(nil_check(parent))
+			_self->Create(unwrap<wxWindow*>(parent),id,
+				font,wxDefaultPosition,wxDefaultSize,style
+			);
 	}
 
 	rb_call_super(argc,argv);
@@ -74,7 +76,9 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 		VALUE temp;
 
 		set_option(selected_font,SelectedFont,wxFont)
+#ifdef HAVE_WXFONTPICKERCTRL_GETSELECTEDCOLOUR
 		set_option(selected_color,SelectedColour,wxColor)
+#endif
 	}
 	return self;
 }
@@ -124,14 +128,17 @@ DLL_LOCAL void Init_WXFontPicker(VALUE rb_mWX)
 
 	rb_cWXEvent = rb_define_class_under(rb_mWX,"Event",rb_cObject);
 
-	rb_define_attr(rb_cWXFontPicker,"selected_font",1,1);
-	rb_define_attr(rb_cWXFontPicker,"selected_color",1,1);
-	rb_define_attr(rb_cWXFontPickerEvent,"font",1,1);
 #endif
 
 #if wxUSE_FONTPICKERCTRL
 	using namespace RubyWX::FontPicker;
 	rb_cWXFontPicker = rb_define_class_under(rb_mWX,"FontPicker",rb_cWXPickerBase);
+
+#if 0
+	rb_define_attr(rb_cWXFontPicker,"selected_font",1,1);
+	rb_define_attr(rb_cWXFontPicker,"selected_color",1,1);
+#endif
+
 	rb_define_alloc_func(rb_cWXFontPicker,_alloc);
 
 	rb_define_method(rb_cWXFontPicker,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
@@ -143,6 +150,11 @@ DLL_LOCAL void Init_WXFontPicker(VALUE rb_mWX)
 #endif
 
 	rb_cWXFontPickerEvent = rb_define_class_under(rb_cWXEvent,"FontPicker",rb_cWXEvent);
+
+#if 0
+	rb_define_attr(rb_cWXFontPickerEvent,"font",1,1);
+#endif
+
 	registerEventType("fontpicker_changed",wxEVT_FONTPICKER_CHANGED,rb_cWXFontPickerEvent);
 	rb_define_attr_method(rb_cWXFontPickerEvent,"font",Event::_getFont,Event::_setFont);
 

data/ext/wxFontPickerWidget.cpp

@@ -58,11 +58,11 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_flag_option(hash,"font_for_label",wxFNTP_USEFONT_FOR_LABEL,style);
 
 		}
-
-		_self->Create(
-			unwrap<wxWindow*>(parent),id,font,
-			wxDefaultPosition,wxDefaultSize,style
-		);
+		if(nil_check(parent))
+			_self->Create(
+				unwrap<wxWindow*>(parent),id,font,
+				wxDefaultPosition,wxDefaultSize,style
+			);
 
 	}
 
@@ -101,10 +101,6 @@ DLL_LOCAL void Init_WXFontPickerWidget(VALUE rb_mWX)
 	rb_cWXAnyButton = rb_define_class_under(rb_mWX,"AnyButton",rb_cWXControl);
 
 	rb_cWXButton = rb_define_class_under(rb_mWX,"Button",rb_cWXAnyButton);
-
-	rb_define_attr(rb_cWXFontPickerWidget,"font",1,1);
-	rb_define_attr(rb_cWXFontPickerWidget,"selected_color",1,1);
-
 #endif
 
 #if wxUSE_FONTPICKERCTRL
@@ -112,6 +108,11 @@ DLL_LOCAL void Init_WXFontPickerWidget(VALUE rb_mWX)
 	rb_cWXFontPickerWidget = rb_define_class_under(rb_mWX,"FontPickerWidget",rb_cWXButton);
 	rb_define_alloc_func(rb_cWXFontPickerWidget,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXFontPickerWidget,"font",1,1);
+	rb_define_attr(rb_cWXFontPickerWidget,"selected_color",1,1);
+#endif
+
 	rb_define_method(rb_cWXFontPickerWidget,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_attr_method(rb_cWXFontPickerWidget,"font",_getFont,_setFont);

data/ext/wxFrame.cpp

@@ -239,17 +239,19 @@ DLL_LOCAL void Init_WXFrame(VALUE rb_mWX)
 	rb_cWXWindow = rb_define_class_under(rb_mWX,"Window",rb_cObject);
 
 	rb_cWXTopLevel = rb_define_class_under(rb_mWX,"TopLevel",rb_cWXWindow);
+#endif
+
+	using namespace RubyWX::Frame;
+	rb_cWXFrame = rb_define_class_under(rb_mWX,"Frame",rb_cWXTopLevel);
+	rb_define_alloc_func(rb_cWXFrame,_alloc);
 
+#if 0
 	rb_define_attr(rb_cWXFrame,"menubar",1,1);
 	rb_define_attr(rb_cWXFrame,"statusbar",1,1);
 	rb_define_attr(rb_cWXFrame,"statusbar_pane",1,1);
 	rb_define_attr(rb_cWXFrame,"toolbar",1,1);
 #endif
 
-	using namespace RubyWX::Frame;
-	rb_cWXFrame = rb_define_class_under(rb_mWX,"Frame",rb_cWXTopLevel);
-	rb_define_alloc_func(rb_cWXFrame,_alloc);
-
 	rb_define_method(rb_cWXFrame,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 #if wxUSE_MENUS

data/ext/wxGauge.cpp

@@ -71,8 +71,10 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_flag_option(hash,"vertical",wxGA_VERTICAL,style);
 			set_hash_flag_option(hash,"smooth",wxGA_SMOOTH,style);
 		}
-
-		_self->Create(unwrap<wxWindow*>(parent),id,range,wxDefaultPosition,wxDefaultSize,style);
+		if(nil_check(parent))
+			_self->Create(unwrap<wxWindow*>(parent),id,
+				range,wxDefaultPosition,wxDefaultSize,style
+			);
 
 	}
 
@@ -137,9 +139,6 @@ DLL_LOCAL void Init_WXGauge(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_cWXGauge,"range",1,1);
-	rb_define_attr(rb_cWXGauge,"value",1,1);
 #endif
 
 #if wxUSE_GAUGE
@@ -147,6 +146,11 @@ DLL_LOCAL void Init_WXGauge(VALUE rb_mWX)
 	rb_cWXGauge = rb_define_class_under(rb_mWX,"Gauge",rb_cWXControl);
 	rb_define_alloc_func(rb_cWXGauge,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXGauge,"range",1,1);
+	rb_define_attr(rb_cWXGauge,"value",1,1);
+#endif
+
 	rb_define_method(rb_cWXGauge,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_attr_method(rb_cWXGauge,"range",_getRange,_setRange);

data/ext/wxGrid.cpp

@@ -139,7 +139,14 @@ DLL_LOCAL void Init_WXGrid(VALUE rb_mWX)
 	rb_cWXControl = rb_define_class_under(rb_mWX,"Control",rb_cWXWindow);
 
 	rb_cWXPanel = rb_define_class_under(rb_mWX,"Panel",rb_cWXControl);
+#endif
+
+#if wxUSE_GRID
+	using namespace RubyWX::Grid;
+	rb_cWXGrid = rb_define_class_under(rb_mWX,"Grid",rb_cWXPanel);
+	rb_define_alloc_func(rb_cWXGrid,_alloc);
 
+#if 0
 	rb_define_attr(rb_cWXGrid,"table",1,1);
 	rb_define_attr(rb_cWXGrid,"line_color",1,1);
 	rb_define_attr(rb_cWXGrid,"label_background_color",1,1);
@@ -166,11 +173,6 @@ DLL_LOCAL void Init_WXGrid(VALUE rb_mWX)
 
 #endif
 
-#if wxUSE_GRID
-	using namespace RubyWX::Grid;
-	rb_cWXGrid = rb_define_class_under(rb_mWX,"Grid",rb_cWXPanel);
-	rb_define_alloc_func(rb_cWXGrid,_alloc);
-
 	rb_define_method(rb_cWXGrid,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_attr_method(rb_cWXGrid,"table",_getTable,_setTable);

data/ext/wxGridCellAttr.cpp

@@ -42,18 +42,18 @@ APP_PROTECT(wxGridCellAttr)
 
 DLL_LOCAL void Init_WXGridCellAttr(VALUE rb_mWX)
 {
-#if 0
-	rb_define_attr(rb_cWXGridCellAttr,"text_color",1,1);
-	rb_define_attr(rb_cWXGridCellAttr,"background_color",1,1);
-	rb_define_attr(rb_cWXGridCellAttr,"font",1,1);
-
-#endif
 
 #if wxUSE_GRID
 	using namespace RubyWX::GridCellAttr;
 	rb_cWXGridCellAttr = rb_define_class_under(rb_mWX,"GridCellAttr",rb_cObject);
 	rb_define_alloc_func(rb_cWXGridCellAttr,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXGridCellAttr,"text_color",1,1);
+	rb_define_attr(rb_cWXGridCellAttr,"background_color",1,1);
+	rb_define_attr(rb_cWXGridCellAttr,"font",1,1);
+#endif
+
 	//TODO make GridCellAttr copyable
 	rb_undef_method(rb_cWXGridCellAttr,"initialize_copy");
 	rb_undef_method(rb_cWXGridCellAttr,"_load");