wxruby3 0.9.0.pre.rc.3 → 0.9.1

data/rakelib/lib/swig_runner.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 SWIG code generation runner
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'fileutils'
@@ -221,6 +224,10 @@ module WXRuby3
               name = $1
               line['rb_funcall'] = 'wxRuby_Funcall'
               line[name] = '"%s"' % rb_method_name(name[1..-2])
+              # director output exceptions
+            when /Swig::DirectorTypeMismatchException::raise\(swig_get_self\(\),\s+\"(\w+)\"/
+              name = $1
+              line[%Q{"#{name}"}] = %Q{"#{rb_method_name(name)}"}
               # defined alias methods (original method name)
             when /rb_define_alias\s*\(.*"[_a-zA-Z0-9]+[=\?]?".*("[_a-zA-Z0-9]*[=\?\!]?")/
               name = $1
@@ -255,10 +262,10 @@ module WXRuby3
           def_items.each do |item|
             case item
             when Extractor::EnumDef
-              item.items.each { |e| enumerators[rb_wx_name(e.name)] = rb_wx_name(item.name) } if item.is_type
+              item.items.each { |e| enumerators[rb_wx_name(e.name)] = item } if item.is_type
             when Extractor::ClassDef
               item.items.select { |itm| Extractor::EnumDef === itm }.each do |enum|
-                enum.items.each { |e| enumerators[rb_wx_name(e.name)] = rb_wx_name(enum.name) } if enum.is_type
+                enum.items.each { |e| enumerators[rb_wx_name(e.name)] = enum } if enum.is_type
               end
             end
           end
@@ -272,11 +279,8 @@ module WXRuby3
           core_name = name
           core_name = 'ruby3' if /\Awx\Z/i =~ core_name
 
-          skip_entire_method = false
-          brace_level = 0
-
           fix_enum = false
-          enum_name = nil
+          enum_item = nil
 
           found_init = false
 
@@ -285,51 +289,18 @@ module WXRuby3
               # all following fixes are applicable only before we reached the
               # Init_ function
 
-              # comment out swig_up because it is defined global in every module
-              if (line.index("bool Swig::Director::swig_up"))
-                line = "//" + line
-              end
-
-              if line =~ /char\* type_name = (RSTRING\(value\)->ptr|RSTRING_PTR\(value\));/
-                line = ""
-              end
-              # Patch submitted for SWIG 1.3.30
-              if (line.index("if (strcmp(type->name, type_name) == 0) {"))
-                line = "		if ( value != Qnil && rb_obj_is_kind_of(obj, sklass->klass) ) {"
-              end
-              #TODO 1.3.30
-              #			end
-
               # Fix the class names used to determine derived/non-derived in 'initialize' ('new')
               # wrappers
               if line =~ /const\s+char\s+\*classname\s+SWIGUNUSED\s+=\s+"Wx#{core_name}::wx(\w+)";/
                 line.sub!(/\"Wx#{core_name}::wx#{$1}/, "\"#{package.fullname}::#{$1}")
               end
 
-              # remove the UnknownExceptionHandler::handler method
-              if line.index('void UnknownExceptionHandler::handler()')
-                skip_entire_method = true
-              end
-
-              if (skip_entire_method)
-                line = "//#{line}"
-                if (line.index('{'))
-                  brace_level += 1
-                end
-                if (line.index('}'))
-                  brace_level -= 1
-                end
-                if (brace_level == 0)
-                  skip_entire_method = false
-                end
-              end
-
               # at the top of our Init_ function, make sure we only initialize
               # ourselves once
               if /void\s+Init_(wx|Wx)#{core_name}\(/ =~ line
-                line += "static bool initialized;\n"
-                line += "if(initialized) return;\n"
-                line += "initialized = true;\n"
+                line += "\n  static bool initialized;\n"
+                line += "  if(initialized) return;\n"
+                line += "  initialized = true;\n"
                 found_init = true # switch to init fixes
               end
 
@@ -355,58 +326,53 @@ module WXRuby3
                 line << "\n  wxRuby_SetSwigTypeForClass(#{$2}.klass, #{$1});"
               end
 
-              # TODO : can we improve this?
-              # Fix for Event.i - because it is implemented with a custom Ruby
-              # subclass, need to make this subclass SWIG info available under
-              # the normal name "SWIGTYPE_p_wxEvent" as it's referenced by many
-              # other classes.
-              if core_name == 'Event' or core_name == 'CommandEvent'
-                if line[/SWIG_TypeClientData\(SWIGTYPE_p_wxRuby(Command)?Event/]
-                  line = line +
-                    "  // Inserted by fixmodule.rb\n" +
-                    line.sub(/SWIGTYPE_p_wxRuby(Command)?Event/,
-                             "SWIGTYPE_p_wx\\1Event")
-                end
-              end
-
               # check for known enumerator constants
               if (md = /rb_define_const\s*\(([^,]+),\s*"([_a-zA-Z0-9]*)"(.*)/.match(line)) # constant definition?
                 if !fix_enum # not fixing one yet
                   # have we reached the first of a known enum?
                   if enum_table.has_key?(md[2])
                     fix_enum = true
-                    enum_name = enum_table[md[2]]
+                    enum_item = enum_table[md[2]]
+                    enum_name = rb_wx_name(enum_item.name)
+                    enum_id = enum_item.scope.empty? ? enum_name : "#{rb_wx_name(enum_item.scope)}::#{enum_name}"
+                    enum_var = enum_id.gsub('::', '_')
                     line = [
                       '',
-                      # create new enum class
-                      "  VALUE cWx#{enum_name} = wxRuby_CreateEnumClass(\"#{enum_name}\"); // Inserted by fixmodule.rb",
-                      # add enum class constant to current module
-                      "  rb_define_const(#{md[1]}, \"#{enum_name}\", cWx#{enum_name}); // Inserted by fixmodule.rb",
+                      # create new enum class (use scoped id)
+                      "  VALUE cWx#{enum_var} = wxRuby_CreateEnumClass(\"#{enum_id}\"); // Inserted by fixmodule.rb",
+                      # add enum class constant to current module (use unscoped name)
+                      "  rb_define_const(#{md[1]}, \"#{enum_name}\", cWx#{enum_var}); // Inserted by fixmodule.rb",
                       # create enumerator value const under new enum class
-                      "  wxRuby_AddEnumValue(cWx#{enum_name}, \"#{md[2]}\"#{md[3]} // Updated by fixmodule.rb"
+                      "  wxRuby_AddEnumValue(cWx#{enum_var}, \"#{md[2]}\"#{md[3]} // Updated by fixmodule.rb"
                     ].join("\n")
                   end
                 else
                   # still an enumerator?
                   if enum_table.has_key?(md[2])
                     # of the same enum?
-                    if enum_table[md[2]] == enum_name
+                    if enum_item && enum_table[md[2]] == enum_item
+                      enum_name = rb_wx_name(enum_item.name)
+                      enum_id = enum_item.scope.empty? ? enum_name : "#{rb_wx_name(enum_item.scope)}::#{enum_name}"
+                      enum_var = enum_id.gsub('::', '_')
                       # create enumerator value const under new enum class
-                      line = "  wxRuby_AddEnumValue(cWx#{enum_name}, \"#{md[2]}\"#{md[3]} // Updated by fixmodule.rb"
+                      line = "  wxRuby_AddEnumValue(cWx#{enum_var}, \"#{md[2]}\"#{md[3]} // Updated by fixmodule.rb"
                     else # we found the start of another enum
-                      enum_name = enum_table[md[2]]
+                      enum_item = enum_table[md[2]]
+                      enum_name = rb_wx_name(enum_item.name)
+                      enum_id = enum_item.scope.empty? ? enum_name : "#{rb_wx_name(enum_item.scope)}::#{enum_name}"
+                      enum_var = enum_id.gsub('::', '_')
                       line = [
                         '',
-                        # create new enum class
-                        "  VALUE cWx#{enum_name} = wxRuby_CreateEnumClass(\"#{enum_name}\"); // Inserted by fixmodule.rb",
-                        # add enum class constant to current module
-                        "  rb_define_const(#{md[1]}, \"#{enum_name}\", cWx#{enum_name}); // Inserted by fixmodule.rb",
+                        # create new enum class (use scoped id)
+                        "  VALUE cWx#{enum_var} = wxRuby_CreateEnumClass(\"#{enum_id}\"); // Inserted by fixmodule.rb",
+                        # add enum class constant to current module (use unscoped name)
+                        "  rb_define_const(#{md[1]}, \"#{enum_name}\", cWx#{enum_var}); // Inserted by fixmodule.rb",
                         # create enumerator value const under new enum class
-                        "  wxRuby_AddEnumValue(cWx#{enum_name}, \"#{md[2]}\"#{md[3]} // Updated by fixmodule.rb"
+                        "  wxRuby_AddEnumValue(cWx#{enum_var}, \"#{md[2]}\"#{md[3]} // Updated by fixmodule.rb"
                       ].join("\n")
                     end
                   else # end of enum def
-                    enum_name = nil
+                    enum_item = nil
                     fix_enum = false
                   end
                 end

data/rakelib/lib/typemap/array_int_selections.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 Common typemap definitions
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative '../core/mapping'

data/rakelib/lib/typemap/common.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 Common typemap definitions
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative '../core/mapping'
@@ -97,6 +100,7 @@ module WXRuby3
         map 'wxString' => 'String' do
           map_in code: '$1 = RSTR_TO_WXSTR($input);'
           map_out code: '$result = WXSTR_TO_RSTR($1);'
+          map_directorin code: '$input = WXSTR_TO_RSTR($1);'
           map_directorout code: '$result = RSTR_TO_WXSTR($input);'
           map_typecheck precedence: 'STRING', code: '$1 = (TYPE($input) == T_STRING);'
           map_varout code: '$result = WXSTR_TO_RSTR($1);'
@@ -211,7 +215,7 @@ module WXRuby3
             if ( TYPE($input) == T_DATA )
             {
               void* argp$argnum;
-              SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 1 );
+              SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 0);
               $1 = reinterpret_cast< $1_basetype * >(argp$argnum);
             }
             else if ( TYPE($input) == T_ARRAY )
@@ -236,6 +240,28 @@ module WXRuby3
             __CODE
         end
 
+        map 'wxSize' => 'Array(Integer, Integer), Wx::Size',
+            'wxPoint' => 'Array(Integer, Integer), Wx::Point' do
+
+          map_directorout code: <<~__CODE
+            if (TYPE($input) == T_ARRAY && RARRAY_LEN($input) == 2)
+            {
+              $result = $1_basetype(NUM2INT( rb_ary_entry($input, 0)),
+                                    NUM2INT( rb_ary_entry($input, 1)));
+            }
+            else
+            {
+              void *ptr;
+              int res = SWIG_ConvertPtr($input, &ptr, $&1_descriptor, SWIG_POINTER_NO_NULL);
+              if (!SWIG_IsOK(res)) {
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", SWIG_ErrorType(SWIG_ArgError(res)), "in output value of type '""$1_type""'");
+              }
+              $result = *(reinterpret_cast< $1_type * >(ptr));
+            }
+            __CODE
+
+        end
+
         # Integer <> wxItemKind type mappings
 
         map 'wxItemKind' => 'Integer' do
@@ -374,7 +400,7 @@ module WXRuby3
           map_typecheck precedence: 'INT32_ARRAY', code: '$1 = (TYPE($input) == T_ARRAY);'
         end
 
-        # input reference
+        # input reference (out by value)
         map 'wxArrayInt&' => 'Array<Integer>' do
           map_in temp: 'wxArrayInt tmp', code: <<~__CODE
             if (($input == Qnil) || (TYPE($input) != T_ARRAY))
@@ -391,6 +417,13 @@ module WXRuby3
               $1 = &tmp;
             }
             __CODE
+          map_out code: <<~__CODE
+            $result = rb_ary_new();
+            for (size_t i = 0; i < $1->GetCount(); i++)
+            {
+              rb_ary_push($result,INT2NUM( $1->Item(i) ) );
+            }
+            __CODE
           map_directorin code: <<~__CODE
             $input = rb_ary_new();
             for (size_t i = 0; i < $1.GetCount(); i++)
@@ -399,6 +432,8 @@ module WXRuby3
             }
           __CODE
           map_typecheck precedence: 'INT32_ARRAY', code: '$1 = (TYPE($input) == T_ARRAY);'
+          # no directorout mapping as returning a reference would cause trouble; luckily there
+          # do not seem to be virtual methods returning that
         end
 
         # various enumerator type mappings
@@ -443,12 +478,10 @@ module WXRuby3
         end
 
 
-        # Validators must be cast to correct subclass, but internal validator
-        # is a clone, and should not be freed, so disown after wrapping.
+        # Validators must be cast to correct subclass, but not owned
         map 'wxValidator*' => 'Wx::Validator' do
           map_out code: <<~__CODE
             $result = wxRuby_WrapWxObjectInRuby($1);
-            if (!NIL_P($result)) RDATA($result)->dfree = SWIG_RubyRemoveTracking;
             __CODE
         end
 
@@ -492,6 +525,27 @@ module WXRuby3
             __CODE
         end
 
+        # For various editor controls
+
+        map 'const wxKeyEvent &' => 'Wx::KeyEvent' do
+          map_directorin code: <<~__CODE
+            #ifdef __WXRB_DEBUG__
+            $input = wxRuby_WrapWxEventInRuby(const_cast<void*> ((const void*)this), const_cast<wxKeyEvent*> (&$1));
+            #else
+            $input = wxRuby_WrapWxEventInRuby(const_cast<wxKeyEvent*> (&$1));
+            #endif
+            __CODE
+        end
+        map 'wxKeyEvent &' => 'Wx::KeyEvent' do
+          map_directorin code: <<~__CODE
+            #ifdef __WXRB_DEBUG__
+            $input = wxRuby_WrapWxEventInRuby(this, static_cast<wxEvent*> (&$1));
+            #else
+            $input = wxRuby_WrapWxEventInRuby(static_cast<wxEvent*> (&$1));
+            #endif
+            __CODE
+        end
+
         # typemap to allow String or Symbol for wxColour in args
         map 'const wxColour&', 'const wxColour*', as: 'Wx::Colour,String,Symbol' do
           map_in temp: 'wxColour tmpcol', code: <<~__CODE
@@ -599,11 +653,6 @@ module WXRuby3
           end
         end
 
-        # special case bc SWIG causes trouble in Window.cpp
-        map 'const wxRegion&', 'const wxRegion*', as: 'Wx::Region' do
-          map_out code: '$result = wxRuby_WrapWxObjectInRuby(new wxRegion(*static_cast<const wxRegion*> ($1)));'
-        end
-
         # add type mapping for wxVariant input args
         intypes = 'nil,String,Integer,Float,Time,Wx::Font,Wx::Colour,Wx::Variant,Array<WxVariant>,Array<String>,Object'
         if Config.instance.features_set?('wxUSE_PROPGRID')
@@ -616,6 +665,27 @@ module WXRuby3
           map_in code: '$1 = wxRuby_ConvertRbValue2Variant($input);'
         end
 
+        # add type mapping for wxFileName input args
+        map 'const wxFileName&' => 'String' do
+          # Deal with wxFileName
+          map_in temp: 'wxFileName tmp', code: <<~__CODE
+            tmp = wxFileName(RSTR_TO_WXSTR($input));
+            $1 = &tmp;
+            __CODE
+          map_typecheck precedence: 'POINTER', code: <<~__CODE
+            $1 = TYPE($input) == T_STRING;
+            __CODE
+          map_directorin code: <<~__CODE
+            $input = WXSTR_TO_RSTR($1.GetFullPath());
+            __CODE
+        end
+
+        # add type mapping for wxFileName output
+        map 'wxFileName' => 'String' do
+          map_out code:  '$result = WXSTR_TO_RSTR($1.GetFullPath());'
+          map_directorout code: '$result = RSTR_TO_WXSTR($input);'
+        end
+
       end # define
 
     end # Common

data/rakelib/lib/typemap/config.rb

@@ -0,0 +1,55 @@
+# 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
+
+    # Deals with GetAllFormats
+    module ConfigBase
+
+      include Typemap::Module
+
+      define do
+
+        map 'wxConfigBase*' => 'Wx::ConfigBase' do
+
+          map_in code: <<~__CODE
+            $1 = nullptr;
+            if (!NIL_P($input))
+            {
+              $1 = wxRuby_Ruby2ConfigBase($input);
+              if ($1 == nullptr)
+              {
+                VALUE msg = rb_inspect($input);
+                rb_raise(rb_eArgError, "Expected Wx::ConfigBase or Hash for %d but got %s",
+                                        $argnum-1, StringValuePtr(msg));
+              }
+            }
+            __CODE
+
+          map_typecheck precedence: 'POINTER', code: <<~__CODE
+            $1 = wxRuby_IsRubyConfig($input);
+            __CODE
+
+
+          map_directorin code: <<~__CODE
+            $input = wxRuby_ConfigBase2Ruby($1);
+            __CODE
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/rakelib/lib/typemap/data_format.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 Common typemap definitions
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative '../core/mapping'
@@ -60,7 +63,7 @@ module WXRuby3
               void* tmp;
               SWIG_ConvertPtr(rb_ary_entry(result, i),
                               &tmp,
-              SWIGTYPE_p_wxDataFormat, 0);
+                              SWIGTYPE_p_wxDataFormat, 0);
               wxDataFormat* fmt = reinterpret_cast< wxDataFormat* >(tmp);
               $1[i] = *fmt;
             }

data/rakelib/lib/typemap/data_object_data.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 Common typemap definitions
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative '../core/mapping'
@@ -27,7 +30,7 @@ module WXRuby3
             void* argp$argnum = NULL;
             if ( TYPE($input) == T_DATA )
             {
-              if (SWIG_IsOK(SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, $argnum-1)) && argp$argnum)
+              if (SWIG_IsOK(SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 0)) && argp$argnum)
               {
                 $1 = reinterpret_cast< $1_basetype * >(argp$argnum);
               }
@@ -66,7 +69,7 @@ module WXRuby3
               }
               else
               {
-                Swig::DirectorTypeMismatchException::raise(rb_eTypeError, 
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, 
                                                            "get_data_here should return a string, or nil on failure");
               }
             }

data/rakelib/lib/typemap/datetime.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 Common typemap definitions
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative '../core/mapping'
@@ -45,6 +48,10 @@ module WXRuby3
 
         map 'wxDateTime' => 'Time,Date,DateTime' do
 
+          # Accepts any Time-like object from Ruby and creates a wxDateTime
+          map_in temp: 'std::unique_ptr<wxDateTime> tmp_dt',
+                 code: 'tmp_dt.reset(wxRuby_wxDateTimeFromRuby($input)); $1 = *tmp_dt.get();'
+
           # Converts a return value of wxDateTime to a Ruby Time object
           map_out code: '$result = wxRuby_wxDateTimeToRuby($1);'
 

data/rakelib/lib/typemap/grid_client_data.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 Grid client data typemap definition
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative '../core/mapping'

data/rakelib/lib/typemap/grid_coords.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 Common typemap definitions
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative '../core/mapping'
@@ -17,18 +20,43 @@ module WXRuby3
 
       define do
 
+        map 'const wxGridCellCoords&' => 'Array(Integer, Integer)' do
+
+          map_in temp: 'int a, int b, wxGridCellCoords gcc', code: <<~__CODE
+            if (TYPE($input) != T_ARRAY || RARRAY_LEN($input) != 2)
+            {
+              rb_raise(rb_eTypeError,
+                       "Grid cell co-ordinates should be passed as [row, col] array");
+            }
+
+            a = NUM2INT( rb_ary_entry($input, 0) );
+            b = NUM2INT( rb_ary_entry($input, 1) );
+            gcc = wxGridCellCoords(a,b);
+            $1 = &gcc;
+            __CODE
+
+          map_out code: <<~__CODE
+            $result = rb_ary_new();
+            rb_ary_push($result, INT2NUM($1->GetRow() ));
+            rb_ary_push($result, INT2NUM($1->GetCol() ));
+            __CODE
+
+          map_typecheck precedence: 'POINTER', code: '$1 = (TYPE($input) == T_ARRAY && RARRAY_LEN($input) == 2);'
+
+        end
+
         map 'wxGridCellCoords' => 'Array(Integer, Integer)' do
 
-          map_in temp: 'int a, b', code: <<~__CODE
-            if ( ! TYPE($input) == T_ARRAY )
+          map_in temp: 'int a, int b', code: <<~__CODE
+            if (TYPE($input) != T_ARRAY || RARRAY_LEN($input) != 2)
             {
               rb_raise(rb_eTypeError,
                        "Grid cell co-ordinates should be passed as [row, col] array");
             }
 
-            a = NUM2INT( rb_ary_entry($1, 0) );
-            b = NUM2INT( rb_ary_entry($1, 1) );
-            $input = wxGridCellCoords(a,b);
+            a = NUM2INT( rb_ary_entry($input, 0) );
+            b = NUM2INT( rb_ary_entry($input, 1) );
+            $1 = wxGridCellCoords(a,b);
             __CODE
 
           map_out code: <<~__CODE
@@ -37,6 +65,8 @@ module WXRuby3
             rb_ary_push($result, INT2NUM($1.GetCol() ));
             __CODE
 
+          map_typecheck precedence: 'POINTER', code: '$1 = (TYPE($input) == T_ARRAY && RARRAY_LEN($input) == 2);'
+
         end
 
         # Needed for get_selected_cells, get_selection_block_top_left etc
@@ -44,7 +74,7 @@ module WXRuby3
 
           map_out code: <<~__CODE
             $result = rb_ary_new();
-            for (size_t i = 0; i < $1.GetCount(); i++)
+            for (size_t i = 0; i < $1.size(); i++)
             {
               wxGridCellCoords coord = $1.Item(i);
               VALUE rb_coord = rb_ary_new();

data/rakelib/lib/typemap/html_cell.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 HtmlCell typemap definition
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative '../core/mapping'

data/rakelib/lib/typemap/io_streams.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 Common typemap definitions
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative '../core/mapping'

data/rakelib/lib/typemap/pgcell.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 PGProperty typemap definition
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative '../core/mapping'

data/rakelib/lib/typemap/pgeditor.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 PGProperty typemap definition
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative '../core/mapping'

data/rakelib/lib/typemap/pgprop_arg.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 PGPropArg typemap definitions
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative '../core/mapping'
@@ -17,6 +20,11 @@ module WXRuby3
       define do
 
         map 'const wxPGPropArgCls&' => 'String,Wx::PG::PGProperty' do
+
+          add_header_code <<~__CODE
+            static WxRuby_ID s_pg_property_id("PGProperty");
+            __CODE
+
           map_in temp: 'wxPGPropArgCls temp = (wxPGProperty *)0', code: <<~__CODE
             if (!NIL_P($input))
             {
@@ -26,12 +34,12 @@ module WXRuby3
               }
               else if (TYPE($input) == T_DATA)
               {
-                VALUE rb_klass = rb_const_get(mWxPG, rb_intern("PGProperty"));
+                VALUE rb_klass = rb_const_get(mWxPG, s_pg_property_id());
                 if (rb_obj_is_kind_of($input, rb_klass))
                 {
                   swig_type_info* swig_type = wxRuby_GetSwigTypeForClass(rb_klass);
                   wxPGProperty *pgprop = (wxPGProperty *)0;
-                  SWIG_ConvertPtr($input, SWIG_as_voidptrptr(&pgprop), swig_type, SWIG_POINTER_DISOWN);
+                  SWIG_ConvertPtr($input, SWIG_as_voidptrptr(&pgprop), swig_type, 0);
                   temp = wxPGPropArgCls(pgprop);
                 }
                 else

data/rakelib/lib/typemap/pgproperty.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 PGProperty typemap definition
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative '../core/mapping'