wxruby3 0.9.0.pre.rc.3 → 0.9.0

data/rakelib/lib/generate/interface.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 SWIG interface definition Generator class
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'monitor'
@@ -14,8 +17,6 @@ module WXRuby3
 
     def initialize(dir)
       super
-      # select all typemaps that have an ignored out map
-      @typemaps_with_ignored_out = type_maps.select { |tm| tm.ignores_output? }
     end
 
     def gen_swig_header(fout)
@@ -165,14 +166,14 @@ module WXRuby3
         def_classes.each do |cls|
           if !cls.ignored && !cls.is_template?
             unless is_folded_base?(cls.name)
-              fout.puts "%feature(\"nodirector\") #{class_name(cls)};"
+              fout.puts "%feature(\"nodirector\") #{class_name(cls)}; /* disabled_proxies */"
             end
           end
         end
       else
         def_classes.each do |cls|
-          unless cls.ignored || cls.is_template? || has_virtuals?(cls) || forced_proxy?(cls.name)
-            fout.puts "%feature(\"nodirector\") #{class_name(cls)};"
+          unless cls.ignored || cls.is_template? || has_virtuals?(cls) || inherits_virtuals?(cls) || forced_proxy?(cls.name)
+            fout.puts "%feature(\"nodirector\") #{class_name(cls)}; /* no-virtuals */ "
           end
           if forced_proxy?(cls.name) && !cls.ignored && !cls.is_template?
             fout.puts "%feature(\"notabstract\") #{class_name(cls)};"
@@ -182,7 +183,7 @@ module WXRuby3
       unless no_proxies.empty?
         fout.puts
         no_proxies.each do |name|
-          fout.puts "%feature(\"nodirector\") #{name};"
+          fout.puts "%feature(\"nodirector\") #{name}; /* no-proxy */"
         end
       end
       unless renames.empty?
@@ -406,9 +407,7 @@ module WXRuby3
         fout.indent { gen_inner_class(fout, member) }
       when Extractor::MethodDef
         if member.is_ctor
-          gen_only_for(fout, member) do
-            fout.puts "  #{class_name(classdef)}#{member.args_string};"
-          end
+          fout.puts "  #{class_name(classdef)}#{member.args_string};"
         elsif member.is_dtor
           unless is_abstract?(classdef)
             dtor_sig = "~#{class_name(classdef)}()"
@@ -420,12 +419,10 @@ module WXRuby3
       when Extractor::EnumDef
         gen_interface_enum(fout, member, classdef)
       when Extractor::MemberVarDef
-        gen_only_for(fout, member) do
-          fout.puts "  // from #{member.definition}"
-          fout.puts '  %immutable;' if member.no_setter
-          fout.puts "  #{member.is_static ? 'static ' : ''}#{member.type} #{member.name};"
-          fout.puts '  %mutable;' if member.no_setter
-        end
+        fout.puts "  // from #{member.definition}"
+        fout.puts '  %immutable;' if member.no_setter
+        fout.puts "  #{member.is_static ? 'static ' : ''}#{member.type} #{member.name};"
+        fout.puts '  %mutable;' if member.no_setter
       when ::String
         fout.indent do
           fout.puts '// custom wxRuby extension'
@@ -455,15 +452,11 @@ module WXRuby3
           if member.is_ctor
             if member.protection == 'public'
               if !member.ignored && !member.deprecated
-                gen_only_for(fout, member) do
-                  fout.puts "  #{classdef.name}#{member.args_string};"
-                end
+                fout.puts "  #{classdef.name}#{member.args_string};"
               end
               member.overloads.each do |ovl|
                 if ovl.protection == 'public' && !ovl.ignored && !ovl.deprecated
-                  gen_only_for(fout, ovl) do
-                    fout.puts "  #{classdef.name}#{ovl.args_string};"
-                  end
+                  fout.puts "  #{classdef.name}#{ovl.args_string};"
                 end
               end
             end
@@ -486,12 +479,10 @@ module WXRuby3
           end
         when Extractor::MemberVarDef
           if member.protection == 'public' && !member.ignored && !member.deprecated
-            gen_only_for(fout, member) do
-              fout.puts "  // from #{member.definition}"
-              fout.puts '  %immutable;' if member.no_setter
-              fout.puts "  #{member.is_static ? 'static ' : ''}#{member.type} #{member.name};"
-              fout.puts '  %mutable;' if member.no_setter
-            end
+            fout.puts "  // from #{member.definition}"
+            fout.puts '  %immutable;' if member.no_setter
+            fout.puts "  #{member.is_static ? 'static ' : ''}#{member.type} #{member.name};"
+            fout.puts '  %mutable;' if member.no_setter
           end
         end
       end
@@ -503,41 +494,36 @@ module WXRuby3
       mtd_type = methoddef.type
       no_output = false
       # check if this method matches a type map with ignored out defs
-      if type_map = @typemaps_with_ignored_out.detect { |tm| tm.matches?(methoddef) }
-        mtd_type = Typemap.rb_void_type(mtd_type) if (no_output = type_map.ignored_output.include?(mtd_type))
+      unless methoddef.parameters.empty?
+        # find matching type maps for arguments (if any)
+        _, _, matched_maps = type_maps.map_input(methoddef.parameters.dup)
+        # check if any of these specify to ignore the C output
+        mtd_type = Typemap.rb_void_type(mtd_type) if (no_output = matched_maps.any? { |map| map.ignores_output?(mtd_type) })
       end
       # generate method declaration
-      gen_only_for(fout, methoddef) do
-        fout.puts "  // from #{methoddef.definition}"
-        fout.puts %Q[  %feature("numoutputs", "0") #{methoddef.name};] if no_output
-        mdecl = methoddef.is_static ? 'static ' : ''
-        mdecl << 'virtual ' if methoddef.is_virtual
-        purespec = (requires_purevirtual && methoddef.is_pure_virtual) ? ' =0' : ''
-        fout.puts "  #{mdecl}#{mtd_type} #{methoddef.name}#{methoddef.args_string}#{purespec};"
-      end
+      fout.puts "  // from #{methoddef.definition}"
+      fout.puts %Q[  %feature("numoutputs", "0") #{methoddef.name};] if no_output
+      mdecl = methoddef.is_static ? 'static ' : ''
+      mdecl << 'virtual ' if methoddef.is_virtual
+      purespec = (requires_purevirtual && methoddef.is_pure_virtual) ? ' =0' : ''
+      fout.puts "  #{mdecl}#{mtd_type} #{methoddef.name}#{methoddef.args_string}#{purespec};"
     end
 
     def gen_interface_enum(fout, member, classdef)
-      gen_only_for(fout, member) do
-        fout.puts "  // from #{classdef.name}::#{member.name}"
-        fout.puts "  enum #{member.is_anonymous ? '' : member.name} {"
-        enum_size = member.items.size
-        member.items.each_with_index do |e, i|
-          gen_only_for(fout, e) do
-            fout.puts "    #{e.name}#{(i+1)<enum_size ? ',' : ''}"
-          end unless e.ignored
-        end
-        fout.puts "  };"
+      fout.puts "  // from #{classdef.name}::#{member.name}"
+      fout.puts "  enum #{member.is_anonymous ? '' : member.name} {"
+      enum_size = member.items.size
+      member.items.each_with_index do |e, i|
+        fout.puts "    #{e.name}#{(i+1)<enum_size ? ',' : ''}" unless e.ignored
       end
+      fout.puts "  };"
     end
 
     def gen_typedefs(fout)
       typedefs = def_items.select {|item| Extractor::TypedefDef === item && !item.ignored }
       typedefs.each do |item|
         fout.puts
-        gen_only_for(fout, item) do
-          fout.puts "#{item.definition};"
-        end
+        fout.puts "#{item.definition};"
       end
       fout.puts '' unless typedefs.empty?
     end
@@ -546,14 +532,12 @@ module WXRuby3
       vars = def_items.select {|item| Extractor::GlobalVarDef === item && !item.ignored }
       vars.each do |item|
         fout.puts
-        gen_only_for(fout, item) do
-          wx_pfx = item.name.start_with?('wx') ? 'wx' : ''
-          const_name = underscore!(rb_wx_name(item.name))
-          const_type = item.type
-          const_type += '*' if const_type.index('char') && item.args_string == '[]'
-          const_type.sub!(/constexpr\s+/, '') # remove any 'constexpr ' type modifiers
-          fout.puts "%constant #{const_type} #{wx_pfx}#{const_name.upcase} = #{item.name.rstrip};"
-        end
+        wx_pfx = item.name.start_with?('wx') ? 'wx' : ''
+        const_name = underscore!(rb_wx_name(item.name))
+        const_type = item.type
+        const_type += '*' if const_type.index('char') && item.args_string == '[]'
+        const_type.sub!(/constexpr\s+/, '') # remove any 'constexpr ' type modifiers
+        fout.puts "%constant #{const_type} #{wx_pfx}#{const_name.upcase} = #{item.name.rstrip};"
       end
       fout.puts '' unless vars.empty?
     end
@@ -566,9 +550,7 @@ module WXRuby3
           fout.puts "enum #{item.name};" unless item.is_anonymous
           item.items.each do |e|
             unless e.ignored
-              gen_only_for(fout, e) do
-                fout.puts "%constant int #{e.name} = #{e.fqn};"
-              end
+              fout.puts "%constant int #{e.name} = #{e.fqn};"
             end
           end
         end
@@ -597,37 +579,35 @@ module WXRuby3
         Extractor::DefineDef === item && !item.ignored && !item.is_macro? && item.value && !item.value.empty?
       }
       defines.each do |item|
-        gen_only_for(fout, item) do
-          if item.value =~ /\A\d/
-            fout.puts
-            fout.puts "#define #{item.name} #{item.value}"
-          elsif item.value.start_with?('"')
-            fout.puts
-            fout.puts "%constant char*  #{item.name} = #{item.value};"
-          elsif item.value =~ /(wxString|wxS)\((".*")\)/
-            fout.puts
-            fout.puts "%constant char*  #{item.name} = #{$2};"
-          elsif item.value =~ /wx(Size|Point)(\(.*\))/
-            frbext = init_rb_ext_file unless frbext
-            frbext.indent { frbext.puts "#{rb_wx_name(item.name)} = Wx::#{$1}.new#{$2}" }
-            frbext.puts
-          elsif item.value =~ /wx(Colour|Font)(\(.*\))/
-            frbext = init_rb_ext_file unless frbext
-            frbext.indent do
-              frbext.puts "Wx.add_delayed_constant(self, :#{rb_wx_name(item.name)}) { Wx::#{$1}.new#{$2} }"
-            end
-            frbext.puts
-          elsif item.value =~ /wxSystemSettings::(\w+)\((.*)\)/
-            frbext = init_rb_ext_file unless frbext
-            args = $2.split(',').collect {|a| rb_constant_value(a) }.join(', ')
-            frbext.indent do
-              frbext.puts "Wx.add_delayed_constant(self, :#{rb_wx_name(item.name)}) { Wx::SystemSettings.#{rb_method_name($1)}(#{args}) }"
-            end
-            frbext.puts
-          else
-            fout.puts
-            fout.puts "%constant int  #{item.name} = #{item.value};"
+        if item.value =~ /\A\d/
+          fout.puts
+          fout.puts "#define #{item.name} #{item.value}"
+        elsif item.value.start_with?('"')
+          fout.puts
+          fout.puts "%constant char*  #{item.name} = #{item.value};"
+        elsif item.value =~ /(wxString|wxS)\((".*")\)/
+          fout.puts
+          fout.puts "%constant char*  #{item.name} = #{$2};"
+        elsif item.value =~ /wx(Size|Point)(\(.*\))/
+          frbext = init_rb_ext_file unless frbext
+          frbext.indent { frbext.puts "#{rb_wx_name(item.name)} = Wx::#{$1}.new#{$2}" }
+          frbext.puts
+        elsif item.value =~ /wx(Colour|Font)(\(.*\))/
+          frbext = init_rb_ext_file unless frbext
+          frbext.indent do
+            frbext.puts "Wx.add_delayed_constant(self, :#{rb_wx_name(item.name)}) { Wx::#{$1}.new#{$2} }"
           end
+          frbext.puts
+        elsif item.value =~ /wxSystemSettings::(\w+)\((.*)\)/
+          frbext = init_rb_ext_file unless frbext
+          args = $2.split(',').collect {|a| rb_constant_value(a) }.join(', ')
+          frbext.indent do
+            frbext.puts "Wx.add_delayed_constant(self, :#{rb_wx_name(item.name)}) { Wx::SystemSettings.#{rb_method_name($1)}(#{args}) }"
+          end
+          frbext.puts
+        else
+          fout.puts
+          fout.puts "%constant int  #{item.name} = #{item.value};"
         end
       end
       if frbext
@@ -646,30 +626,19 @@ module WXRuby3
           fn_type = ovl.type
           no_output = false
           # check if this method matches a type map with ignored out defs
-          if type_map = @typemaps_with_ignored_out.detect { |tm| tm.matches?(ovl) }
-            fn_type = Typemap.rb_void_type(fn_type) if (no_output = type_map.ignored.include?(fn_type))
-          end
-          gen_only_for(fout, ovl) do
-            fout.puts %Q[  %feature("numoutputs", "0") #{ovl.name};] if no_output
-            fout.puts "#{fn_type} #{ovl.name}#{ovl.args_string};"
+          unless ovl.parameters.empty?
+            # find matching type maps for arguments (if any)
+            _, _, matched_maps = type_maps.map_input(ovl.parameters.dup)
+            # check if any of these specify to ignore the C output
+            fn_type = Typemap.rb_void_type(fn_type) if (no_output = matched_maps.any? { |map| map.ignores_output?(fn_type) })
           end
+          fout.puts %Q[  %feature("numoutputs", "0") #{ovl.name};] if no_output
+          fout.puts "#{fn_type} #{ovl.name}#{ovl.args_string};"
         end
       end
       fout.puts '' unless functions.empty?
     end
 
-    def gen_only_for(fout, item, &block)
-      if item.only_for
-        if ::Array === item.only_for
-          fout.puts "#if #{item.only_for.collect { |s| "defined(#{s})" }.join(' || ')}"
-        else
-          fout.puts "#ifdef #{item.only_for}"
-        end
-      end
-      block.call
-      fout.puts "#endif" if item.only_for
-    end
-
     def gen_swig_interface_specs(fout)
       gen_swig_header(fout)
 

data/rakelib/lib/generate/rakedep.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 Rake dependency file Generator class
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './base'

data/rakelib/lib/specs/interfaces.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 generation specs
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -19,6 +22,8 @@ module WXRuby3
     Director.Spec(pkg, 'wxEventFilter')
     Director.Spec(pkg, 'wxGUIEventLoop')
     Director.Spec(pkg, 'wxApp')
+    Director.Spec(pkg, 'wxAppTraits')
+    Director.Spec(pkg, 'wxConfigBase')
     Director.Spec(pkg, 'wxDC')
     Director.Spec(pkg, 'wxWindowDC', director: Director::DerivedDC)
     Director.Spec(pkg, 'wxClientDC', director: Director::DerivedDC)
@@ -60,6 +65,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxSizerItem')
     Director.Spec(pkg, 'wxSizer')
     Director.Spec(pkg, 'wxBoxSizer', director: Director::Sizer)
+    Director.Spec(pkg, 'wxWrapSizer', director: Director::Sizer)
     Director.Spec(pkg, 'wxControl')
     Director.Spec(pkg, 'wxStatusBar', requirements: %w[wxUSE_STATUSBAR])
     Director.Spec(pkg, 'wxTextEntry')
@@ -72,6 +78,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxControlWithItems')
     Director.Spec(pkg, 'wxComboBox')
     Director.Spec(pkg, 'wxBitmapComboBox')
+    Director.Spec(pkg, 'wxComboCtrl')
     Director.Spec(pkg, 'wxRadioBox')
     Director.Spec(pkg, 'wxPanel')
     Director.Spec(pkg, 'wxWithImages')
@@ -93,8 +100,11 @@ module WXRuby3
     Director.Spec(pkg, 'wxSpinButton', director: Director::Window, requirements: %w[wxUSE_SPINBTN])
     Director.Spec(pkg, 'wxSpinEvent', director: Director::Event, requirements: Director.AnyOf(*%w[wxUSE_SPINBTN wxUSE_SPINCTRL]))
     Director.Spec(pkg, 'wxSpinCtrl', director: Director::Window, requirements: %w[wxUSE_SPINCTRL])
+    Director.Spec(pkg, 'wxSpinCtrlDouble', director: Director::Window, requirements: %w[wxUSE_SPINBTN]).spec.do_not_generate(:enums, :variables, :defines)
+    Director.Spec(pkg, 'wxSpinDoubleEvent', director: Director::Event, requirements: %w[wxUSE_SPINBTN]).spec.do_not_generate(:enums, :variables, :defines)
     Director.Spec(pkg, 'wxStaticBitmap')
     Director.Spec(pkg, 'wxBitmapButton', director: Director::Button)
+    Director.Spec(pkg, 'wxCommandLinkButton', director: Director::Button)
     Director.Spec(pkg, 'wxArtProvider')
     Director.Spec(pkg, 'wxStaticBoxSizer', director: Director::Sizer)
     Director.Spec(pkg, 'wxStdDialogButtonSizer', director: Director::Sizer)
@@ -138,6 +148,8 @@ module WXRuby3
     Director.Spec(pkg, 'wxTipProvider')
     Director.Spec(pkg, 'wxDirDialog', director: Director::Dialog, requirements: %w[wxUSE_DIRDLG])
     Director.Spec(pkg, 'wxFileDialog', director: Director::Dialog, requirements: %w[wxUSE_FILEDLG])
+    Director.Spec(pkg, 'wxFileDialogCustomizeHook', requirements: %w[wxUSE_FILEDLG])
+    Director.Spec(pkg, 'wxFileDialogCustomControl', requirements: %w[wxUSE_FILEDLG])
     Director.Spec(pkg, 'wxFileDirPickerEvent', director: Director::Event, requirements: Director.AnyOf(%w[wxUSE_DIRDLG wxUSE_DIRPICKERCTRL], %w[wxUSE_FILEDLG wxUSE_FILEPICKERCTRL]))
     Director.Spec(pkg, 'wxDirPickerCtrl', requirements: %w[wxUSE_DIRDLG wxUSE_DIRPICKERCTRL])
     Director.Spec(pkg, 'wxFilePickerCtrl', requirements: %w[wxUSE_FILEDLG wxUSE_FILEPICKERCTRL])
@@ -146,6 +158,8 @@ module WXRuby3
     Director.Spec(pkg, 'wxBusyInfo', requirements: %w[wxUSE_BUSYINFO])
     Director.Spec(pkg, 'wxListCtrl', requirements: %w[wxUSE_LISTCTRL])
     Director.Spec(pkg, 'wxListEvent', director: Director::Event, requirements: %w[wxUSE_LISTCTRL])
+    Director.Spec(pkg, 'wxHeaderCtrl')
+    Director.Spec(pkg, 'wxHeaderCtrlEvent', director: Director::Event)
     Director.Spec(pkg, 'wxGridSizer', director: Director::Sizer)
     Director.Spec(pkg, 'wxFlexGridSizer', director: Director::Sizer)
     Director.Spec(pkg, 'wxGBSizerItem', director: Director::SizerItem)
@@ -173,6 +187,8 @@ module WXRuby3
     Director.Spec(pkg, 'wxWizardPageSimple', director: Director::WizardPage, requirements: %w[wxUSE_WIZARDDLG])
     Director.Spec(pkg, 'wxWizard', director: Director::Dialog, requirements: %w[wxUSE_WIZARDDLG])
     Director.Spec(pkg, 'wxCheckListBox', requirements: %w[wxUSE_CHECKLISTBOX])
+    Director.Spec(pkg, 'wxRearrangeList', requirements: %w[wxUSE_CHECKLISTBOX])
+    Director.Spec(pkg, 'wxRearrangeCtrl', director: Director::Window, requirements: %w[wxUSE_CHECKLISTBOX])
     Director.Spec(pkg, 'wxDataFormat', requirements: %w[wxUSE_CLIPBOARD])
     Director.Spec(pkg, 'wxDataObject', requirements: %w[wxUSE_CLIPBOARD])
     Director.Spec(pkg, 'wxDataObjectSimpleBase', requirements: %w[wxUSE_CLIPBOARD])
@@ -202,8 +218,11 @@ module WXRuby3
     Director.Spec(pkg, 'wxSplashScreen', requirements: %w[wxUSE_SPLASH])
     Director.Spec(pkg, 'wxUIActionSimulator', requirements: %w[wxUSE_UIACTIONSIMULATOR])
     Director.Spec(pkg, 'wxActivityIndicator', director: Director::Window, requirements: %w[wxUSE_ACTIVITYINDICATOR])
-    Director.Spec(pkg, 'wxHyperlinkCtrl', director: Director::Window, requirements: %w[wxUSE_HYPERLINKCTRL])
+    Director.Spec(pkg, 'wxHyperlinkCtrl', requirements: %w[wxUSE_HYPERLINKCTRL])
     Director.Spec(pkg, 'wxHyperlinkEvent', requirements: %w[wxUSE_HYPERLINKCTRL])
+    Director.Spec(pkg, 'wxBannerWindow', requirements: %w[wxUSE_BANNERWINDOW])
+    Director.Spec(pkg, 'wxInfoBar', requirements: %w[wxUSE_INFOBAR])
+    Director.Spec(pkg, 'wxFileSystem', requirements: %w[wxUSE_FILESYSTEM])
   }
 
   Director.Package('Wx::PRT', 'wxUSE_PRINTING_ARCHITECTURE') do |pkg|
@@ -217,7 +236,26 @@ module WXRuby3
     Director.Spec(pkg, 'wxPrinter')
   end
 
-  Director.Package('Wx::RTC', 'wxUSE_RICHTEXT') { |pkg|
+  Director.Package('Wx::HTML', 'wxUSE_HTML') { |pkg|
+    Director.Spec(pkg, 'wxHtmlWindow')
+    Director.Spec(pkg, 'wxHtmlHelpData', requirements: %w[wxUSE_HELP])
+    Director.Spec(pkg, 'wxHtmlHelpWindow', requirements: %w[wxUSE_HELP])
+    Director.Spec(pkg, 'wxHtmlCellEvent', director: Director::HtmlEvent)
+    Director.Spec(pkg, 'wxHtmlLinkEvent', director: Director::HtmlEvent)
+    Director.Spec(pkg, 'wxHtmlHelpController', director: Director::HelpController, requirements: %w[wxUSE_HELP])
+    Director.Spec(pkg, 'wxHtmlCell')
+    Director.Spec(pkg, 'wxHtmlEasyPrinting', requirements: %w[wxUSE_PRINTING_ARCHITECTURE])
+    Director.Spec(pkg, 'wxHtmlPrintout', requirements: %w[wxUSE_PRINTING_ARCHITECTURE])
+    Director.Spec(pkg, 'wxHtmlListBox')
+    Director.Spec(pkg, 'wxHTMLDataObject') if Config.instance.wx_version >= '3.3'
+  }
+
+  Director.Package('Wx::RTC', 'wxUSE_RICHTEXT', depends_on: ['Wx::HTML']) { |pkg|
+    Director.Spec(pkg, 'wxRichTextObject')
+    Director.Spec(pkg, 'wxRichTextImage')
+    Director.Spec(pkg, 'wxRichTextCompositeObject')
+    Director.Spec(pkg, 'wxRichTextParagraphLayoutBox')
+    Director.Spec(pkg, 'wxRichTextBox')
     Director.Spec(pkg, 'wxRichTextEvent')
     Director.Spec(pkg, 'wxRichTextBuffer')
     Director.Spec(pkg, 'wxRichTextCtrl')
@@ -227,8 +265,10 @@ module WXRuby3
     Director.Spec(pkg, 'wxRichTextHeaderFooterData', requirements: %w[wxUSE_PRINTING_ARCHITECTURE])
     Director.Spec(pkg, 'wxRichTextPrinting', requirements: %w[wxUSE_PRINTING_ARCHITECTURE])
     Director.Spec(pkg, 'wxSymbolPickerDialog', director: Director::Dialog)
-    # need to look into special needs
-    # Director.Spec(pkg, 'wxRichTextBufferDataObject')
+    Director.Spec(pkg, 'wxRichTextFormattingDialog')
+    Director.Spec(pkg, 'wxRichTextStyleOrganiserDialog')
+    Director.Spec(pkg, 'wxRichTextStyleListBox')
+    Director.Spec(pkg, 'wxRichTextBufferDataObject')
   }
 
   Director.Package('Wx::STC', 'wxUSE_STC') { |pkg|
@@ -267,21 +307,6 @@ module WXRuby3
     Director.Spec(pkg, 'wxGridCtrl')
   }
 
-  Director.Package('Wx::HTML', 'wxUSE_HTML') { |pkg|
-    Director.Spec(pkg, 'wxHtmlWindow')
-    Director.Spec(pkg, 'wxHtmlHelpData')
-    Director.Spec(pkg, 'wxHtmlHelpWindow', director: Director::Window)
-    Director.Spec(pkg, 'wxHtmlHelpFrame')
-    Director.Spec(pkg, 'wxHtmlCellEvent', director: Director::HtmlEvent)
-    Director.Spec(pkg, 'wxHtmlLinkEvent', director: Director::HtmlEvent)
-    Director.Spec(pkg, 'wxHtmlHelpController', director: Director::HelpController, requirements: %w[wxUSE_HELP])
-    Director.Spec(pkg, 'wxHtmlCell')
-    Director.Spec(pkg, 'wxHtmlEasyPrinting', requirements: %w[wxUSE_PRINTING_ARCHITECTURE])
-    Director.Spec(pkg, 'wxHtmlPrintout', requirements: %w[wxUSE_PRINTING_ARCHITECTURE])
-    Director.Spec(pkg, 'wxHtmlListBox')
-    Director.Spec(pkg, 'wxHTMLDataObject') if Config.instance.wx_version >= '3.3'
-  }
-
   Director.Package('Wx::AUI', 'wxUSE_AUI') { |pkg|
     Director.Spec(pkg, 'wxAuiPaneInfo')
     Director.Spec(pkg, 'wxAuiManagerEvent')

data/rakelib/lib/streams.rb

@@ -1,7 +1,11 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 buildtools configuration
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
+
 require 'tempfile'
 require 'fileutils'
 

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'
@@ -255,10 +258,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
@@ -276,7 +279,7 @@ module WXRuby3
           brace_level = 0
 
           fix_enum = false
-          enum_name = nil
+          enum_item = nil
 
           found_init = false
 
@@ -327,9 +330,9 @@ module WXRuby3
               # 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
 
@@ -375,38 +378,47 @@ module WXRuby3
                   # 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'