wxruby3 0.9.0.pre.rc.3 → 0.9.0

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'

data/rakelib/lib/director/variant.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
@@ -310,7 +313,7 @@ module WXRuby3
                 VALUE var = rb_ary_entry($input, i);
                 int res = SWIG_ConvertPtr(var, &ptr, SWIGTYPE_p_wxVariant,  0 );
                 if (!SWIG_IsOK(res)) {
-                  SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "wxVariantList","wxVariant", 1, var )); 
+                  SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "wxVariantList", "$symname", 1, var )); 
                 }
                 // the default constructed wxVariantList tmp will not delete it's contents so no need to copy variant 
                 tmp.Append(static_cast<wxVariant*>(ptr));

data/rakelib/lib/director/vlistbox.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/vscrolled_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'

data/rakelib/lib/director/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 './event_handler'
@@ -13,67 +16,13 @@ module WXRuby3
 
       def setup
         super
-        # for all wxWindow derived classes (not wxFrame and descendants)
-        spec.items.each do |itm|
-          # Avoid adding unneeded directors
-          spec.no_proxy("#{itm}::AddChild",
-                        "#{itm}::Fit",
-                        "#{itm}::FitInside",
-                        "#{itm}::Freeze",
-                        "#{itm}::GetBackgroundStyle",
-                        "#{itm}::GetCharHeight",
-                        "#{itm}::GetCharWidth",
-                        "#{itm}::GetLabel",
-                        "#{itm}::GetName",
-                        "#{itm}::GetScreenPosition",
-                        "#{itm}::GetScrollPos",
-                        "#{itm}::GetScrollRange",
-                        "#{itm}::GetScrollThumb",
-                        "#{itm}::GetTextExtent",
-                        "#{itm}::HasCapture",
-                        "#{itm}::HasMultiplePages",
-                        "#{itm}::IsDoubleBuffered",
-                        "#{itm}::IsEnabled",
-                        "#{itm}::IsFrozen",
-                        "#{itm}::IsRetained",
-                        "#{itm}::IsShown",
-                        "#{itm}::IsShownOnScreen",
-                        "#{itm}::ReleaseMouse",
-                        "#{itm}::RemoveChild",
-                        "#{itm}::ScrollLines",
-                        "#{itm}::ScrollPages",
-                        "#{itm}::ScrollWindow",
-                        "#{itm}::SetAcceleratorTable",
-                        "#{itm}::SetBackgroundColour",
-                        "#{itm}::SetBackgroundStyle",
-                        "#{itm}::SetCursor",
-                        "#{itm}::SetFocus",
-                        "#{itm}::SetFocusFromKbd",
-                        "#{itm}::SetFont",
-                        "#{itm}::SetForegroundColour",
-                        "#{itm}::SetHelpText",
-                        "#{itm}::SetLabel",
-                        "#{itm}::SetName",
-                        "#{itm}::SetScrollPos",
-                        "#{itm}::SetScrollbar",
-                        "#{itm}::SetThemeEnabled",
-                        "#{itm}::SetThemeEnabled",
-                        "#{itm}::SetValidator",
-                        "#{itm}::SetWindowStyleFlag",
-                        "#{itm}::ShouldInheritColour",
-                        "#{itm}::Thaw",
-                        "#{itm}::Layout",
-                        "#{itm}::InheritAttributes",
-                        "#{itm}::GetDefaultAttributes",
-                        "#{itm}::GetWindowStyleFlag",
-                        "#{itm}::GetDropTarget",
-                        "#{itm}::GetValidator",
-                        "#{itm}::IsTopLevel",
-                        "#{itm}::EnableTouchEvents") unless /\.h\Z/ =~ itm
-        end
-
         case spec.module_name
         when 'wxWindow' # only for actual wxWindow class
+          spec.items << 'wxVisualAttributes'
+          spec.gc_as_untracked 'wxVisualAttributes'
+          spec.regard 'wxVisualAttributes::font',
+                      'wxVisualAttributes::colFg',
+                      'wxVisualAttributes::colBg'
           # // Any of these following kind of objects become owned by the window
           # // when passed into Wx, and so will be deleted automatically; using
           # // DISOWN resets their %freefunc to avoid deleting the object twice
@@ -83,7 +32,7 @@ module WXRuby3
             map_in code: <<~__CODE
                 int res = SWIG_ConvertPtr($input, SWIG_as_voidptrptr(&$1), SWIGTYPE_p_wxSizer, SWIG_POINTER_DISOWN);
                 if (!SWIG_IsOK(res)) {
-                  SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "wxSizer *","SetSizer", 2, $input));
+                  SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "wxSizer *","$symname", 2, $input));
                 }
                 $2 = true; // always delete 'old' sizer
               __CODE
@@ -134,6 +83,8 @@ module WXRuby3
             'wxWindow::ClientToScreen(int*,int*)', # no need; prefer the wxPoint version
             'wxWindow::ScreenToClient(int*,int*)', # no need; prefer the wxPoint version
           ]
+          # no real docs and can't find actual examples of usage; ignore
+          spec.ignore 'wxWindow::GetConstraints', 'wxWindow::SetConstraints'
           # redefine these so a nil parent is accepted
           spec.ignore %w[wxWindow::FindWindowById wxWindow::FindWindowByLabel wxWindow::FindWindowByName], ignore_doc: false
           # overrule common typemap to allow default NULL
@@ -154,15 +105,15 @@ module WXRuby3
               return wxWindow::FindWindowByName(name, find_from_parent);
             }
             __HEREDOC
-          if Config.instance.wx_port == :wxQT
+          if Config.instance.wx_port == :wxqt
             # protected for wxQT; ignore for now
             spec.ignore 'wxWindow::EnableTouchEvents'
           end
           if Config.instance.wx_version >= '3.3.0'
-            spec.set_only_for('__WXMSW__', 'wxWindow::MSWDisableComposited')
+            spec.ignore('wxWindow::MSWDisableComposited') unless Config.instance.features_set?('__WXMSW__')
           end
-          spec.set_only_for('wxUSE_ACCESSIBILITY', 'wxWindow::SetAccessible')
-          spec.set_only_for('wxUSE_HOTKEY', %w[wxWindow::RegisterHotKey wxWindow::UnregisterHotKey])
+          spec.ignore('wxWindow::SetAccessible') unless Config.instance.features_set?('wxUSE_ACCESSIBILITY')
+          spec.ignore(%w[wxWindow::RegisterHotKey wxWindow::UnregisterHotKey]) unless Config.instance.features_set?('wxUSE_HOTKEY')
           spec.ignore('wxWindow::SetSize(int, int)') # not useful as the wxSize variant will also accept an array
           spec.swig_import %w{
             swig/classes/include/wxObject.h
@@ -238,22 +189,6 @@ module WXRuby3
           
               return do_paint_buffered(self);
             }
-          
-            // Return a window handle as a platform-specific ruby integer
-            VALUE get_handle()
-            {
-              wxWindow *win = self;
-              int64_t handle = (int64_t)win->GetHandle();
-              return LL2NUM(handle);
-            }
-          
-            // Attach a wx Object to an existing Windows handle (MSW only)
-            VALUE associate_handle(int64_t handle)
-            {
-              WXWidget wx_handle = (WXWidget)handle;
-              $self->AssociateHandle(wx_handle);
-              return Qnil;
-            }
           __HEREDOC
           spec.override_events 'wxWindow', 'EVT_ACTIVATE' => ['EVT_ACTIVATE', 0, 'wxActivateEvent']
         when 'wxNonOwnedWindow'
@@ -280,6 +215,70 @@ module WXRuby3
 
       def process(gendoc: false)
         defmod = super
+        # for all wxWindow (derived) classes
+        spec.items.each do |citem|
+          def_item = defmod.find_item(citem)
+          if Extractor::ClassDef === def_item && (citem == 'wxWindow' || spec.is_derived_from?(def_item, 'wxWindow'))
+            # Avoid adding unneeded directors
+            spec.no_proxy("#{spec.class_name(citem)}::AddChild",
+                          "#{spec.class_name(citem)}::Fit",
+                          "#{spec.class_name(citem)}::FitInside",
+                          "#{spec.class_name(citem)}::Freeze",
+                          "#{spec.class_name(citem)}::GetBackgroundStyle",
+                          "#{spec.class_name(citem)}::GetCharHeight",
+                          "#{spec.class_name(citem)}::GetCharWidth",
+                          "#{spec.class_name(citem)}::GetLabel",
+                          "#{spec.class_name(citem)}::GetName",
+                          "#{spec.class_name(citem)}::GetScreenPosition",
+                          "#{spec.class_name(citem)}::GetScrollPos",
+                          "#{spec.class_name(citem)}::GetScrollRange",
+                          "#{spec.class_name(citem)}::GetScrollThumb",
+                          "#{spec.class_name(citem)}::GetTextExtent",
+                          "#{spec.class_name(citem)}::HasCapture",
+                          "#{spec.class_name(citem)}::HasMultiplePages",
+                          "#{spec.class_name(citem)}::IsDoubleBuffered",
+                          "#{spec.class_name(citem)}::IsEnabled",
+                          "#{spec.class_name(citem)}::IsFrozen",
+                          "#{spec.class_name(citem)}::IsRetained",
+                          "#{spec.class_name(citem)}::IsShown",
+                          "#{spec.class_name(citem)}::IsShownOnScreen",
+                          "#{spec.class_name(citem)}::ReleaseMouse",
+                          "#{spec.class_name(citem)}::RemoveChild",
+                          "#{spec.class_name(citem)}::ScrollLines",
+                          "#{spec.class_name(citem)}::ScrollPages",
+                          "#{spec.class_name(citem)}::ScrollWindow",
+                          "#{spec.class_name(citem)}::SetAcceleratorTable",
+                          "#{spec.class_name(citem)}::SetBackgroundColour",
+                          "#{spec.class_name(citem)}::SetBackgroundStyle",
+                          "#{spec.class_name(citem)}::SetCursor",
+                          "#{spec.class_name(citem)}::SetFocus",
+                          "#{spec.class_name(citem)}::SetFocusFromKbd",
+                          "#{spec.class_name(citem)}::SetFont",
+                          "#{spec.class_name(citem)}::SetForegroundColour",
+                          "#{spec.class_name(citem)}::SetHelpText",
+                          "#{spec.class_name(citem)}::SetLabel",
+                          "#{spec.class_name(citem)}::SetName",
+                          "#{spec.class_name(citem)}::SetScrollPos",
+                          "#{spec.class_name(citem)}::SetScrollbar",
+                          "#{spec.class_name(citem)}::SetThemeEnabled",
+                          "#{spec.class_name(citem)}::SetThemeEnabled",
+                          "#{spec.class_name(citem)}::SetValidator",
+                          "#{spec.class_name(citem)}::SetWindowStyleFlag",
+                          "#{spec.class_name(citem)}::ShouldInheritColour",
+                          "#{spec.class_name(citem)}::Thaw",
+                          "#{spec.class_name(citem)}::Layout",
+                          "#{spec.class_name(citem)}::InheritAttributes",
+                          "#{spec.class_name(citem)}::GetDefaultAttributes",
+                          "#{spec.class_name(citem)}::GetWindowStyleFlag",
+                          "#{spec.class_name(citem)}::GetDropTarget",
+                          "#{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")
+          end
+        end
         if spec.module_name == 'wxWindow'
           # special processing to ignore the non-static versions of methods FromDIP,ToDIP,FromPhys,ToPhys
           # as SWIG cannot handle identically named static & non-static methods
@@ -331,7 +330,7 @@ module WXRuby3
                 // if Ruby object not registered anymore or no Ruby defined method override
                 // reroute directly to C++ method
                 if (wxRuby_FindTracking(this) == Qnil || wxRuby_IsNativeMethod(swig_get_self(), __wxrb_on_internal_idle_id()))
-                  this->#{director_wx_class}::OnInternalIdle();
+                  this->#{class_implementation(director_wx_class)}::OnInternalIdle();
                 else
                 __CODE
                 line << "\n  " << code.split("\n").join("\n  ")

data/rakelib/lib/director/window_disabler.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/with_images.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
@@ -25,7 +28,7 @@ module WXRuby3
         spec.add_header_code 'typedef wxVector<wxBitmapBundle> WxBitmapBundleArray;'
         spec.extend_interface 'wxWithImages', 'void SetImages(const WxBitmapBundleArray& images);'
         # type mapping for wrapper implementation
-        spec.map 'const WxBitmapBundleArray& images' => 'Array<Wx::Image>' do
+        spec.map 'const WxBitmapBundleArray& images' => 'Array<Wx::ImageBundle>' do
           map_in temp: 'wxVector<wxBitmapBundle> tmp', code: <<~__CODE
             if ($input != Qnil)
             {

data/rakelib/lib/director/wizard_page.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/xml_node.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/xml_resource.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.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 interface Director class
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'ostruct'
@@ -30,8 +33,8 @@ module WXRuby3
 
     class << self
 
-      def Package(pkgid, *required_features, &block)
-        block.call(self[pkgid].requires(*required_features))
+      def Package(pkgid, *required_features, depends_on: [], &block)
+        block.call(self[pkgid].requires(*required_features).depends_on(*depends_on.collect { |pid| self[pid] }))
       end
 
       def Spec(pkg, modname, name: nil, director:  nil, processors: nil, requirements: [])
@@ -335,18 +338,22 @@ module WXRuby3
       end
     end
 
-    def handle_item_only_for(defmod, fullname, platform_id)
-      # find the item
-      item = defmod.find_item(fullname)
-      if item
-        # set the item's only_for specs
-        item.only_for = platform_id
-        # in case we looked up a function without arg mask also set the only_for specs of any overloads
-        if Extractor::FunctionDef === item && !fullname.index('(')
-          item.overloads.each {|ovl| ovl.only_for = platform_id }
+    def handle_duplicate_const_overloads(cls)
+      cls.methods.each do |mtd|
+        unless mtd.is_ctor || mtd.is_dtor || mtd.is_operator || !mtd.has_overloads
+          # ignore any non-const overloads which match a const overload with the same signature
+          # and only differ in returning a non-const type vs a const type
+          # (as Ruby has no notion of const types these are essentially the same when wrapped)
+          non_const_ovls = mtd.all.select { |ovl| !ovl.ignored && !ovl.is_const }
+          unless non_const_ovls.empty?
+            mtd.all.select { |ovl| !ovl.ignored && ovl.is_const }.each do |const_ovl|
+              non_const_ovl = non_const_ovls.find { |nco| !nco.ignored && nco.argument_list.strip == const_ovl.argument_list.strip }
+              if non_const_ovl && non_const_ovl.type.strip == const_ovl.type.sub('const ', '').strip
+                non_const_ovl.ignore
+              end
+            end
+          end
         end
-      else
-        raise "Cannot find '#{fullname}' for module '#{spec.module_name}' to set only_for [#{platform_id}]"
       end
     end
 
@@ -373,18 +380,18 @@ module WXRuby3
       spec.renames.each_pair do |rb_name, names|
         names.each { |fullname| handle_item_rename(defmod, fullname, rb_name) }
       end
-      # handle only_for settings
-      spec.only_for.each_pair do |platform_id, names|
-        names.each do |fullname|
-          handle_item_only_for(defmod, fullname, platform_id)
-        end
-      end
       # handle class specified includes
       defmod.classes.each do |cls|
         unless cls.ignored
           spec.includes.merge(cls.includes) unless cls.includes.empty?
         end
       end
+      # prevent unnecessary code bloat
+      defmod.classes.each do |cls|
+        unless cls.ignored
+          handle_duplicate_const_overloads(cls)
+        end
+      end
       # TODO - should we just ignore all deprecations?
       # create deprecated function proxies unless deprecates suppressed
       unless Config.instance.no_deprecate
@@ -397,20 +404,12 @@ module WXRuby3
                 member.all.each do |ovl|
                   if !ovl.ignored && ovl.deprecated
                     is_void = (ovl.type && !ovl.type=='void')
-                    if ovl.only_for
-                      spec.add_extend_code clsnm, if ::Array === ovl.only_for
-                                                    "#if #{ovl.only_for.collect { |s| "defined(__#{s.upcase}__)" }.join(' || ')}"
-                                                  else
-                                                    "#ifdef #{ovl.only_for}"
-                                                  end
-                    end
                     spec.add_extend_code clsnm, <<~__HEREDOC
                       #{ovl.is_static ? 'static ' : ''}#{ovl.type} #{ovl.name}#{ovl.args_string} {
                         std::wcerr << "DEPRECATION WARNING: #{ovl.is_static ? 'static ' : ''}#{ovl.type} #{clsnm}::#{ovl.name}#{ovl.args_string}" << std::endl;
                         #{is_void ? '' : 'return '}$self->#{ovl.name}(#{ovl.parameters.collect {|p| p.name}.join(',')});
                       }
                       __HEREDOC
-                    spec.add_extend_code(clsnm, '#endif') if ovl.only_for
                   end
                 end
               end

data/rakelib/lib/ext/enum_chain.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 extensions for Enumerator::Chain
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 unless ::Enumerator.const_defined?(:Chain)

data/rakelib/lib/extractor/class.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 extractor
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -135,7 +138,7 @@ module WXRuby3
         this ? this.supers : {}
       end
 
-      def find_base(bases, name)
+      def self.find_base(bases, name)
         return bases[name] if bases.has_key?(name)
         bases.each_value do |base|
           if (base = find_base(base.supers, name))
@@ -144,10 +147,9 @@ module WXRuby3
         end
         nil
       end
-      private :find_base
 
       def is_derived_from?(classname)
-        !!find_base(@hierarchy, classname)
+        !!ClassDef.find_base(@hierarchy, classname)
       end
 
       def add_crossrefs(element)
@@ -194,7 +196,7 @@ module WXRuby3
                                evt_handler
                              end
                   # record event handler (macro) name, event type handled and the number of event id arguments
-                  evt_arity = args.inject(0) {|c, a| c += 1 if a.start_with?('id'); c }
+                  evt_arity = args.inject(0) {|c, a| c += 1 if a =~ /\A(win)?id/; c }
                   @event_types << [evt_handler, evt_type, evt_arity]
                 end
               end
@@ -226,7 +228,7 @@ module WXRuby3
                                  evt_handler
                                end
                     # record event handler (macro) name, event type handled and the number of event id arguments
-                    evt_arity = args.inject(0) {|c, a| c += 1 if a.start_with?('id'); c }
+                    evt_arity = args.inject(0) {|c, a| c += 1 if a =~ /\A(win)?id/; c }
                     @event_types << [evt_handler, evt_type, evt_arity, evt_klass, false]
                   end
                 end

data/rakelib/lib/extractor/enum.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 extractor
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -21,11 +24,21 @@ module WXRuby3
         end
 
         def enum?(name)
-          enums.has_key?(name)
+          if (i = name.index('::'))
+            e_nm = name[i+2,name.size]
+            enums.has_key?(e_nm) && enums[e_nm] == name[0,i]
+          else
+            enums.has_key?(name)
+          end
         end
 
         def enum_scope(name)
           enums[name]
+          if (i = name.index('::'))
+            enums[name[i+2,name.size]]
+          else
+            enums[name]
+          end
         end
       end