wxruby3 1.2.1 → 1.3.1

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/core/include/swigrubyrun.inc

@@ -59,9 +59,9 @@ extern "C" {
 #endif
 
 WXRB_EXPORT_FLAG VALUE
-SWIG_Ruby_AppendOutput(VALUE target, VALUE o)
+SWIG_wxRuby_AppendOutput(VALUE target, VALUE o, int is_void)
 {
-  if (NIL_P(target))
+  if (NIL_P(target) && is_void != 0)
   {
     target = o;
   }

data/rakelib/lib/director/animation_ctrl.rb

@@ -40,7 +40,13 @@ 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

data/rakelib/lib/director/aui_manager.rb

@@ -16,7 +16,98 @@ module WXRuby3
 
       def setup
         super
-        spec.gc_as_object
+        spec.gc_as_object 'wxAuiManager'
+        if Config.instance.wx_version >= '3.3.0'
+          spec.items << 'wxAuiSerializer' << 'wxAuiDockInfo' << 'wxAuiDeserializer'
+          spec.gc_as_untracked 'wxAuiSerializer', 'wxAuiDockInfo'
+          spec.regard 'wxAuiDockInfo::rect',
+                      'wxAuiDockInfo::dock_direction',
+                      'wxAuiDockInfo::dock_layer',
+                      'wxAuiDockInfo::dock_row',
+                      'wxAuiDockInfo::size',
+                      'wxAuiDockInfo::min_size',
+                      'wxAuiDockInfo::resizable',
+                      'wxAuiDockInfo::toolbar',
+                      'wxAuiDockInfo::fixed',
+                      'wxAuiDockInfo::reserved1'
+          spec.make_readonly 'wxAuiDockInfo::rect',
+                             'wxAuiDockInfo::dock_direction',
+                             'wxAuiDockInfo::dock_layer',
+                             'wxAuiDockInfo::dock_row',
+                             'wxAuiDockInfo::size',
+                             'wxAuiDockInfo::min_size',
+                             'wxAuiDockInfo::resizable',
+                             'wxAuiDockInfo::toolbar',
+                             'wxAuiDockInfo::fixed',
+                             'wxAuiDockInfo::reserved1'
+          spec.add_extend_code 'wxAuiDockInfo', <<~__HEREDOC
+            VALUE each_pane()
+            {
+              wxAuiPaneInfoPtrArray panes = self->panes;
+              VALUE rc = Qnil;
+              for (wxAuiPaneInfo* pane : panes)
+              {
+                VALUE r_pane = SWIG_NewPointerObj(pane, SWIGTYPE_p_wxAuiPaneInfo, 0);
+                rc = rb_yield(r_pane);
+              }	
+              return rc;
+            }
+            __HEREDOC
+          spec.map 'std::vector<wxAuiPaneInfo>' => 'Array<Wx::AuiPaneInfo>' do
+            map_out code: <<~__CODE
+              $result = rb_ary_new();
+              std::vector<wxAuiPaneInfo>& panes = (std::vector<wxAuiPaneInfo>&)$1;
+              for (const wxAuiPaneInfo& pane : panes)
+              {
+                VALUE r_pane = SWIG_NewPointerObj(new wxAuiPaneInfo(pane), SWIGTYPE_p_wxAuiPaneInfo, SWIG_POINTER_OWN);
+                rb_ary_push($result, r_pane);
+              }
+              __CODE
+            map_directorout code: <<~__CODE
+              if (TYPE($input) == T_ARRAY)
+              {
+                for (int i = 0; i < RARRAY_LEN($input); i++)
+                {
+                  void *ptr;
+                  VALUE r_pane = rb_ary_entry($input, i);
+                  int res = SWIG_ConvertPtr(r_pane, &ptr, SWIGTYPE_p_wxAuiPaneInfo, 0);
+                  if (!SWIG_IsOK(res) || !ptr) {
+                    Swig::DirectorTypeMismatchException::raise(swig_get_self(), "load_panes", rb_eTypeError, "in return value. Expected Array of Wx::AuiPaneInfo"); 
+                  }
+                  wxAuiPaneInfo *pane = reinterpret_cast< wxAuiPaneInfo * >(ptr);
+                  $result.push_back(*pane);
+                }
+              }
+              __CODE
+          end
+          spec.map 'std::vector<wxAuiDockInfo>' => 'Array<Wx::AuiDockInfo>' do
+            map_out code: <<~__CODE
+              $result = rb_ary_new();
+              std::vector<wxAuiDockInfo>& docks = (std::vector<wxAuiDockInfo>&)$1;
+              for (const wxAuiDockInfo& dock : docks)
+              {
+                VALUE r_dock = SWIG_NewPointerObj(new wxAuiDockInfo(dock), SWIGTYPE_p_wxAuiDockInfo, SWIG_POINTER_OWN);
+                rb_ary_push($result, r_dock);
+              }
+              __CODE
+            map_directorout code: <<~__CODE
+              if (TYPE($input) == T_ARRAY)
+              {
+                for (int i = 0; i < RARRAY_LEN($input); i++)
+                {
+                  void *ptr;
+                  VALUE r_dock = rb_ary_entry($input, i);
+                  int res = SWIG_ConvertPtr(r_dock, &ptr, SWIGTYPE_p_wxAuiDockInfo, 0);
+                  if (!SWIG_IsOK(res) || !ptr) {
+                    Swig::DirectorTypeMismatchException::raise(swig_get_self(), "load_docks", rb_eTypeError, "in return value. Expected Array of Wx::AuiDockInfo"); 
+                  }
+                  wxAuiDockInfo *dock = reinterpret_cast< wxAuiDockInfo * >(ptr);
+                  $result.push_back(*dock);
+                }
+              }
+              __CODE
+          end
+        end
         # need a custom implementation to handle (event handler proc) cleanup
         spec.add_header_code <<~__HEREDOC
           #include "wx/aui/aui.h"
@@ -80,7 +171,7 @@ module WXRuby3
               rb_gc_mark( rb_art_prov );
             }
           }
-          __HEREDOC
+        __HEREDOC
         spec.add_swig_code '%markfunc wxAuiManager "GC_mark_wxAuiManager";'
         # provide pure Ruby implementation based on use custom alternative provided below
         spec.ignore('wxAuiManager::GetAllPanes')
@@ -110,12 +201,36 @@ module WXRuby3
             WXRubyAuiManager* aui_mng = dynamic_cast<WXRubyAuiManager*> (self);
             managedWnd->Bind(wxEVT_CLOSE_WINDOW, &WXRubyAuiManager::OnManagedWindowClose, aui_mng);
           }
-          __HEREDOC
+        __HEREDOC
         spec.suppress_warning(473, 'wxAuiManager::CreateFloatingFrame')
         spec.do_not_generate(:variables, :defines, :enums, :functions) # with AuiPaneInfo
       end
+
+      def doc_generator
+        AuiManagerDocGenerator.new(self)
+      end
     end # class AuiManager
 
+    class AuiManagerDocGenerator < DocGenerator
+
+      def gen_class_doc_members(fdoc, clsdef, cls_members, alias_methods)
+        super
+        if Config.instance.wx_version >= '3.3.0' && clsdef.name == 'wxAuiDockInfo'
+          fdoc.doc.puts 'Yield each pane to the given block.'
+          fdoc.doc.puts 'If no block passed returns an Enumerator.'
+          fdoc.doc.puts '@yieldparam [Wx::AUI::AuiPaneInfo] pane the Aui pane info yielded'
+          fdoc.doc.puts '@return [::Object, ::Enumerator] result of last block execution or enumerator'
+          fdoc.puts 'def each_pane; end'
+          fdoc.puts
+          fdoc.doc.puts 'Returns an array of Wx::AuiPaneInfo for all panes managed by the frame manager.'
+          fdoc.doc.puts '@return [Array<Wx::AUI::AuiPaneInfo>] info for all managed panes'
+          fdoc.puts 'def get_panes; end'
+          fdoc.puts 'alias_method :panes, :get_panes'
+        end
+      end
+
+    end
+
   end # class Director
 
 end # module WXRuby3

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,23 @@ 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'
+          if Config.instance.wx_version >= '3.3.0'
+            spec.regard 'wxGenericAboutDialog::GetCustomControlParent'
+          end
+          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/pgproperties.rb

@@ -141,7 +141,7 @@ module WXRuby3
           spec.map_apply 'int * OUTPUT' => 'int* pIndex'
         end
         # for UIntProperty and IntProperty
-        if Config.instance.features_set?('USE_LONGLONG')
+        if Config.instance.features_set?('USE_LONGLONG') || Config.instance.wx_version >= '3.3.0'
           # wxLongLong mapping to be considered before considering 'long' (see typecheck precedence)
           spec.map 'const wxLongLong&' => 'Integer' do
             map_in temp: 'wxLongLong tmp', code: <<~__CODE
@@ -162,7 +162,7 @@ module WXRuby3
           end
         else
           spec.ignore 'wxUIntProperty::wxUIntProperty(const wxString &, const wxString &, const wxULongLong &)',
-                      'wxIntProperty::wxUIntProperty(const wxString &, const wxString &, const wxLongLong &)'
+                      'wxIntProperty::wxIntProperty(const wxString &, const wxString &, const wxLongLong &)'
         end
         spec.new_object 'wxArrayStringProperty::CreateEditorDialog'
         spec.suppress_warning(473, 'wxArrayStringProperty::CreateEditorDialog')

data/rakelib/lib/director/property_grid_interface.rb

@@ -39,9 +39,10 @@ module WXRuby3
         spec.extend_interface 'wxPropertyGridInterface',
                               'void SetPropertyValues(const wxVariant &list, const wxPGPropArgCls& defaultCategory = 0)'
         # optionals
-        spec.ignore_unless 'USE_LONGLONG',
-                           'wxPropertyGridInterface::GetPropertyValueAsLongLong',
-                           'wxPropertyGridInterface::GetPropertyValueAsULongLong'
+        unless Config.instance.features_set?('USE_LONGLONG') || Config.instance.wx_version >= '3.3.0'
+          spec.ignore_unless 'wxPropertyGridInterface::GetPropertyValueAsLongLong',
+                             'wxPropertyGridInterface::GetPropertyValueAsULongLong'
+        end
         spec.ignore_unless 'USE_DATETIME', 'wxPropertyGridInterface::GetPropertyValueAsDateTime'
         spec.ignore_unless 'USE_VALIDATORS', 'wxPropertyGridInterface::GetPropertyValidator'
         # fix incorrect XML documentation

data/rakelib/lib/director/textctrl.rb

@@ -24,6 +24,13 @@ module WXRuby3
           spec.ignore 'wxTextCtrl::GTKGetTextBuffer',
                       'wxTextCtrl::GTKGetEditable'
         end
+        if Config.instance.wx_version >= '3.3.0' && Config.instance.wx_port == :wxmsw
+          spec.items << 'wxTextSearch' << 'wxTextSearchResult'
+          spec.regard 'wxTextSearchResult::m_start', 'wxTextSearchResult::m_end'
+          spec.make_readonly 'wxTextSearchResult::m_start', 'wxTextSearchResult::m_end'
+          spec.rename_for_ruby 'start' => 'wxTextSearchResult::m_start',
+                               'end' => 'wxTextSearchResult::m_end'
+        end
         if Config.instance.wx_port == :wxqt
           # not implemented
           spec.ignore 'wxTextCtrl::OnDropFiles'

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/director/variant.rb

@@ -142,7 +142,7 @@ module WXRuby3
                 {
                   return wxVariant(TYPE(rbval) == T_TRUE);
                 }
-          #ifdef wxUSE_LONGLONG
+          #if !defined(wxUSE_LONGLONG) || (wxUSE_LONGLONG == 1)
                 if ((sizeof(long) < 8) && (TYPE(rbval) == T_BIGNUM) && (rb_big_sign(rbval) == 0))
                 {
                   wxLongLong_t ll = rb_big2ll(rbval);
@@ -227,7 +227,7 @@ module WXRuby3
             $1 = rb_obj_is_kind_of($input, rb_const_get(mWxPG, var_ColourPropertyValue_id()));
           __CODE
         end
-        if Config.instance.features_set?('USE_LONGLONG')
+        if Config.instance.features_set?('USE_LONGLONG') || Config.instance.wx_version >= '3.3.0'
           # wxLongLong mapping to be considered before considering 'long' (see typecheck precedence)
           spec.map 'wxLongLong' => 'Integer' do
             map_in code: <<~__CODE

data/rakelib/lib/extractor/function.rb

@@ -49,6 +49,9 @@ module WXRuby3
           @template_params << txt
         end
         @args_string = element.at_xpath('argsstring').text
+        # transform unified initializers to ctor form (SWIG does not like unified initializers)
+        # (also see ParamDef#extract)
+        @args_string.gsub!(/(\w+(::\w+)*)\s*{([^}]*)}/) { |_| "#{$1}(#{$3})"}
         check_deprecated
         element.xpath('param').each do |node|
           p = ParamDef.new(node)
@@ -370,6 +373,8 @@ module WXRuby3
             end
             if element.at_xpath('defval')
               @default = BaseDef.flatten_node(element.at_xpath('defval'))
+              # transform unified initializers to ctor form (SWIG does not like unified initializers)
+              @default.sub!(/(\w+(::\w+)*)\s*{([^}]*)}/) { |_| "#{$1}(#{$3})"}
             end
           end
         rescue Exception

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: ''