rwx 0.0.1.dev → 0.0.1.1.dev

data/ext/wxComboCtrl.hpp

@@ -0,0 +1,22 @@
+/*
+ * wxComboCtrl.hpp
+ *
+ *  Created on: 14.10.2014
+ *      Author: hanmac
+ */
+
+#ifndef WXCOMBOCTRL_HPP_
+#define WXCOMBOCTRL_HPP_
+
+#include "main.hpp"
+
+extern VALUE rb_cWXComboCtrl;
+
+void Init_WXComboCtrl(VALUE rb_mWX);
+
+#if wxUSE_COMBOCTRL
+#include <wx/combo.h>
+#endif
+
+
+#endif /* WXCOMBOCTRL_HPP_ */

data/ext/wxControl.cpp

@@ -43,8 +43,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);
 	}
 	rb_call_super(argc,argv);
 

data/ext/wxDC.cpp

@@ -199,6 +199,11 @@ DLL_LOCAL VALUE _DrawLines(int argc,VALUE *argv,VALUE self)
 
 DLL_LOCAL void Init_WXDC(VALUE rb_mWX)
 {
+
+	using namespace RubyWX::DC;
+	rb_cWXDC = rb_define_class_under(rb_mWX,"DC",rb_cObject);
+	rb_undef_alloc_func(rb_cWXDC);
+
 #if 0
 	rb_define_attr(rb_cWXDC,"font",1,1);
 	rb_define_attr(rb_cWXDC,"pen",1,1);
@@ -213,10 +218,6 @@ DLL_LOCAL void Init_WXDC(VALUE rb_mWX)
 	rb_define_attr(rb_cWXDC,"logical_scale",1,1);
 #endif
 
-	using namespace RubyWX::DC;
-	rb_cWXDC = rb_define_class_under(rb_mWX,"DC",rb_cObject);
-	rb_undef_alloc_func(rb_cWXDC);
-
 	rb_undef_method(rb_cWXDC,"initialize_copy");
 	rb_undef_method(rb_cWXDC,"_load");
 	rb_undef_method(rb_cWXDC,"_dump");

data/ext/wxDatePicker.cpp

@@ -46,12 +46,12 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			set_hash_option(hash,"date",date);
 			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
+			);
 
 	}
 
@@ -83,7 +83,6 @@ DLL_LOCAL void Init_WXDatePicker(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_cWXDatePicker,"value",1,1);
 #endif
 
 #if wxUSE_DATEPICKCTRL
@@ -91,6 +90,10 @@ DLL_LOCAL void Init_WXDatePicker(VALUE rb_mWX)
 	rb_cWXDatePicker = rb_define_class_under(rb_mWX,"DatePicker",rb_cWXControl);
 	rb_define_alloc_func(rb_cWXDatePicker,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXDatePicker,"value",1,1);
+#endif
+
 	rb_define_method(rb_cWXDatePicker,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_attr_method(rb_cWXDatePicker,"value",_getValue,_setValue);

data/ext/wxDirCtrl.cpp

@@ -0,0 +1,161 @@
+/*
+ * wxDirCtrl.cpp
+ *
+ *  Created on: 29.09.2014
+ *      Author: hanmac
+ */
+
+#include "wxDirCtrl.hpp"
+#include "wxFileCtrlBase.hpp"
+
+VALUE rb_cWXDirCtrl;
+
+#if wxUSE_DIRDLG
+
+#if !defined(HAVE_WXDIRCTRL)
+#define wxDirCtrl wxGenericDirCtrl
+#endif
+
+#define _self unwrap<wxDirCtrl*>(self)
+
+namespace RubyWX {
+namespace DirCtrl {
+
+APP_PROTECT(wxDirCtrl)
+
+macro_attr_with_func(Filter,wrap,unwrapWildCard)
+
+macro_attr(Path,wxString)
+
+singlereturn(GetFilterIndex)
+singlereturn_array(GetFilePaths,wxArrayString)
+
+/*
+ * call-seq:
+ *   DirCtrl.new(parent, name, [options])
+ *   DirCtrl.new(parent, [options])
+ *
+ * creates a new DirCtrl 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:
+ *   * default_directory String default directory
+ *
+*/
+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);
+#ifdef HAVE_CONST_WXDIRCTRL_DEFAULT_STYLE
+		int style(wxDIRCTRL_DEFAULT_STYLE);
+#else
+		int style(wxDIRCTRL_3D_INTERNAL);
+#endif
+		wxString defaultDirectory(wxDirDialogDefaultFolderStr);
+
+		if(rb_obj_is_kind_of(hash,rb_cHash))
+		{
+			set_hash_option(hash,"id",id,unwrapID);
+			set_hash_option(hash,"style",style);
+
+			set_hash_option(hash,"default_directory",defaultDirectory);
+
+			set_hash_flag_option(hash, "dir_only", wxDIRCTRL_DIR_ONLY, style);
+			set_hash_flag_option(hash, "select_first", wxDIRCTRL_SELECT_FIRST, style);
+			set_hash_flag_option(hash, "show_filters", wxDIRCTRL_SHOW_FILTERS, style);
+			set_hash_flag_option(hash, "internal_3d", wxDIRCTRL_3D_INTERNAL, style);
+			set_hash_flag_option(hash, "edit_labels", wxDIRCTRL_EDIT_LABELS, style);
+			set_hash_flag_option(hash, "multiple", wxDIRCTRL_MULTIPLE, style);
+
+		}
+
+		if(nil_check(parent)) {
+			_self->Create(unwrap<wxWindow*>(parent),id,
+				defaultDirectory,
+				wxDefaultPosition,
+				wxDefaultSize,style
+			);
+		}
+
+	}
+
+	rb_call_super(argc,argv);
+	return self;
+}
+
+
+
+VALUE _setFilterIndex(VALUE self,VALUE other)
+{
+	rb_check_frozen(self);
+	int filter(NUM2INT(other));
+
+	if(check_filter_index(filter,_self->GetFilter()))
+		_self->SetFilterIndex(filter);
+
+	return other;
+}
+
+
+}
+}
+#endif
+
+/* Document-attr: filter
+ * the filter of the DirCtrl. String, raise an ArgumentError if filter has wrong format
+ */
+/* Document-attr: filter_index
+ * the filter_index of the DirCtrl.
+ * Can't be higher than filters in filter. Integer
+ */
+/* Document-attr: path
+ * the path of the DirCtrl. String
+ */
+/* Document-attr: file_paths
+ * the file paths of the DirCtrl. Array<String>
+ */
+
+DLL_LOCAL void Init_WXDirCtrl(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);
+#endif
+
+#if wxUSE_DIRDLG
+	using namespace RubyWX::DirCtrl;
+	rb_cWXDirCtrl = rb_define_class_under(rb_mWX,"DirCtrl",rb_cWXControl);
+	rb_define_alloc_func(rb_cWXDirCtrl,_alloc);
+
+#if 0
+	rb_define_attr(rb_cWXDirCtrl,"filter",1,1);
+	rb_define_attr(rb_cWXDirCtrl,"path",1,1);
+	rb_define_attr(rb_cWXDirCtrl,"filter_index",1,1);
+
+	rb_define_attr(rb_cWXDirCtrl,"file_paths",1,0);
+#endif
+
+	rb_define_method(rb_cWXDirCtrl,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
+
+	rb_define_attr_method(rb_cWXDirCtrl,"filter",_getFilter,_setFilter);
+	rb_define_attr_method(rb_cWXDirCtrl,"path",_getPath,_setPath);
+	rb_define_attr_method(rb_cWXDirCtrl,"filter_index",_GetFilterIndex,_setFilterIndex);
+
+	rb_define_attr_method(rb_cWXDirCtrl,"file_paths",_GetFilePaths,NULL);
+
+	registerInfo<wxFileCtrl>(rb_cWXDirCtrl);
+#endif
+
+}
+
+
+
+

data/ext/wxDirCtrl.hpp

@@ -0,0 +1,21 @@
+/*
+ * wxDirCtrl.hpp
+ *
+ *  Created on: 29.09.2014
+ *      Author: hanmac
+ */
+
+#ifndef WXDIRCTRL_HPP_
+#define WXDIRCTRL_HPP_
+
+#include "wxControl.hpp"
+
+extern VALUE rb_cWXDirCtrl;
+
+void Init_WXDirCtrl(VALUE rb_mWX);
+
+#if wxUSE_DIRDLG
+#include <wx/dirctrl.h>
+#endif
+
+#endif /* WXDIRCTRL_HPP_ */

data/ext/wxDirPicker.cpp

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

data/ext/wxDirPickerWidget.cpp

@@ -63,11 +63,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
+			);
 
 	}
 
@@ -104,9 +105,6 @@ DLL_LOCAL void Init_WXDirPickerWidget(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_cWXDirPickerWidget,"path",1,1);
-
 #endif
 
 #if wxUSE_DIRPICKERCTRL
@@ -114,6 +112,10 @@ DLL_LOCAL void Init_WXDirPickerWidget(VALUE rb_mWX)
 	rb_cWXDirPickerWidget = rb_define_class_under(rb_mWX,"DirPickerWidget",rb_cWXButton);
 	rb_define_alloc_func(rb_cWXDirPickerWidget,_alloc);
 
+#if 0
+	rb_define_attr(rb_cWXDirPickerWidget,"path",1,1);
+#endif
+
 	rb_define_method(rb_cWXDirPickerWidget,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_attr_method(rb_cWXDirPickerWidget,"path",_getPath,_setPath);

data/ext/wxFileCtrl.cpp

@@ -59,8 +59,11 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			FileCtrlBase::set_style_flags(hash,style);
 
 		}
-
-		_self->Create(unwrap<wxWindow*>(parent),id,defaultDirectory,defaultFilename,defaultWildCard,style);
+		if(nil_check(parent))
+			_self->Create(unwrap<wxWindow*>(parent),id,
+				defaultDirectory,defaultFilename,
+				defaultWildCard,style
+			);
 
 	}
 

data/ext/wxFileCtrlBase.cpp

@@ -45,6 +45,9 @@ macro_attr(Directory,wxString)
 macro_attr(Filename,wxString)
 macro_attr(Path,wxString)
 
+singlereturn_array(GetPaths,wxArrayString)
+singlereturn_array(GetFilenames,wxArrayString)
+
 singlereturn(GetFilterIndex)
 
 
@@ -139,6 +142,15 @@ singlereturn(GetFile)
 /* Document-attr: filename
  * the filename of the FileCtrl. String
  */
+/* Document-attr: path
+ * the path of the FileCtrl. String
+ */
+/* Document-attr: filenames
+ * the filenames of the FileCtrl. Array<String>
+ */
+/* Document-attr: paths
+ * the paths of the FileCtrl. Array<String>
+ */
 
 /* Document-const: OPEN
  * creates control in "open" mode
@@ -166,12 +178,27 @@ DLL_LOCAL void Init_WXFileCtrlBase(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);
+#endif
+
+
+#if wxUSE_FILECTRL
+	using namespace RubyWX::FileCtrlBase;
+	rb_cWXFileCtrlBase = rb_define_class_under(rb_mWX,"FileCtrlBase",rb_cWXControl);
+	rb_undef_alloc_func(rb_cWXFileCtrlBase);
+
+	rb_cWXFileCtrlEvent = rb_define_class_under(rb_cWXEvent,"FileCtrl",rb_cWXCommandEvent);
 
+#if 0
 	rb_define_attr(rb_cWXFileCtrlBase,"wildcard",1,1);
 	rb_define_attr(rb_cWXFileCtrlBase,"directory",1,1);
 	rb_define_attr(rb_cWXFileCtrlBase,"filename",1,1);
+	rb_define_attr(rb_cWXFileCtrlBase,"path",1,1);
 	rb_define_attr(rb_cWXFileCtrlBase,"filter_index",1,1);
 
+	rb_define_attr(rb_cWXFileCtrlBase,"filenames",1,0);
+	rb_define_attr(rb_cWXFileCtrlBase,"paths",1,0);
+
+
 	rb_define_attr(rb_cWXFileCtrlEvent,"directory",1,1);
 	rb_define_attr(rb_cWXFileCtrlEvent,"filter_index",1,1);
 
@@ -179,18 +206,17 @@ DLL_LOCAL void Init_WXFileCtrlBase(VALUE rb_mWX)
 
 #endif
 
-#if wxUSE_FILECTRL
-	using namespace RubyWX::FileCtrlBase;
-	rb_cWXFileCtrlBase = rb_define_class_under(rb_mWX,"FileCtrlBase",rb_cWXControl);
-	rb_undef_alloc_func(rb_cWXFileCtrlBase);
-
 	rb_define_method(rb_cWXFileCtrlBase,"initialize",RUBY_METHOD_FUNC(_initialize),-1);
 
 	rb_define_attr_method(rb_cWXFileCtrlBase,"wildcard",_getWildcard,_setWildcard);
 	rb_define_attr_method(rb_cWXFileCtrlBase,"directory",_getDirectory,_setDirectory);
 	rb_define_attr_method(rb_cWXFileCtrlBase,"filename",_getFilename,_setFilename);
+	rb_define_attr_method(rb_cWXFileCtrlBase,"path",_getPath,_setPath);
 	rb_define_attr_method(rb_cWXFileCtrlBase,"filter_index",_GetFilterIndex,_setFilterIndex);
 
+	rb_define_attr_method(rb_cWXFileCtrlBase,"filenames",_GetFilenames,NULL);
+	rb_define_attr_method(rb_cWXFileCtrlBase,"paths",_GetPaths,NULL);
+
 	rb_define_const(rb_cWXFileCtrlBase,"OPEN",INT2NUM(wxFC_OPEN));
 	rb_define_const(rb_cWXFileCtrlBase,"SAVE",INT2NUM(wxFC_SAVE));
 	rb_define_const(rb_cWXFileCtrlBase,"MULTIPLE",INT2NUM(wxFC_MULTIPLE));
@@ -198,8 +224,6 @@ DLL_LOCAL void Init_WXFileCtrlBase(VALUE rb_mWX)
 
 	rb_define_const(rb_cWXFileCtrlBase,"DEFAULT_STYLE",INT2NUM(wxFC_DEFAULT_STYLE));
 
-
-	rb_cWXFileCtrlEvent = rb_define_class_under(rb_cWXEvent,"FileCtrl",rb_cWXCommandEvent);
 	registerEventType("filectrl_selectionchanged",wxEVT_FILECTRL_SELECTIONCHANGED,rb_cWXFileCtrlEvent);
 	registerEventType("filectrl_fileactivated",wxEVT_FILECTRL_FILEACTIVATED,rb_cWXFileCtrlEvent);
 	registerEventType("filectrl_folderchanged",wxEVT_FILECTRL_FOLDERCHANGED,rb_cWXFileCtrlEvent);

data/ext/wxFileCtrlGeneric.cpp

@@ -62,8 +62,11 @@ DLL_LOCAL VALUE _initialize(int argc,VALUE *argv,VALUE self)
 			FileCtrlBase::set_style_flags(hash,style);
 
 		}
-
-		_self->Create(unwrap<wxWindow*>(parent),id,defaultDirectory,defaultFilename,defaultWildCard,style);
+		if(nil_check(parent))
+			_self->Create(unwrap<wxWindow*>(parent), id,
+				defaultDirectory, defaultFilename,
+				defaultWildCard, style
+			);
 
 	}