wxruby3 1.2.0 → 1.3.0

data/lib/wx/doc/gdi_object.rb

@@ -0,0 +1,22 @@
+# :stopdoc:
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# :startdoc:
+
+
+module Wx
+
+  class GDIObject < Object
+
+    # Returns a copy-constructed GDI object.
+    # @return [Wx::GDIObject] the duplicated GDI object
+    def dup; end
+
+    # Calls #dup.
+    # @return [Wx::GDIObject]
+    def clone; end
+
+  end
+
+end

data/lib/wx/doc/object.rb

@@ -0,0 +1,24 @@
+# :stopdoc:
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# :startdoc:
+
+
+module Wx
+
+  class Object
+
+    # By default Wx:::Object derived classes cannot be #dup-licated.
+    # Some derived classes (like GDIObject-s) may provide functional overloads.
+    # @return [nil]
+    def dup; end
+
+    # By default Wx::Object derived class instances cannot be cloned but instead return self.
+    # Derived classes (like the Event classes) may provide functional overloads.
+    # @return [self]
+    def clone; end
+
+  end
+
+end

data/lib/wx/doc/variant.rb

@@ -168,6 +168,14 @@ module Wx
     # @return [true,false]
     def object?(klass=Object) end
 
+    # Copy constructs a Variant instance.
+    # @return [Wx::Variant]
+    def dup; end
+
+    # Calls #dup.
+    # @return [Wx::Variant]
+    def clone; end
+
   end
 
 end

data/lib/wx/helpers.rb

@@ -27,9 +27,8 @@ module Wx
       out_args = []
       param_spec.each_with_index do | param, i |
         # has supplied list arg or the keyword arg?
-        if (arg = mixed_args[i]) || kwa.key?(param.name)
-          arg = kwa.delete(param.name) unless arg
-        end
+        arg = mixed_args[i]
+        arg = kwa.delete(param.name) if arg.nil? && kwa.key?(param.name)
         if Proc === param.default_or_proc
           arg = param.default_or_proc.call(arg) # provides default or converts arg
         elsif arg.nil?

data/lib/wx/keyword_defs.rb

@@ -267,6 +267,13 @@ Wx::define_keyword_ctors(Wx::PropertySheetDialog) do
   wx_ctor_params :name => Wx::DIALOG_NAME_STR
 end
 
+# Credentials entry dialog
+Wx::define_keyword_ctors(Wx::CredentialEntryDialog) do
+  wx_ctor_params :message => ''
+  wx_ctor_params :title => 'Enter credentials'
+  wx_ctor_params :cred => ->(cred) { cred || Wx::WebCredentials.new }
+end
+
 ### CONTROLS
 
 # Push button control, displaying text
@@ -530,7 +537,13 @@ Wx::define_keyword_ctors(Wx::SearchCtrl) do
 end
 
 Wx::define_keyword_ctors(Wx::AnimationCtrl) do
-  wx_ctor_params :id, :anim
+  wx_ctor_params :id, :anim => Wx::NULL_ANIMATION
+  wx_ctor_params :pos, :size, :style => Wx::AC_DEFAULT_STYLE
+  wx_ctor_params :name => Wx::ANIMATION_CTRL_NAME_STR
+end
+
+Wx::define_keyword_ctors(Wx::GenericAnimationCtrl) do
+  wx_ctor_params :id, :anim => Wx::NULL_ANIMATION
   wx_ctor_params :pos, :size, :style => Wx::AC_DEFAULT_STYLE
   wx_ctor_params :name => Wx::ANIMATION_CTRL_NAME_STR
 end

data/lib/wx/version.rb

@@ -3,5 +3,5 @@
 # This software is released under the MIT license.
 
 module Wx
-  WXRUBY_VERSION    = '1.2.0'
+  WXRUBY_VERSION    = '1.3.0'
 end

data/rakelib/lib/config.rb

@@ -360,7 +360,7 @@ module WXRuby3
             test = File.join(Config.instance.test_dir, test)
             test = Dir.glob(test+'.rb').shift || test unless File.exist?(test)
           end
-          Rake.sh(Config.instance.exec_env, *make_ruby_cmd(test)) { |ok,status| errors += 1 unless ok }
+          Rake.sh(Config.instance.exec_env.merge({'RUBYLIB'=>rb_lib_path}), FileUtils::RUBY, test) { |ok,status| errors += 1 unless ok }
         end
       end
       fail "ERRORS: ##{errors} test scripts failed." if errors>0

data/rakelib/lib/core/include/enum.inc

@@ -16,7 +16,6 @@ static const char * __iv_Enum_sc_enums = "@enums";
 
 // instance variables for derived Enum class singleton classes
 static const char * __iv_enum_klass_values = "@values";   // hash map of all value instances of derived Enum (by integer value)
-static const char * __iv_enum_klass_values_by_name = "@values_by_name";   // hash map of all value instances of derived Enum
 static const char * __iv_enum_klass_name = "@name";       // unscoped name of derived Enum
 
 static VALUE wx_Enum_initialize(int argc, VALUE *argv, VALUE self)
@@ -149,55 +148,10 @@ static VALUE wx_Enum_to_int(int argc, VALUE *argv, VALUE self)
   return rb_iv_get(self, __iv_cEnum_value);
 }
 
-static VALUE wx_Enum_sc_get_enum_class(int argc, VALUE *argv, VALUE self)
-{
-  if ((argc < 1) || (argc > 1))
-  {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)", argc); return Qnil;
-  }
-  return rb_hash_aref(rb_iv_get(cEnum_Singleton, __iv_Enum_sc_enums), rb_to_symbol(argv[0]));
-}
-
-static VALUE wx_Enum_sc_create_enum_class(int argc, VALUE *argv, VALUE self)
-{
-  if ((argc < 2) || (argc > 2))
-  {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)", argc); return Qnil;
-  }
-  VALUE enum_name = rb_to_symbol(argv[0]);
-  if (TYPE(argv[1]) != T_HASH)
-  {
-    VALUE str = rb_inspect(argv[1]);
-    rb_raise(rb_eArgError,
-             "Invalid enum_values; expected Hash but got %s.",
-             StringValuePtr(str));
-    return Qnil;
-  }
-  ID id_new = rb_intern("new");
-  ID id_to_i = rb_intern("to_i");
-  ID id_const_set = rb_intern("const_set");
-  VALUE enum_klass = rb_funcall(rb_cClass, id_new, 1, cWxEnum, 0);
-  VALUE enum_singleton_klass = rb_funcall(enum_klass, rb_intern("singleton_class"), 0, 0);
-  VALUE enum_values = rb_funcall(argv[1], rb_intern("keys"), 0, 0);
-  for (int i=0; i<RARRAY_LEN(enum_values) ;++i)
-  {
-    VALUE enum_value_name = rb_ary_entry(enum_values, i);
-    VALUE enum_value_num = rb_funcall(rb_hash_aref(argv[1], enum_value_name), id_to_i, 0, 0);
-    VALUE enum_value = rb_funcall(enum_klass, id_new, 1, enum_value_num, 0);
-    rb_funcall(enum_klass, id_const_set, 2, enum_value_name, enum_value, 0);
-    rb_hash_aset(rb_iv_get(enum_singleton_klass, __iv_enum_klass_values), enum_value_num, enum_value);
-    rb_hash_aset(rb_iv_get(enum_singleton_klass, __iv_enum_klass_values_by_name), rb_to_symbol(enum_value_name), enum_value);
-  }
-  rb_hash_aset(rb_iv_get(cEnum_Singleton, __iv_Enum_sc_enums), enum_name, enum_klass);
-  return enum_klass;
-}
-
 static void wx_setup_Enum_singleton_class()
 {
   cEnum_Singleton = rb_funcall(cWxEnum, rb_intern("singleton_class"), 0, 0);
   rb_iv_set(cEnum_Singleton, __iv_Enum_sc_enums, rb_hash_new());
-  rb_define_method(cEnum_Singleton, "create", VALUEFUNC(wx_Enum_sc_create_enum_class), -1);
-  rb_define_singleton_method(cWxEnum, "[]", VALUEFUNC(wx_Enum_sc_get_enum_class), -1);
 }
 
 static void wx_define_Enum_class()
@@ -223,44 +177,11 @@ WXRB_EXPORT_FLAG VALUE wxRuby_GetEnumClass(const char* enum_class_name_cstr)
   return rb_hash_aref(enum_hash, rb_str_new2(enum_class_name_cstr));
 }
 
-static VALUE wx_Enum_sc_get_enum_value(int argc, VALUE *argv, VALUE self)
-{
-  if ((argc < 1) || (argc > 1))
-  {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)", argc); return Qnil;
-  }
-  VALUE enum_singleton_klass = rb_funcall(self, rb_intern("singleton_class"), 0, 0);
-  return rb_hash_aref(rb_iv_get(enum_singleton_klass, __iv_enum_klass_values_by_name), rb_to_symbol(argv[0]));
-}
-
-static VALUE wx_Enum_sc_get_enum_values(VALUE self)
-{
-  VALUE enum_singleton_klass = rb_funcall(self, rb_intern("singleton_class"), 0, 0);
-  return rb_iv_get(enum_singleton_klass, __iv_enum_klass_values);
-}
-
-static VALUE wx_Enum_sc_get_enum_values_by_name(VALUE self)
-{
-  VALUE enum_singleton_klass = rb_funcall(self, rb_intern("singleton_class"), 0, 0);
-  return rb_iv_get(enum_singleton_klass, __iv_enum_klass_values_by_name);
-}
-
-static VALUE wx_Enum_sc_get_enum_names_by_value(VALUE self)
-{
-  VALUE enum_singleton_klass = rb_funcall(self, rb_intern("singleton_class"), 0, 0);
-  return rb_funcall(rb_iv_get(enum_singleton_klass, __iv_enum_klass_values_by_name), rb_intern("invert"), 0);
-}
-
 WXRB_EXPORT_FLAG VALUE wxRuby_CreateEnumClass(const char* enum_class_name_cstr)
 {
   VALUE enum_klass = rb_funcall(rb_cClass, rb_intern("new"), 1, cWxEnum, 0);
-  rb_define_singleton_method(enum_klass, "[]", VALUEFUNC(wx_Enum_sc_get_enum_value), -1);
-  rb_define_singleton_method(enum_klass, "values", VALUEFUNC(wx_Enum_sc_get_enum_values), 0);
-  rb_define_singleton_method(enum_klass, "values_by_name", VALUEFUNC(wx_Enum_sc_get_enum_values_by_name), 0);
-  rb_define_singleton_method(enum_klass, "names_by_value", VALUEFUNC(wx_Enum_sc_get_enum_names_by_value), 0);
   VALUE enum_singleton_klass = rb_funcall(enum_klass, rb_intern("singleton_class"), 0, 0);
   rb_iv_set(enum_singleton_klass, __iv_enum_klass_values, rb_hash_new());
-  rb_iv_set(enum_singleton_klass, __iv_enum_klass_values_by_name, rb_hash_new());
   rb_iv_set(enum_singleton_klass, __iv_enum_klass_name, rb_str_new2(enum_class_name_cstr));
   rb_hash_aset(rb_iv_get(cEnum_Singleton, __iv_Enum_sc_enums),
                ID2SYM(rb_intern(enum_class_name_cstr)),
@@ -274,7 +195,6 @@ WXRB_EXPORT_FLAG VALUE wxRuby_AddEnumValue(VALUE enum_klass, const char* enum_va
   VALUE enum_value = rb_funcall(enum_klass, rb_intern("new"), 1, enum_value_num, 0);
   VALUE enum_singleton_klass = rb_funcall(enum_klass, rb_intern("singleton_class"), 0, 0);
   rb_hash_aset(rb_iv_get(enum_singleton_klass, __iv_enum_klass_values), enum_value_num, enum_value);
-  rb_hash_aset(rb_iv_get(enum_singleton_klass, __iv_enum_klass_values_by_name), enum_value_name, enum_value);
   rb_funcall(enum_klass, rb_intern("const_set"), 2, enum_value_name, enum_value, 0);
   return enum_value;
 }

data/rakelib/lib/core/include/funcall.inc

@@ -14,36 +14,20 @@ typedef VALUE (*RUBY_INVOKE_FUNC) (VALUE);
 VALUE rb_exc_set_backtrace(VALUE, VALUE);
 VALUE rb_get_backtrace(VALUE);
 
-namespace Swig
-{
-  class WXRB_EXPORT_FLAG DirectorRubyException : public DirectorException
-  {
-  public:
-    DirectorRubyException(VALUE error, VALUE rcvr, ID fn_id)
-      : DirectorException(Qnil)
-    {
-      VALUE msg = rb_sprintf("Caught exception in SWIG director method for %s#%s : ", rb_class2name(CLASS_OF(rcvr)), rb_id2name(fn_id));
-      rb_str_append(msg, rb_funcall(error, rb_intern("message"), 0));
-      this->swig_msg = StringValuePtr(msg);
-      swig_error = rb_exc_new_str(rb_eRuntimeError, msg);
-      VALUE bt = rb_funcall(error, rb_intern("backtrace"), 0);
-      rb_funcall(swig_error, rb_intern("set_backtrace"), 1, bt);
-    }
-  };
-}
+WXRB_EXPORT_FLAG void wxRuby_PrintException(VALUE err);
 
 class WXRuby_RBFuncall
 {
 public:
-  WXRuby_RBFuncall (ID fnid, bool throw_on_ex=true)
+  WXRuby_RBFuncall (ID fnid, bool exit_on_ex=true)
    : fn_id_ (fnid),
-     throw_on_ex_ (throw_on_ex),
+     exit_on_ex_ (exit_on_ex),
      ex_caught_ (false)
   {
   }
-  WXRuby_RBFuncall (const char* fn, bool throw_on_ex=true)
+  WXRuby_RBFuncall (const char* fn, bool exit_on_ex=true)
   : fn_id_ (rb_intern (fn)),
-    throw_on_ex_ (throw_on_ex),
+    exit_on_ex_ (exit_on_ex),
     ex_caught_ (false)
   {
   }
@@ -89,11 +73,12 @@ protected:
                                &invoke_state);
     if (invoke_state)
     {
-      if (this->throw_on_ex_)
+      if (this->exit_on_ex_)
       {
         // handle exception
         VALUE rexc = this->get_exception ();
-        throw Swig::DirectorRubyException(rexc, fa.receiver_, this->fn_id_);
+        wxRuby_PrintException(rexc);
+        ::exit(255);
       }
       else
       {
@@ -158,7 +143,7 @@ protected:
 
 private:
   ID      fn_id_;
-  bool    throw_on_ex_;
+  bool    exit_on_ex_;
   bool    ex_caught_;
 };
 

data/rakelib/lib/core/include/swigdirector.inc

@@ -188,23 +188,23 @@ namespace Swig
 
     DirectorTypeMismatchException(VALUE self, const char *method, VALUE error, const char *msg="");
 
-    static inline void raise(VALUE error, const char *msg)
-    {
-      throw DirectorTypeMismatchException(error, msg);
-    }
+    static void raise(VALUE error, const char *msg);
 
-    static inline void raise(const char *msg)
-    {
-      throw DirectorTypeMismatchException(msg);
-    }
+    static void raise(const char *msg);
 
-    static inline void raise(VALUE self, const char* method, VALUE error, const char *msg)
+    static void raise(VALUE self, const char* method, VALUE error, const char *msg);
+
+  private:
+    static void print(const DirectorTypeMismatchException& ex)
     {
-      throw DirectorTypeMismatchException(self, method, error, msg);
+      VALUE bt = rb_eval_string("caller");
+      bt = rb_funcall(bt, rb_intern("join"), 1, rb_str_new2("\n\tfrom "));
+      std::cerr << std::endl
+                << ' ' << ex.getMessage() << '(' << rb_class2name(ex.getType()) << ')' << std::endl
+                << "\tfrom " << StringValuePtr(bt) << std::endl << std::endl;
     }
   };
 
-
   DirectorTypeMismatchException::DirectorTypeMismatchException(VALUE self, const char *method, VALUE error, const char *msg)
     : DirectorException(Qnil)
   {
@@ -217,6 +217,24 @@ namespace Swig
     this->setup_error(rb_eTypeError);
   }
 
+  void DirectorTypeMismatchException::raise(VALUE error, const char *msg)
+  {
+    print(DirectorTypeMismatchException(error, msg));
+    ::exit(254);
+  }
+
+  void DirectorTypeMismatchException::raise(const char *msg)
+  {
+    print(DirectorTypeMismatchException(msg));
+    ::exit(254);
+  }
+
+  void DirectorTypeMismatchException::raise(VALUE self, const char* method, VALUE error, const char *msg)
+  {
+    print(DirectorTypeMismatchException(self, method, error, msg));
+    ::exit(254);
+  }
+
   /* Any Ruby exception that occurs during a director method call */
   class WXRB_EXPORT_FLAG DirectorMethodException : public DirectorException
   {

data/rakelib/lib/director/animation_ctrl.rb

@@ -18,6 +18,9 @@ module WXRuby3
 
       def setup
         super
+        spec.items << 'wxGenericAnimationCtrl'
+        spec.include 'wx/animate.h'
+        spec.include 'wx/generic/animate.h'
         if Config.instance.wx_version >= '3.3.0'
           spec.items << 'wxAnimationBundle'
           spec.ignore 'wxAnimationBundle::GetAll', ignore_doc: false
@@ -37,7 +40,15 @@ module WXRuby3
           spec.map 'const std::vector<wxAnimation>&' => 'Array<Wx::Animation>', swig: false do
             map_out code: ''
           end
+          # adjust documentation for #set_animation argument
+          spec.map 'const wxAnimationBundle &animations', as: 'Wx::AnimationBundle,Wx::Animation', swig: false do
+            map_in code: ''
+          end
         end
+        # replace method signature by one that provides a default argument to correctly provide
+        # the two overloads the Ruby way
+        spec.ignore 'wxGenericAnimationCtrl::Play'
+        spec.extend_interface 'wxGenericAnimationCtrl', 'bool Play(bool looped=true)'
         spec.do_not_generate :variables, :enums, :defines, :functions
       end
     end # class AnimationCtrl

data/rakelib/lib/director/defs.rb

@@ -32,6 +32,9 @@ module WXRuby3
           wxDELETEA
           wxSwap
         }
+        if Config.instance.wx_version >= '3.3.0'
+          spec.ignore %w[wxWARN_UNUSED]
+        end
         spec.ignore 'wxOVERRIDE'
         super
       end

data/rakelib/lib/director/dialog.rb

@@ -144,13 +144,6 @@ module WXRuby3
         when 'wxMultiChoiceDialog'
           # unnneeded and unwanted for Ruby
           spec.ignore 'wxMultiChoiceDialog::wxMultiChoiceDialog(wxWindow *,const wxString &,const wxString &,int,const wxString *,long,const wxPoint &)'
-          # Wx's MultiChoiceDialog offers the possibility of attaching client
-          # data to each choice. However this would need memory management, and a
-          # pure ruby implementation is trivial and likely to be more convenient
-          # on a per-case basis so just ignore this argument for Ruby.
-          spec.map 'char** clientData' do
-            map_in ignore: true, code: '$1 = (char **)NULL;'
-          end
           spec.do_not_generate(:functions, :enums, :defines)
         when 'wxDirDialog'
         when 'wxProgressDialog'
@@ -227,6 +220,21 @@ module WXRuby3
                                 'wxWizard::GetCurrentPage',
                                 'wxWizard::GetPageAreaSizer')
           spec.do_not_generate(:variables, :enums, :defines, :functions)
+        when 'wxCredentialEntryDialog'
+          spec.items << 'wxWebCredentials'
+          spec.do_not_generate(:functions, :enums, :defines)
+        when 'wxGenericAboutDialog'
+          # inheritance chain missing from wxw docs
+          spec.override_inheritance_chain(spec.module_name, %w[wxDialog wxTopLevelWindow wxNonOwnedWindow wxWindow wxEvtHandler wxObject])
+          spec.gc_as_dialog(spec.module_name)
+          # regard protected methods
+          spec.regard 'wxGenericAboutDialog::DoAddCustomControls',
+                      'wxGenericAboutDialog::AddControl',
+                      'wxGenericAboutDialog::AddText',
+                      'wxGenericAboutDialog::GetCustomControlParent'
+          if Config.instance.features_set?('USE_COLLPANE')
+            spec.regard 'wxGenericAboutDialog::AddCollapsiblePane'
+          end
         end
       end
 

data/rakelib/lib/director/file_dialog_customize_hook.rb

@@ -17,9 +17,85 @@ module WXRuby3
       def setup
         super
         spec.items << 'wxFileDialogCustomize'
-        spec.gc_as_marked 'wxFileDialogCustomizeHook' # not tracked but cached in Ruby
+        spec.gc_as_object 'wxFileDialogCustomizeHook'
         spec.gc_as_untracked 'wxFileDialogCustomize'
         spec.make_abstract 'wxFileDialogCustomize'
+        spec.map_apply 'int n, const wxString* choices' => 'size_t n, const wxString *strings'
+        # make Ruby director and wrappers use custom implementation
+        spec.use_class_implementation('wxFileDialogCustomizeHook', 'wxRubyFileDialogCustomizeHook')
+        spec.make_concrete('wxFileDialogCustomizeHook')
+        # prevent director overload; custom impl handles this
+        spec.no_proxy 'wxFileDialogCustomizeHook::AddCustomControls',
+                      'wxFileDialogCustomizeHook::UpdateCustomControls',
+                      'wxFileDialogCustomizeHook::TransferDataFromCustomControls'
+        # do not wrap these
+        spec.ignore 'wxFileDialogCustomizeHook::AddCustomControls',
+                    'wxFileDialogCustomizeHook::UpdateCustomControls',
+                    'wxFileDialogCustomizeHook::TransferDataFromCustomControls',
+                    ignore_doc: false
+        spec.add_header_code <<~__HEREDOC
+          class wxRubyFileDialogCustomizeHook : public wxFileDialogCustomizeHook
+          {
+          public:
+            wxRubyFileDialogCustomizeHook() : wxFileDialogCustomizeHook() {}
+            ~wxRubyFileDialogCustomizeHook() {};
+
+            // from virtual void wxFileDialogCustomizeHook::AddCustomControls
+            virtual void AddCustomControls(wxFileDialogCustomize &customizer) override
+            {
+              VALUE obj0 = Qnil ;
+              VALUE SWIGUNUSED result;
+              
+              obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&customizer), SWIGTYPE_p_wxFileDialogCustomize,  0 );
+              VALUE self = SWIG_RubyInstanceFor(this);
+              bool ex = false;
+              result = wxRuby_Funcall(ex, self, rb_intern("add_custom_controls"), 1,obj0);
+              if (ex)
+              {
+                wxRuby_PrintException(result);
+              }
+            }
+
+            // from virtual void wxFileDialogCustomizeHook::UpdateCustomControls
+            virtual void UpdateCustomControls() override
+            {
+              VALUE SWIGUNUSED result;
+              
+              if (!this->finished_)
+              {
+                VALUE self = SWIG_RubyInstanceFor(this);
+                bool ex = false;
+                result = wxRuby_Funcall(ex, self, rb_intern("update_custom_controls"), 0, NULL);
+                if (ex)
+                {
+                  wxRuby_PrintException(result);
+                }
+              }
+            }
+
+            // from virtual void wxFileDialogCustomizeHook::TransferDataFromCustomControls
+            virtual void TransferDataFromCustomControls() override
+            {
+              VALUE SWIGUNUSED result;
+              
+              
+              if (!this->finished_)
+              {
+                this->finished_ = true;
+                VALUE self = SWIG_RubyInstanceFor(this);
+                bool ex = false;
+                result = wxRuby_Funcall(ex, self, rb_intern("transfer_data_from_custom_controls"), 0, NULL);
+                if (ex)
+                {
+                  wxRuby_PrintException(result);
+                }
+              }
+            }
+          
+          private:
+            bool finished_ {};
+          };
+          __HEREDOC
       end
     end # class FileDialogCustomizeHook
 

data/rakelib/lib/director/functions.rb

@@ -208,18 +208,6 @@ module WXRuby3
           wxWindow * wxGetActiveWindow();
           
           // Dialog shortcuts
-          VOID_INT wxGetSelectedChoices(wxArrayInt& selections,
-                        const wxString& message,
-                        const wxString& caption,
-                        int n, const wxString *choices,
-                        wxWindow *parent = NULL,
-                        int x = wxDefaultCoord,
-                        int y = wxDefaultCoord,
-                        bool centre = true,
-                        int width = wxCHOICE_WIDTH,
-                        int height = wxCHOICE_HEIGHT);
-          
-          
           wxString wxFileSelector (const wxString &message,
                                    const wxString &default_path=wxEmptyString,
                                    const wxString &default_filename=wxEmptyString,

data/rakelib/lib/director/validator.rb

@@ -42,13 +42,8 @@ module WXRuby3
 
             wxObject* wxRubyValidator::Clone() const
             {
-              bool ex_caught = false;
               VALUE self = const_cast<wxRubyValidator*> (this)->get_self();
-              VALUE rc = wxRuby_Funcall(ex_caught, self, clone_id(), 0);
-              if (ex_caught)
-              {
-                throw Swig::DirectorRubyException(rc, self, clone_id());
-              }
+              VALUE rc = wxRuby_Funcall(self, clone_id(), 0);
               void *ptr;
               int res = SWIG_ConvertPtr(rc, &ptr, SWIGTYPE_p_wxValidator,  0);
               if (!SWIG_IsOK(res)) 
@@ -77,22 +72,12 @@ module WXRuby3
   
             VALUE wxRubyValidator::DoTransferFromWindow()
             {
-              bool ex_caught = false;
-              VALUE rc = wxRuby_Funcall(ex_caught, this->get_self(), do_transfer_from_window_id(), 0);
-              if (ex_caught)
-              {
-                throw Swig::DirectorRubyException(rc, this->get_self(), do_transfer_from_window_id());
-              }
+              VALUE rc = wxRuby_Funcall(this->get_self(), do_transfer_from_window_id(), 0);
               return rc; 
             } 
             bool wxRubyValidator::DoTransferToWindow(VALUE data)
             {
-              bool ex_caught = false;
-              VALUE rc = wxRuby_Funcall(ex_caught, this->get_self(), do_transfer_to_window_id(), 1, data);
-              if (ex_caught)
-              {
-                throw Swig::DirectorRubyException(rc, this->get_self(), do_transfer_to_window_id());
-              }
+              VALUE rc = wxRuby_Funcall(this->get_self(), do_transfer_to_window_id(), 1, data);
               return (rc == Qtrue); 
             } 
 
@@ -111,22 +96,12 @@ module WXRuby3
 
             bool wxRubyValidatorBinding::DoOnTransferFromWindow(VALUE data)
             {
-              bool ex_caught = false;
-              VALUE rc = wxRuby_Funcall(ex_caught, this->get_self(), do_on_transfer_from_window_id(), 1, data);
-              if (ex_caught)
-              {
-                throw Swig::DirectorRubyException(rc, this->get_self(), do_on_transfer_from_window_id());
-              }
+              VALUE rc = wxRuby_Funcall(this->get_self(), do_on_transfer_from_window_id(), 1, data);
               return (rc == Qtrue); 
             } 
             VALUE wxRubyValidatorBinding::DoOnTransferToWindow()
             {
-              bool ex_caught = false;
-              VALUE rc = wxRuby_Funcall(ex_caught, this->get_self(), do_on_transfer_to_window_id(), 0);
-              if (ex_caught)
-              {
-                throw Swig::DirectorRubyException(rc, this->get_self(), do_on_transfer_to_window_id());
-              }
+              VALUE rc = wxRuby_Funcall(this->get_self(), do_on_transfer_to_window_id(), 0);
               return rc; 
             } 
 
@@ -134,12 +109,7 @@ module WXRuby3
             {
               if (!NIL_P(this->on_transfer_from_win_proc_))
               {
-                bool ex_caught = false;
-                VALUE rc = wxRuby_Funcall(ex_caught, this->on_transfer_from_win_proc_, call_id(), 1, data);
-                if (ex_caught)
-                {
-                  throw Swig::DirectorRubyException(rc, this->on_transfer_from_win_proc_, call_id());
-                }
+                wxRuby_Funcall(this->on_transfer_from_win_proc_, call_id(), 1, data);
               }
               return true; 
             } 
@@ -147,12 +117,7 @@ module WXRuby3
             {
               if (!NIL_P(this->on_transfer_to_win_proc_))
               {
-                bool ex_caught = false;
-                VALUE rc = wxRuby_Funcall(ex_caught, this->on_transfer_to_win_proc_, call_id(), 0);
-                if (ex_caught)
-                {
-                  throw Swig::DirectorRubyException(rc, this->on_transfer_to_win_proc_, call_id());
-                }
+                VALUE rc = wxRuby_Funcall(this->on_transfer_to_win_proc_, call_id(), 0);
                 return rc;
               }
               return Qnil; 

data/rakelib/lib/generate/doc/credential_entry_dialog.yaml

@@ -0,0 +1,10 @@
+---
+:wxCredentialEntryDialog:
+  :detail:
+    :pre:
+      :programlisting:
+        - :pattern: !ruby/regexp /.*/
+          :replace: ''
+      :para:
+        - :pattern: !ruby/regexp /Simple\s+example/
+          :replace: ''