wxruby3 0.9.0.pre.rc.3 → 0.9.1

data/rakelib/lib/director/styled_text_ctrl.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -45,6 +48,10 @@ module WXRuby3
             rb_ary_push($result, INT2NUM(*$2));
           __CODE
         end
+        spec.map 'wxIntPtr' => 'Integer' do
+          map_in code: '$1 = NUM2ULL($input);'
+          map_out code: '$result = ULL2NUM($1);'
+        end
         # not useful in wxRuby
         spec.ignore 'wxStyledTextCtrl::HitTest(const wxPoint &, long *) const',
                     'wxStyledTextCtrl::GetDirectFunction',
@@ -64,7 +71,12 @@ module WXRuby3
                     'wxStyledTextCtrl::ReplaceTargetRaw',
                     'wxStyledTextCtrl::ReplaceTargetRERaw',
                     'wxStyledTextCtrl::SetStyleBytes',
-                    'wxStyledTextCtrl::RegisterImage(int, const char *const *)'
+                    'wxStyledTextCtrl::AddStyledText',
+                    'wxStyledTextCtrl::GetStyledText',
+                    'wxStyledTextCtrl::RegisterImage(int, const char *const *)',
+                    'wxStyledTextCtrl::RegisterRGBAImage(int, const unsigned char *)',
+                    'wxStyledTextCtrl::MarkerDefineRGBAImage(int, const unsigned char *)',
+                    'wxStyledTextCtrl::MarkerDefinePixmap(int, const char *const *)'
         # TODO : these need investigating to see if they might be useful
         spec.ignore 'wxStyledTextCtrl::GetDocPointer',
                     'wxStyledTextCtrl::SetDocPointer',

data/rakelib/lib/director/styled_text_event.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event'

data/rakelib/lib/director/system_options.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/system_settings.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/task_bar_icon.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event_handler'
@@ -51,7 +54,7 @@ module WXRuby3
               int swig_res = SWIG_ConvertPtr(result, &ptr, $1_descriptor, 0 | SWIG_POINTER_DISOWN);
               if (!SWIG_IsOK(swig_res))
               {
-                Swig::DirectorTypeMismatchException::raise(rb_eTypeError,
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError,
                          "create_popup_menu must return a Wx::Menu, or nil");
               }
               $result = reinterpret_cast < wxMenu * > (ptr);

data/rakelib/lib/director/text_attr.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -11,7 +14,7 @@ module WXRuby3
 
       def setup
         super
-        spec.gc_as_object('wxTextAttr')
+        spec.gc_as_untracked('wxTextAttr')
         spec.ignore 'wxTextAttr::Merge(const wxTextAttr &,const wxTextAttr &)'
         spec.do_not_generate :variables, :defines, :enums, :functions
       end

data/rakelib/lib/director/text_entry.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/text_validator.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event_handler'
@@ -35,6 +38,8 @@ module WXRuby3
         spec.ignore 'wxTextValidator::wxTextValidator(long, wxString*)'
         # add alternative
         spec.extend_interface 'wxTextValidator', 'wxTextValidator(long style=wxFILTER_NONE)'
+        # ignore non-virtual standard handler (not really useful in Ruby)
+        spec.ignore 'wxTextValidator::OnChar'
         spec.no_proxy 'wxTextValidator::Clone'
         spec.new_object 'wxTextValidator::Clone'
         # handle clone mapping

data/rakelib/lib/director/textctrl.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -17,11 +20,37 @@ module WXRuby3
         spec.include_mixin 'wxTextCtrl', { 'Wx::TextEntry' => 'wxTextEntryBase' }
         spec.override_inheritance_chain('wxTextCtrl', %w[wxControl wxWindow wxEvtHandler wxObject])
         spec.ignore 'wxTextCtrl::HitTest(const wxPoint &,long *)'
-        if Config.instance.wx_port == :wxQT
+        if Config.instance.wx_port == :wxgtk && Config.instance.wx_version >= '3.3.0'
+          spec.ignore 'wxTextCtrl::GTKGetTextBuffer',
+                      'wxTextCtrl::GTKGetEditable'
+        end
+        if Config.instance.wx_port == :wxqt
           # not implemented
           spec.ignore 'wxTextCtrl::OnDropFiles'
         end
-        spec.set_only_for('wxUSE_SPELLCHECK', 'wxTextCtrl::EnableProofCheck', 'wxTextCtrl::GetProofCheckOptions')
+        # Ignore these; wxTextProofOptions documentation is absolute crap and as the class is trivial
+        # we will not wrap it but create a simplified interface when USE_SPELLCHECK is enabled which
+        # we will complement in pure Ruby to provide Wx::TextProofOptions class
+        spec.ignore('wxTextCtrl::EnableProofCheck', 'wxTextCtrl::GetProofCheckOptions')
+        if Config.instance.features_set?('wxUSE_SPELLCHECK')
+          spec.add_extend_code 'wxTextCtrl', <<~__HEREDOC
+            VALUE DoEnableProofCheck(bool spelling, bool grammar, const wxString& language)
+            {
+              bool rc = $self->EnableProofCheck (wxTextProofOptions::Disable().SpellCheck(spelling).GrammarCheck(grammar).Language(language));
+              return rc ? Qtrue : Qfalse;
+            }
+
+            VALUE DoGetProofCheckOptions()
+            {
+              wxTextProofOptions opts = $self->GetProofCheckOptions();
+              VALUE rc = rb_ary_new();
+              rb_ary_push(rc, opts.IsSpellCheckEnabled() ? Qtrue : Qfalse);
+              rb_ary_push(rc, opts.IsGrammarCheckEnabled() ? Qtrue : Qfalse);
+              rb_ary_push(rc, WXSTR_TO_RSTR(opts.GetLang()));
+              return rc;
+            }
+          __HEREDOC
+        end
         spec.no_proxy %w[wxTextCtrl::EmulateKeyPress wxTextCtrl::GetDefaultStyle]
         spec.map_apply 'long * OUTPUT' => 'long *'
         spec.map_apply 'long * OUTPUT' => [ 'wxTextCoord *col', 'wxTextCoord *row' ]

data/rakelib/lib/director/time_picker_ctrl.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/timer.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event_handler'

data/rakelib/lib/director/tip_provider.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/toggle_button.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/tool_bar.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -32,6 +35,22 @@ module WXRuby3
         spec.no_proxy 'wxToolBarToolBase'
         # more sensible name to use
         spec.rename_for_ruby('ToolBarTool' => 'wxToolBarToolBase')
+        spec.map 'wxToolBarBase *' => 'Wx::ToolBar' do
+          map_in code: <<~__CODE
+            void *argp = 0;
+            int res = SWIG_ConvertPtr($input, &argp, SWIGTYPE_p_wxToolBar, 0);
+            if (!SWIG_IsOK(res)) {
+              SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "Wx::ToolBar", "$symname", 1, $input)); 
+            }
+            $1 = reinterpret_cast< wxToolBarBase * >(argp);
+            __CODE
+          map_typecheck code: <<~__CODE
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr($input, &vptr, SWIGTYPE_p_wxToolBar, 0);
+            $1 = SWIG_CheckState(res);
+            __CODE
+          map_out code: '$result = SWIG_NewPointerObj(SWIG_as_voidptr($1), SWIGTYPE_p_wxToolBar, 0);'
+        end
         # Ensure that the C++ wxToolBar(Base) implementation of UpdateWindowUI
         # is called internally, so that UpdateUIEvents are also sent to each
         # button within the toolbar. This means update_window_ui can't be

data/rakelib/lib/director/tool_tip.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -10,7 +13,7 @@ module WXRuby3
     class ToolTip < Director
 
       def setup
-        spec.set_only_for('__WXMSW__', 'wxToolTip::SetMaxWidth')
+        spec.ignore('wxToolTip::SetMaxWidth') unless Config.instance.features_set?('__WXMSW__')
         super
       end
     end # class ToolTip

data/rakelib/lib/director/top_level_window.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -13,49 +16,6 @@ module WXRuby3
 
       def setup
         super
-        # for all wxTopLevelWindow (derived) classes
-        spec.items.each do |itm|
-          spec.no_proxy("#{itm}::ClearBackground",
-                        "#{itm}::Enable",
-                        "#{itm}::EnableCloseButton",
-                        "#{itm}::EndModal",
-                        "#{itm}::GetHelpTextAtPoint",
-                        "#{itm}::GetMaxSize",
-                        "#{itm}::GetMinSize",
-                        "#{itm}::GetTitle",
-                        "#{itm}::Iconize",
-                        "#{itm}::IsActive",
-                        "#{itm}::IsFullScreen",
-                        "#{itm}::IsMaximzed",
-                        "#{itm}::IsAlwaysMaximzed",
-                        "#{itm}::IsModal",
-                        #"#{itm}::IsTopLevel",
-                        "#{itm}::IsVisible",
-                        "#{itm}::Maximize",
-                        "#{itm}::Navigate",
-                        "#{itm}::Refresh",
-                        "#{itm}::Reparent",
-                        "#{itm}::RequestUserAttention",
-                        "#{itm}::Restore",
-                        "#{itm}::SetIcon",
-                        "#{itm}::SetIcons",
-                        #"#{itm}::SetMaxSize",
-                        #"#{itm}::SetMinSize",
-                        "#{itm}::SetShape",
-                        "#{itm}::SetSize",
-                        "#{itm}::SetSize",
-                        #"#{itm}::SetSizeHints",
-                        #"#{itm}::SetSizeHints",
-                        "#{itm}::SetTitle",
-                        #"#{itm}::SetTransparent",
-                        #"#{itm}::Show",
-                        "#{itm}::ShowFullScreen",
-                        "#{itm}::ShowModal",
-                        "#{itm}::Update",
-                        "#{itm}::UpdateWindow",
-                        "#{itm}::Validate")
-        end
-
         if spec.module_name == 'wxTopLevelWindow'
           # add these to the generated interface to be parsed by SWIG
           # the wxWidgets docs are flawed in this respect that several reimplemented
@@ -81,16 +41,15 @@ module WXRuby3
             wxTopLevelWindow::RestoreToGeometry
             wxTopLevelWindow::GeometrySerializer
           }
-          spec.set_only_for '__WXUNIVERSAL__', %w{
+          unless Config.instance.features_set?('__WXUNIVERSAL__')
+            spec.ignore %w{
             wxTopLevelWindow::IsUsingNativeDecorations
             wxTopLevelWindow::UseNativeDecorations
             wxTopLevelWindow::UseNativeDecorationsByDefault
-          }
-          spec.set_only_for '__WXMSW__',
-                            'wxTopLevelWindow::MSWGetSystemMenu'
-          spec.set_only_for '__WXOSX__',
-                            'wxTopLevelWindow::OSXSetModified',
-                            'wxTopLevelWindow::OSXIsModified'
+            }
+          end
+          spec.ignore('wxTopLevelWindow::MSWGetSystemMenu') unless Config.instance.features_set?('__WXMSW__')
+          spec.ignore('wxTopLevelWindow::OSXSetModified','wxTopLevelWindow::OSXIsModified') unless Config.instance.features_set?('__WXOSX__')
           spec.swig_import 'swig/classes/include/wxDefs.h'
           # incorrectly documented here
           spec.override_events 'wxTopLevelWindow',
@@ -98,6 +57,54 @@ module WXRuby3
                                  'EVT_MAXIMIZE' => ['EVT_MAXIMIZE', 0, 'wxMaximizeEvent'] }
         end
       end
+
+      def process(gendoc: false)
+        defmod = super
+        # for all wxTopLevelWindow (derived) classes
+        spec.items.each do |citem|
+          def_item = defmod.find_item(citem)
+          if Extractor::ClassDef === def_item && (citem == 'wxTopLevelWindow' || spec.is_derived_from?(def_item, 'wxTopLevelWindow'))
+            spec.no_proxy("#{spec.class_name(citem)}::ClearBackground",
+                          "#{spec.class_name(citem)}::Enable",
+                          "#{spec.class_name(citem)}::EnableCloseButton",
+                          "#{spec.class_name(citem)}::GetHelpTextAtPoint",
+                          "#{spec.class_name(citem)}::GetMaxSize",
+                          "#{spec.class_name(citem)}::GetMinSize",
+                          "#{spec.class_name(citem)}::GetTitle",
+                          "#{spec.class_name(citem)}::Iconize",
+                          "#{spec.class_name(citem)}::IsActive",
+                          "#{spec.class_name(citem)}::IsFullScreen",
+                          "#{spec.class_name(citem)}::IsMaximzed",
+                          "#{spec.class_name(citem)}::IsAlwaysMaximzed",
+                          #"#{spec.class_name(citem)}::IsTopLevel",
+                          "#{spec.class_name(citem)}::IsVisible",
+                          "#{spec.class_name(citem)}::Maximize",
+                          "#{spec.class_name(citem)}::Navigate",
+                          "#{spec.class_name(citem)}::Refresh",
+                          "#{spec.class_name(citem)}::Reparent",
+                          "#{spec.class_name(citem)}::RequestUserAttention",
+                          "#{spec.class_name(citem)}::Restore",
+                          "#{spec.class_name(citem)}::SetIcon",
+                          "#{spec.class_name(citem)}::SetIcons",
+                          #"#{spec.class_name(citem)}::SetMaxSize",
+                          #"#{spec.class_name(citem)}::SetMinSize",
+                          "#{spec.class_name(citem)}::SetShape",
+                          "#{spec.class_name(citem)}::SetSize",
+                          "#{spec.class_name(citem)}::SetSize",
+                          #"#{spec.class_name(citem)}::SetSizeHints",
+                          #"#{spec.class_name(citem)}::SetSizeHints",
+                          "#{spec.class_name(citem)}::SetTitle",
+                          #"#{spec.class_name(citem)}::SetTransparent",
+                          #"#{spec.class_name(citem)}::Show",
+                          "#{spec.class_name(citem)}::ShowFullScreen",
+                          "#{spec.class_name(citem)}::Update",
+                          "#{spec.class_name(citem)}::UpdateWindow",
+                          "#{spec.class_name(citem)}::Validate")
+          end
+        end
+        defmod
+      end
+
     end # class Frame
 
   end # class Director

data/rakelib/lib/director/tree_ctrl.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -14,13 +17,31 @@ module WXRuby3
       include Typemap::TreeItemId
 
       def setup
-        spec.post_processors << :fixtreectrl
         spec.items.replace %w[wxTreeCtrl treebase.h]
         spec.override_inheritance_chain('wxTreeCtrl', %w[wxControl wxWindow wxEvtHandler wxObject])
         # mixin WithImages
         spec.include_mixin 'wxTreeCtrl', 'Wx::WithImages'
         spec.ignore('operator!=', 'operator==')
         spec.include 'wx/dirctrl.h'
+        # Use a custom interface class to work around the wxTreeCtrl::SortItems/OnCompareItems issue
+        # without having to patch the SWIG director class
+        spec.add_header_code <<~__HEREDOC
+          class WxRubyTreeCtrl : public wxTreeCtrl
+          {
+          public:
+            WxRubyTreeCtrl() : wxTreeCtrl() {}
+            WxRubyTreeCtrl(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
+		                       const wxSize& size = wxDefaultSize, long style = wxTR_DEFAULT_STYLE, 
+                           const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTreeCtrlNameStr)
+              : wxTreeCtrl(parent, id, pos, size, style, validator, name)
+            {}
+            virtual ~WxRubyTreeCtrl() {}
+          private:
+            DECLARE_DYNAMIC_CLASS(WxRubyTreeCtrl);
+          };
+          IMPLEMENT_DYNAMIC_CLASS(WxRubyTreeCtrl,  wxTreeCtrl);          
+          __HEREDOC
+        spec.use_class_implementation('wxTreeCtrl', 'WxRubyTreeCtrl')
         # These only differ from SetXXXList in the way memory ownership is
         # transferred. So only support the version that won't leak on wxRuby.
         spec.ignore %w[
@@ -73,7 +94,7 @@ module WXRuby3
             (void)self->EditLabel(item);
           }
           __HEREDOC
-        if [:wxMSW, :wxQT].include?(Config.instance.wx_port)
+        if [:wxmsw, :wxqt].include?(Config.instance.wx_port)
           spec.ignore('wxTreeCtrl::SetButtonsImageList')
           spec.ignore('wxTreeCtrl::GetButtonsImageList')
         end
@@ -368,47 +389,4 @@ module WXRuby3
 
   end # class Director
 
-  module SwigRunner
-    class Processor
-
-      # special post-processor for TreeCtrl
-      class Fixtreectrl < Processor
-
-        def run
-          director_found = false
-          update_source do |line|
-            # Ugly: special fixes for TreeCtrl - these macros and extra funcs
-            # are needed to allow user-defined sorting to work
-            # default ctor needed for Swig::Director
-            if line["Director(VALUE self) : swig_self(self), swig_disown_flag(false)"]
-              line = "    Director() { } // added by fixmodule.rb \n" + line
-            end
-            if line["SwigDirector_wxTreeCtrl::SwigDirector_wxTreeCtrl(VALUE self)"]
-              line = "IMPLEMENT_DYNAMIC_CLASS(SwigDirector_wxTreeCtrl,  wxTreeCtrl);\n" + line
-              director_found = true
-            end
-
-            line
-          end
-          if director_found
-            # We also need to tweak the header file
-            update_header do |line|
-              if line.strip == 'public:'
-                line << "\nSwigDirector_wxTreeCtrl() {};"
-              elsif /\A};/ =~ line
-                line = <<~__HEREDOC
-                  private:
-                  DECLARE_DYNAMIC_CLASS(SwigDirector_wxTreeCtrl);
-                  };
-                  __HEREDOC
-              end
-              line
-            end
-          end
-        end
-      end # class Fixtreectrl
-
-    end
-  end
-
 end # module WXRuby3

data/rakelib/lib/director/tree_event.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event'
@@ -15,7 +18,17 @@ module WXRuby3
 
       def setup
         super
-        # create a lightweight, but typesafe, wrapper for wxEventId
+        # for wxTreeEvent::GetKeyEvent
+        spec.map 'const wxKeyEvent&' => 'Wx::KeyEvent' do
+          map_out code: <<~__CODE
+            #ifdef __WXRB_DEBUG__
+            $result = wxRuby_WrapWxEventInRuby(arg1, static_cast<wxEvent*> ($1));
+            #else
+            $result = wxRuby_WrapWxEventInRuby(static_cast<wxEvent*> ($1));
+            #endif
+            __CODE
+        end
+        # create a lightweight, but typesafe, wrapper for TreeItemId
         spec.add_init_code <<~__HEREDOC
           // define TreeItemId wrapper class
           mWxTreeItemId = rb_define_class_under(mWxCore, "TreeItemId", rb_cObject);
@@ -32,19 +45,19 @@ module WXRuby3
         
         spec.add_wrapper_code <<~__HEREDOC
           // wxTreeItemId wrapper class definition and helper functions
-          static size_t __wxTreeEventId_size(const void* data)
+          static size_t __wxTreeItemId_size(const void* data)
           {
             return 0;
           }
 
           #include <ruby/version.h> 
 
-          static const rb_data_type_t __wxTreeEventId_type = {
-            "TreeEventId",
+          static const rb_data_type_t __wxTreeItemId_type = {
+            "TreeItemId",
           #if RUBY_API_VERSION_MAJOR >= 3
-            { NULL, NULL, __wxTreeEventId_size, 0, 0},
+            { NULL, NULL, __wxTreeItemId_size, 0, 0},
           #else
-            { NULL, NULL, __wxTreeEventId_size, 0},
+            { NULL, NULL, __wxTreeItemId_size, 0},
           #endif 
             NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
           };
@@ -52,21 +65,26 @@ module WXRuby3
           VALUE _wxRuby_Wrap_wxTreeItemId(const wxTreeItemId& id)
           {
             void* data = id.GetID();
-            VALUE ret = TypedData_Wrap_Struct(mWxTreeItemId, &__wxTreeEventId_type, data);
+            VALUE ret = TypedData_Wrap_Struct(mWxTreeItemId, &__wxTreeItemId_type, data);
             return ret;
           } 
 
           wxTreeItemId _wxRuby_Unwrap_wxTreeItemId(VALUE id)
           {
             void *data = 0;
-            TypedData_Get_Struct(id, void, &__wxTreeEventId_type, data);
+            TypedData_Get_Struct(id, void, &__wxTreeItemId_type, data);
             return wxTreeItemId(data);
           }
 
+          bool _wxRuby_Is_wxTreeItemId(VALUE id)
+          {
+            return rb_typeddata_is_kind_of(id, &__wxTreeItemId_type) == 1;
+          } 
+
           VALUE _wxRuby_wxTreeItemId_IsOk(VALUE self)
           {
             void *data = 0;
-            TypedData_Get_Struct(self, void, &__wxTreeEventId_type, data);
+            TypedData_Get_Struct(self, void, &__wxTreeItemId_type, data);
             return wxTreeItemId(data).IsOk() ? Qtrue : Qfalse;
           }
           __HEREDOC

data/rakelib/lib/director/uiaction_simulator.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/utils.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -44,6 +47,11 @@ module WXRuby3
         spec.ignore 'wxGetEmailAddress(char *,int)',
                     'wxGetUserId(char *,int)',
                     'wxGetUserName(char *,int)'
+        spec.map 'wxMemorySize' => 'Integer' do
+          map_out code: <<~__CODE
+            $result = LL2NUM(wxLongLongNative($1).GetValue());
+            __CODE
+        end
         # we want only the functions that are not ignored
         spec.do_not_generate(:classes, :typedefs, :variables, :enums, :defines)
         super

data/rakelib/lib/director/validator.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event_handler'