wxruby3 1.6.0 → 1.7.0

data/rakelib/lib/director/variant.rb

@@ -114,6 +114,16 @@ module WXRuby3
                   }
                   return wxVariant(arrs);
                 }
+                if ((RARRAY_LEN(rbval) > 0 && TYPE(rb_ary_entry(rbval, 0)) == T_FIXNUM))
+                {
+                  wxArrayInt arri;
+                  for (int i = 0; i < RARRAY_LEN(rbval); i++)
+                  {
+                    VALUE num = rb_ary_entry(rbval, i);
+                    arri.Add(NUM2INT(num));
+                  }
+                  return WXVARIANT(arri);
+                }
                 if (RARRAY_LEN(rbval) == 0 || 
                       rb_obj_is_kind_of(rb_ary_entry(rbval, 0), rb_const_get(mWxCore, var_Variant_id())))
                 {
@@ -170,6 +180,12 @@ module WXRuby3
           }
           __HEREDOC
         spec.add_extend_code 'wxVariant', <<~__HEREDOC
+          wxVariant(const wxArrayInt& val, const wxString &name=wxEmptyString)
+          {
+            wxVariant var(0L, name);
+            var << val;
+            return new wxVariant(var);
+          } 
           wxVariant(const wxFont& val, const wxString &name=wxEmptyString)
           {
             wxVariant var(0L, name);
@@ -188,6 +204,10 @@ module WXRuby3
             var << val;
             return new wxVariant(var);
           }
+          wxArrayInt GetArrayInt()
+          {
+            wxArrayInt arri; arri << *self; return arri;
+          }
           wxFont GetFont() 
           {
             wxFont font; font << *self; return font;
@@ -292,6 +312,12 @@ module WXRuby3
             $1 = (TYPE($input) == T_TRUE) || (TYPE($input) == T_FALSE);
           __CODE
         end
+        # override typecheck for wxArrayInt as we also have to consider
+        # wxVariantList and wxArrayString
+        spec.map 'const wxArrayInt&' do
+          map_typecheck precedence: 'INT32_ARRAY',
+                        code: '$1 = ((TYPE($input) == T_ARRAY) && (RARRAY_LEN($input) > 0) && (TYPE(rb_ary_entry($input, 0)) == T_FIXNUM));'
+        end
         # override typecheck for wxArrayString as we also have to consider
         # wxVariantList
         spec.map 'const wxArrayString&' do
@@ -358,48 +384,64 @@ module WXRuby3
         # provide a custom wxVariantData implementation for Ruby VALUE
         # and some interface extensions to use that from Ruby
         spec.add_header_code <<~__HEREDOC
+          WXRUBY_TRACE_GUARD(WxRubyTraceGCMarkVariant, "GC_MARK_VARIANT")
+          WXRUBY_TRACE_GUARD(WxRubyTraceGCTrackVariant, "GC_TRACK_VARIANT")
+
           class WXRBValueVariantData;
           // Mapping of WXRBValueVariantData* to Ruby VALUE
           WX_DECLARE_VOIDPTR_HASH_MAP(VALUE,
                                       WXRBVariantDataToRbValueHash);
           static WXRBVariantDataToRbValueHash Variant_Value_Map;
 
-          static void wxRuby_markRbValueVariants()
+          static void GC_mark_RbValueVariants()
           {
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkVariant, 2)
+              WXRUBY_TRACE("> GC_mark_RbValueVariants")
+            WXRUBY_TRACE_END
+
             WXRBVariantDataToRbValueHash::iterator it;
             for( it = Variant_Value_Map.begin(); it != Variant_Value_Map.end(); ++it )
             {
               VALUE obj = it->second;
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>1)
-              {
-                void *c_ptr = (TYPE(obj) == T_DATA ? DATA_PTR(obj) : 0);
-                std::wcout << "**** wxRuby_markRbValueVariants : " << it->first << "|" << (void*)c_ptr << std::endl;
-              }
-          #endif 
+
+              WXRUBY_TRACE_IF(WxRubyTraceGCMarkVariant, 2)
+                WXRUBY_TRACE_WITH(void *c_ptr = (TYPE(obj) == T_DATA ? DATA_PTR(obj) : 0))
+                WXRUBY_TRACE("| GC_mark_RbValueVariants : " << it->first << "|" << (void*)c_ptr)
+              WXRUBY_TRACE_END
+
               rb_gc_mark(obj);
             }
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkVariant, 2)
+              WXRUBY_TRACE("< GC_mark_RbValueVariants")
+            WXRUBY_TRACE_END
           }
 
           static void wxRuby_RegisterValueVariantData(void* ptr, VALUE rbval)
           {
-          #ifdef __WXRB_DEBUG__
-            if (wxRuby_TraceLevel()>1)
-            {
-              void *c_ptr = (TYPE(rbval) == T_DATA ? DATA_PTR(rbval) : 0);
-              std::wcout << "**** wxRuby_RegisterValueVariantData : " << ptr << "|" << (void*)c_ptr << std::endl;
-            } 
-          #endif 
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackVariant, 2)
+              WXRUBY_TRACE_WITH(void *c_ptr = (TYPE(rbval) == T_DATA ? DATA_PTR(rbval) : 0))
+              WXRUBY_TRACE("> wxRuby_RegisterValueVariantData : " << ptr << "|" << (void*)c_ptr)
+            WXRUBY_TRACE_END
+
             Variant_Value_Map[ptr] = rbval;
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkVariant, 2)
+              WXRUBY_TRACE("< wxRuby_RegisterValueVariantData")
+            WXRUBY_TRACE_END
           }
 
           static void wxRuby_UnregisterValueVariantData(void* ptr)
           {
-          #ifdef __WXRB_DEBUG__
-            if (wxRuby_TraceLevel()>1)
-              std::wcout << "**** wxRuby_UnregisterValueVariantData : " << ptr << std::endl; 
-          #endif 
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackVariant, 2)
+              WXRUBY_TRACE("> wxRuby_UnregisterValueVariantData : " << ptr)
+            WXRUBY_TRACE_END
+
             Variant_Value_Map.erase(ptr);
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkVariant, 2)
+              WXRUBY_TRACE("< wxRuby_UnregisterValueVariantData")
+            WXRUBY_TRACE_END
           }
 
           class WXRUBY_EXPORT WXRBValueVariantData : public wxVariantData
@@ -460,7 +502,7 @@ module WXRuby3
             return variant;
           }
           __HEREDOC
-        spec.add_init_code 'wxRuby_AppendMarker(wxRuby_markRbValueVariants);'
+        spec.add_init_code 'wxRuby_AppendMarker(GC_mark_RbValueVariants);'
         # ignore GetType (not doc)
         spec.ignore 'wxVariant::GetType', ignore_doc: false
         # replace with custom implementation
@@ -506,6 +548,8 @@ module WXRuby3
           { (*self) = v; }
           void assign(const wxArrayString& v)
           { (*self) = v; }
+          void assign(const wxArrayInt& v)
+          { (*self) << v; }
 
           VALUE to_i()
           {

data/rakelib/lib/director/vlistbox.rb

@@ -16,30 +16,37 @@ module WXRuby3
 
       def setup
         super
-        spec.override_inheritance_chain('wxVListBox', [{ 'wxVScrolledWindow' => 'wxHVScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        spec.gc_as_window
+        if Config.instance.wx_version_check('3.3.1') > 0
+          spec.override_inheritance_chain('wxVListBox', [{ 'wxVScrolledCanvas' => 'wxVScrolledCanvas' }, 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        elsif Config.instance.wx_version_check('3.3.0') > 0
+          spec.override_inheritance_chain('wxVListBox', [{ 'wxVScrolledWindow' => 'wxVScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        else
+          spec.override_inheritance_chain('wxVListBox', [{ 'wxVScrolledWindow' => 'wxHScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        end
         spec.make_abstract 'wxVListBox'
         # provide base implementations for OnDrawItem and OnMeasureItem
-        spec.add_header_code <<~__HEREDOC
-          // Custom subclass implementation. 
-          class wxRubyVListBox : public wxVListBox
-          {
-          public:
-            wxRubyVListBox() 
-              : wxVListBox () {}
-            wxRubyVListBox(wxWindow *parent, wxWindowID id=wxID_ANY, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=0, const wxString &name=wxVListBoxNameStr)
-              : wxVListBox(parent, id, pos, size, style, name) {}
-          protected:
-            virtual void OnDrawItem(wxDC&, const wxRect&, size_t) const
-            {
-            }
-            virtual wxCoord OnMeasureItem(size_t) const
-            {
-              return {};
-            }
-          };
-        __HEREDOC
-        # make Ruby director and wrappers use custom implementation
-        spec.use_class_implementation('wxVListBox', 'wxRubyVListBox')
+        # spec.add_header_code <<~__HEREDOC
+        #   // Custom subclass implementation.
+        #   class wxRubyVListBox : public wxVListBox
+        #   {
+        #   public:
+        #     wxRubyVListBox()
+        #       : wxVListBox () {}
+        #     wxRubyVListBox(wxWindow *parent, wxWindowID id=wxID_ANY, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=0, const wxString &name=wxVListBoxNameStr)
+        #       : wxVListBox(parent, id, pos, size, style, name) {}
+        #   protected:
+        #     virtual void OnDrawItem(wxDC&, const wxRect&, size_t) const
+        #     {
+        #     }
+        #     virtual wxCoord OnMeasureItem(size_t) const
+        #     {
+        #       return {};
+        #     }
+        #   };
+        # __HEREDOC
+        # # make Ruby director and wrappers use custom implementation
+        # spec.use_class_implementation('wxVListBox', 'wxRubyVListBox')
         # make sure protected methods are included
         spec.regard 'wxVListBox::OnDrawItem',
                     'wxVListBox::OnMeasureItem',

data/rakelib/lib/director/window.rb

@@ -127,7 +127,7 @@ module WXRuby3
             spec.ignore 'wxWindow::EnableTouchEvents'
           end
           if Config.instance.wx_version_check('3.3.0') >= 0
-            spec.ignore_unless('WXMSW', 'wxWindow::MSWDisableComposited')
+            spec.ignore_unless('WXMSW', 'wxWindow::MSWDisableComposited') if Config.instance.wx_version_check('3.3.1') <= 0
             spec.ignore('wxWindow::GTKGetWin32Handle')
           end
           if Config.instance.features_set?('USE_ACCESSIBILITY')
@@ -236,6 +236,10 @@ module WXRuby3
           spec.override_events 'wxWindow', 'EVT_ACTIVATE' => ['EVT_ACTIVATE', 0, 'wxActivateEvent']
         when 'wxNonOwnedWindow'
           spec.no_proxy('wxNonOwnedWindow')
+          if Config.instance.features_set?('WXOSX')
+            spec.extend_interface('wxNonOwnedWindow',
+                                  'virtual bool Destroy() override')
+          end
         when 'wxControl'
           # add these to the generated interface to be parsed by SWIG
           # the wxWidgets docs are flawed in this respect that several reimplemented
@@ -288,6 +292,7 @@ module WXRuby3
                           "#{spec.class_name(citem)}::GetScrollRange",
                           "#{spec.class_name(citem)}::GetScrollThumb",
                           "#{spec.class_name(citem)}::GetTextExtent",
+                          "#{spec.class_name(citem)}::GetDPI",
                           "#{spec.class_name(citem)}::HasCapture",
                           "#{spec.class_name(citem)}::HasMultiplePages",
                           "#{spec.class_name(citem)}::IsDoubleBuffered",
@@ -305,6 +310,9 @@ module WXRuby3
                           "#{spec.class_name(citem)}::SetBackgroundColour",
                           "#{spec.class_name(citem)}::SetBackgroundStyle",
                           "#{spec.class_name(citem)}::HasTransparentBackground",
+                          "#{spec.class_name(citem)}::CanSetTransparent",
+                          "#{spec.class_name(citem)}::SetTransparent",
+                          "#{spec.class_name(citem)}::GetThemeEnabled",
                           "#{spec.class_name(citem)}::SetCursor",
                           "#{spec.class_name(citem)}::SetFocus",
                           "#{spec.class_name(citem)}::SetFocusFromKbd",
@@ -329,12 +337,14 @@ module WXRuby3
                           "#{spec.class_name(citem)}::GetDefaultAttributes",
                           "#{spec.class_name(citem)}::GetWindowStyleFlag",
                           "#{spec.class_name(citem)}::GetDropTarget",
+                          "#{spec.class_name(citem)}::SetDropTarget",
                           "#{spec.class_name(citem)}::GetValidator",
                           "#{spec.class_name(citem)}::IsTopLevel",
                           "#{spec.class_name(citem)}::EnableTouchEvents",
                           "#{spec.class_name(citem)}::WarpPointer",
                           "#{spec.class_name(citem)}::AdjustForLayoutDirection",
-                          "#{spec.class_name(citem)}::IsTransparentBackgroundSupported")
+                          "#{spec.class_name(citem)}::IsTransparentBackgroundSupported",
+                          "#{spec.class_name(citem)}::Reparent")
             if Config.instance.features_set?('USE_ACCESSIBILITY')
               if Config.instance.wx_version_check('3.2.4') > 0
                 spec.no_proxy "#{spec.class_name(citem)}::CreateAccessible"

data/rakelib/lib/director/xml_resource.rb

@@ -18,6 +18,12 @@ module WXRuby3
         spec.ignore %w[wxXmlResource::AddHandler wxXmlResource::ClearHandlers wxXmlResource::InsertHandler]
         # not really added value; will add alternative allowing more flexibility (see below)
         spec.ignore 'wxXmlResource::LoadDocument(wxXmlDocument *, const wxString &)'
+        # unwanted in Ruby
+        spec.ignore 'wxXmlResource::LoadObject',
+                    'wxXmlResource::LoadObjectRecursively'
+        # unattached loaders return owned objects
+        spec.new_object 'wxXmlResource::LoadMenu(const wxString &)',
+                        'wxXmlResource::LoadMenuBar(const wxString &)'
         # For these three methods, there are two variants in wxWidgets. One loads an
         # XRC from scratch and returns an instance of a core Wx class
         # (Wx::Dialog, Wx::Frame, or Wx::Panel). The other loads a layout into

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

@@ -25,4 +25,4 @@
       :para:
         - :pattern: !ruby/regexp /The overridden version may return true but modify.*appending them./
           :replace: |
-            The overridden version may return a 2-element array with an AuiTabCtrl and tab index instead to change where the page should be inserted, e.g. by returning a tab index of 0 to insert the new pages at the beginning instead of appending them.
+            The overridden version may return a 2-element array with an {Wx::AUI::AuiTabCtrl} and tab index instead to change where the page should be inserted, e.g. by returning a tab index of 0 to insert the new pages at the beginning instead of appending them.

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

@@ -0,0 +1,26 @@
+---
+:wxRichToolTip:
+  :detail:
+    :pre:
+      :para:
+        - :pattern: !ruby/regexp /The images below show some examples.*/
+          :replace: |
+
+      :programlisting:
+        - :pattern: !ruby/regexp /.*/
+          :replace: |
+            
+            ```ruby
+              password = Wx::TextCtrl.new(..., style: Wx::TE_PASSWORD)
+              # ...
+              tip = Wx::RichToolTip.new("Caps Lock is on",
+                                        "You might have made an error in your password\n" +
+                                        "entry because Caps Lock is turned on.\n" +
+                                        "\n" +
+                                        "Press Caps Lock key to turn it off.")
+               tip.set_icon(Wx::ICON_WARNING)
+               tip.show_for(password)
+            ```
+    :post:
+      - :pattern: !ruby/regexp /<div class='appearance'>.*</table></div>/m
+        :subst: ''

data/rakelib/lib/generate/doc.rb

@@ -49,7 +49,7 @@ module WXRuby3
           end
           table = { 'Wx' => {}}
           handle_module(Wx, table['Wx'])
-          STDOUT.puts JSON.dump(table)
+          File.open(ARGV[0], 'w+') { |f| f << JSON.dump(table) }
         __SCRIPT
         STDERR.puts "* executing constants collection script:\n#{script}" if Director.trace?
         begin
@@ -57,22 +57,27 @@ module WXRuby3
           ftmp_name = tmpfile.path.dup
           tmpfile << script
           tmpfile.close(false)
-          result = if Director.trace?
-                     Config.instance.run(ftmp_name, capture: :out, verbose: false)
-                   else
-                     Config.instance.run(ftmp_name, capture: :no_err, verbose: false)
-                   end
+          tmpconsts = Tempfile.new('constants')
+          fconsts_name = tmpconsts.path.dup
+          tmpconsts.close(false)
+          if Director.trace?
+            Config.instance.run(ftmp_name, fconsts_name, capture: :out, verbose: false)
+          else
+            Config.instance.run(ftmp_name, fconsts_name, capture: :no_err, verbose: false)
+          end
+          result = File.read(fconsts_name)
           STDERR.puts "* got constants collection output:\n#{result}" if Director.trace?
           begin
             db = JSON.load(result)
           rescue Exception
-            File.open('constants_raw.json', "w") { |f| f << result } if Director.verbose?
+            # File.open('constants_raw.json', "w") { |f| f << result } if Director.verbose?
             ::Kernel.raise RuntimeError, "Exception loading constants collection result: #{$!.message.slice(0, 512)}", cause: nil
           end
           File.open('constants.json', "w") { |f| f << JSON.pretty_generate(db) } if Director.verbose?
           return db
         ensure
           File.unlink(ftmp_name)
+          File.unlink(fconsts_name)
         end
       end
 

data/rakelib/lib/generate/interface.rb

@@ -262,6 +262,16 @@ module WXRuby3
             fout.puts extension
             fout.puts '};'
           end
+          item.innerclasses.each do |inner|
+            if inner.protection == 'public' && !inner.ignored && !inner.deprecated
+              extension = extend_code("#{class_name(item)}::#{class_name(inner)}")
+              unless extension.empty?
+                fout.puts "\n%extend #{class_name(item)}::#{class_name(inner)} {"
+                fout.puts extension
+                fout.puts '};'
+              end
+            end
+          end
         end
       end
     end
@@ -523,7 +533,12 @@ module WXRuby3
       typedefs = def_items.select {|item| Extractor::TypedefDef === item && !item.ignored }
       typedefs.each do |item|
         fout.puts
-        fout.puts "#{item.definition};"
+        # work around problems with older doxygen and wxw < 3.3
+        if item.definition.start_with?('typedef')
+          fout.puts "#{item.definition};"
+        else # with older doxygen 'definition' is often not complete statement so we form it here
+          fout.puts "typedef #{item.type} #{item.name};"
+        end
       end
       fout.puts '' unless typedefs.empty?
     end

data/rakelib/lib/specs/interfaces.rb

@@ -32,6 +32,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxApp')
     Director.Spec(pkg, 'wxAppTraits')
     Director.Spec(pkg, 'wxConfigBase')
+    Director.Spec(pkg, 'wxDisplay')
     Director.Spec(pkg, 'wxDC')
     Director.Spec(pkg, 'wxWindowDC', director: Director::DerivedDC)
     Director.Spec(pkg, 'wxClientDC', director: Director::DerivedDC)
@@ -122,6 +123,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxCursor')
     Director.Spec(pkg, 'wxRadioButton', director: Director::Window, requirements: %w[USE_RADIOBTN])
     Director.Spec(pkg, 'wxToolTip', requirements: %w[USE_TOOLTIPS])
+    Director.Spec(pkg, 'wxRichToolTip', requirements: %w[USE_RICHTOOLTIP])
     Director.Spec(pkg, 'wxLog', requirements: %w[USE_LOG])
     Director.Spec(pkg, 'wxToolBar', requirements: %w[USE_TOOLBAR])
     Director.Spec(pkg, 'wxImage', requirements: %w[USE_IMAGE])
@@ -139,7 +141,9 @@ module WXRuby3
     Director.Spec(pkg, 'wxScrolledWindow', director: Director::ScrolledT)
     Director.Spec(pkg, 'wxScrolledCanvas', director: Director::ScrolledT)
     Director.Spec(pkg, 'wxScrolledControl', director: Director::ScrolledT)
-    Director.Spec(pkg, 'wxHVScrolledWindow')
+    Director.Spec(pkg, 'wxHScrolledWindow', director: Director::HVScrolled)
+    Director.Spec(pkg, 'wxVScrolledWindow', director: Director::HVScrolled)
+    Director.Spec(pkg, 'wxVScrolledCanvas', director: Director::HVScrolled)
     Director.Spec(pkg, 'wxVListBox')
     Director.Spec(pkg, 'wxFindReplaceData', requirements: %w[USE_FINDREPLDLG])
     Director.Spec(pkg, 'wxFindReplaceDialog', director: Director::Dialog, requirements: %w[USE_FINDREPLDLG])
@@ -209,7 +213,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxDragDrop', requirements: %w[USE_DRAG_AND_DROP])
     Director.Spec(pkg, 'wxContextHelpButton', requirements: %w[USE_HELP])
     Director.Spec(pkg, 'wxHelpProvider', requirements: %w[USE_HELP])
-    Director.Spec(pkg, 'wxTipWindow', requirements: %w[USE_HELP])
+    Director.Spec(pkg, 'wxTipWindow', requirements: %w[USE_TIPWINDOW])
     Director.Spec(pkg, 'wxHelpController', requirements: %w[USE_HELP])
     Director.Spec(pkg, 'wxExtHelpController', director: Director::HelpController, requirements: %w[USE_HELP])
     Director.Spec(pkg, 'wxTaskBarIconEvent', director: Director::Event, requirements: %w[USE_TASKBARICON])

data/rakelib/lib/swig_runner.rb

@@ -24,8 +24,12 @@ module WXRuby3
       include Util::StringUtil
 
       def swig_major
+        swig_version.first
+      end
+
+      def swig_version
         check_swig unless swig_state
-        (@swig_version || '').split('.').first.to_i
+        @swig_version
       end
 
       private
@@ -38,32 +42,28 @@ module WXRuby3
         !!@swig_state
       end
 
-      def swig_version
-        check_swig unless swig_state
-        @swig_version
-      end
-
       def check_swig
         begin
-          @swig_version = `#{WXRuby3::Config.get_config('swig')} -version`[/\d+\.\d+\.\d+/]
+          swig_version_ = `#{WXRuby3::Config.get_config('swig')} -version`[/\d+\.\d+\.\d+/]
         rescue Exception
           $stderr.puts "ERROR: Could not run SWIG (#{WXRuby3::Config.get_config('swig')})"
           exit(1)
         end
 
         # Very old versions put --version on $stderr, not $stdout
-        unless @swig_version
+        unless swig_version_
           $stderr.puts "Could not get version info from SWIG; " +
                         "is a very old version installed?.\n"
           exit(1)
         end
 
-        if @swig_version < SWIG_MINIMUM_VERSION
-          $stderr.puts "SWIG version #{@swig_version} is installed, " +
+        if swig_version_ < SWIG_MINIMUM_VERSION
+          $stderr.puts "SWIG version #{swig_version_} is installed, " +
                         "minimum version required is #{SWIG_MINIMUM_VERSION}.\n"
           exit(1)
         end
 
+        @swig_version = swig_version_.split('.').map(&:to_i)
         @swig_state = true
       end
 
@@ -418,14 +418,14 @@ module WXRuby3
           # get the generated (class) items for which an alternate implementation has been registered
           class_list = def_items.select { |itm| Extractor::ClassDef === itm && itm.name != class_implementation(itm.name) }
           # create re match list for class names
-          cls_re_txt = class_list.collect { |clsdef| clsdef.name }.join('|')
+          cls_re_txt = class_list.collect { |clsdef| class_name(clsdef.name) }.join('|')
           # updating any matching alloc functions in generated SWIG sourcecode
           # create regexp for 'initialize' wrappers (due to overloads this could be more than one per class)
           new_re = /_wrap_new_(#{cls_re_txt})\w*\(.*\)/
           # check if any of the selected classes have a Director proxy enabled
           if proxies_enabled = class_list.any? { |clsdef| has_proxy?(clsdef) }
             # create re match list for classes with director proxy enabled
-            dir_cls_re_txt = class_list.select { |clsdef| has_proxy?(clsdef) }.collect { |cd| cd.name }.join('|')
+            dir_cls_re_txt = class_list.select { |clsdef| has_proxy?(clsdef) }.collect { |cd| class_name(cd.name) }.join('|')
             # create regexp for Director constructors (may not exist if no proxies are enabled)
             dir_ctor_re = /SwigDirector_\w+::SwigDirector_\w+\(.*\)\s*:\s*(#{dir_cls_re_txt})\(.*\)\s*,\s*Swig::Director.*{/
             # create regexp for method wrappers other than 'initialize' wrappers

data/rakelib/lib/typemap/aui_tabctrl.rb

@@ -0,0 +1,46 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 Common typemap definitions
+###
+
+require_relative '../core/mapping'
+
+module WXRuby3
+
+  module Typemap
+
+    # These typemaps are used by AUI classes to convert wxAuiTabCtrl pointers
+    # into lightweight wrapper objects
+    module AuiTabCtrl
+
+      include Typemap::Module
+
+      define do
+
+        map 'wxAuiTabCtrl*' => 'Wx::AUI::AuiTabCtrl' do
+
+          add_header_code <<~__CODE
+            // implemented in TreeEvent.cpp
+            extern VALUE _wxRuby_Wrap_wxAuiTabCtrl(wxAuiTabCtrl* wxATC);
+            extern wxAuiTabCtrl* _wxRuby_Unwrap_wxAuiTabCtrl(VALUE rbATC);
+            extern bool _wxRuby_Is_wxAuiTabCtrl(VALUE rbATC);
+            __CODE
+
+          map_in temp: 'wxAuiTabCtrl *tmpATC', code: <<~__CODE
+            if ($input != Qnil) tmpATC = _wxRuby_Unwrap_wxAuiTabCtrl($input);
+            $1 = tmpATC;
+            __CODE
+
+          map_out code: '$result = _wxRuby_Wrap_wxAuiTabCtrl($1);'
+        end
+
+      end # define
+
+    end # AuiTabCtrl
+
+  end # Typemap
+
+end # WXRuby3

data/rakelib/lib/typemap/common.rb

@@ -565,7 +565,7 @@ module WXRuby3
         map 'wxUpdateUIEvent &' => 'Wx::UpdateUIEvent' do
           map_directorin code: <<~__CODE
             #ifdef __WXRB_DEBUG__
-            $input = wxRuby_WrapWxEventInRuby(this, static_cast<wxEvent*> (&$1));
+            $input = wxRuby_WrapWxEventInRuby(const_cast<void*>((const void*)this), static_cast<wxEvent*> (&$1));
             #else
             $input = wxRuby_WrapWxEventInRuby(static_cast<wxEvent*> (&$1));
             #endif
@@ -577,7 +577,7 @@ module WXRuby3
         map 'wxCommandEvent &' => 'Wx::CommandEvent' do
           map_directorin code: <<~__CODE
             #ifdef __WXRB_DEBUG__
-            $input = wxRuby_WrapWxEventInRuby(this, static_cast<wxEvent*> (&$1));
+            $input = wxRuby_WrapWxEventInRuby(const_cast<void*>((const void*)this), static_cast<wxEvent*> (&$1));
             #else
             $input = wxRuby_WrapWxEventInRuby(static_cast<wxEvent*> (&$1));
             #endif
@@ -598,7 +598,7 @@ module WXRuby3
         map 'wxKeyEvent &' => 'Wx::KeyEvent' do
           map_directorin code: <<~__CODE
             #ifdef __WXRB_DEBUG__
-            $input = wxRuby_WrapWxEventInRuby(this, static_cast<wxEvent*> (&$1));
+            $input = wxRuby_WrapWxEventInRuby(const_cast<void*>((const void*)this), static_cast<wxEvent*> (&$1));
             #else
             $input = wxRuby_WrapWxEventInRuby(static_cast<wxEvent*> (&$1));
             #endif

data/rakelib/lib/typemap/print_page_range.rb

@@ -54,17 +54,45 @@ module WXRuby3
 
           map 'std::vector<wxPrintPageRange> &' => 'Array<Wx::PRT::PrintPageRange>' do
 
-            map_in temp: 'std::vector<wxPrintPageRange> tmp_vector', code: '$1 = &tmp_vector;'
+            map_in temp: 'std::vector<wxPrintPageRange> tmp', code: <<~__CODE
+                if (TYPE($input) == T_ARRAY)
+                {
+                  $1 = &tmp;
+                  for (int i = 0; i < RARRAY_LEN($input); i++)
+                  {
+                    void *ptr;
+                    VALUE r_range = rb_ary_entry($input, i);
+                    int res = SWIG_ConvertPtr(r_range, &ptr, SWIGTYPE_p_wxPrintPageRange, 0);
+                    if (!SWIG_IsOK(res) || !ptr) {
+                      rb_raise(rb_eTypeError, "Expected Array of Wx::PRT::PrintPageRange for 1");
+                    }
+                    wxPrintPageRange *range = reinterpret_cast< wxPrintPageRange * >(ptr);
+                    $1->push_back(*range);
+                  }
+                }
+                else {
+                  rb_raise(rb_eArgError, "Expected Array of Wx::PRT::PrintPageRange for 1");
+                }      
+                __CODE
 
             map_argout code: <<~__CODE
+                VALUE rb_ranges = rb_ary_new();
                 for (const wxPrintPageRange& range : *$1)
                 {
-                  VALUE r_range = SWIG_NewPointerObj(new wxPrintPageRange(range), SWIGTYPE_p_wxPrintPageRange, SWIG_POINTER_OWN);
-                  rb_ary_push($input, r_range);
+                  VALUE rb_range = SWIG_NewPointerObj(new wxPrintPageRange(range), SWIGTYPE_p_wxPrintPageRange, SWIG_POINTER_OWN);
+                  rb_ary_push(rb_ranges, rb_range);
                 }
+                $result = SWIG_AppendOutput($result, rb_ranges);
                 __CODE
 
-            map_directorin code: '$input = rb_ary_new();'
+            map_directorin code: <<~__CODE
+                $input = rb_ary_new();
+                for (const wxPrintPageRange& range : $1)
+                {
+                  VALUE rb_range = SWIG_NewPointerObj(new wxPrintPageRange(range), SWIGTYPE_p_wxPrintPageRange, SWIG_POINTER_OWN);
+                  rb_ary_push($input, rb_range);
+                }
+                __CODE
 
             map_directorargout code: <<~__CODE
                 for (int i = 0; i < RARRAY_LEN($result); i++)
@@ -83,10 +111,6 @@ module WXRuby3
 
           end
         end
-        # Doc only mapping def
-        map 'std::vector<wxPrintPageRange> &' => 'Array<Wx::PRT::PrintPageRange>', swig: false do
-          map_in
-        end
 
       end