wxruby3 1.5.3 → 1.6.0

data/lib/wx/helpers.rb

@@ -19,16 +19,14 @@ module Wx
   # structs containing the keyword name and default value for each
   # possible argument. +mixed_args+ is an array which may optionally end
   # with a set of named arguments
-  def self.args_as_list(param_spec, *mixed_args)
+  def self.args_as_list(param_spec, *args, **kwargs)
 
     begin
-      # get keyword arguments from mixed args if supplied, else empty
-      kwa = mixed_args.last.kind_of?(Hash) ? mixed_args.pop : {}
       out_args = []
       param_spec.each_with_index do | param, i |
         # has supplied list arg or the keyword arg?
-        arg = mixed_args[i]
-        arg = kwa.delete(param.name) if arg.nil? && kwa.key?(param.name)
+        arg = args[i]
+        arg = kwargs.delete(param.name) if arg.nil? && kwargs.key?(param.name)
         if Proc === param.default_or_proc
           arg = param.default_or_proc.call(arg) # provides default or converts arg
         elsif arg.nil?
@@ -37,13 +35,13 @@ module Wx
         out_args << arg
       end
     rescue
-      Kernel.raise ArgumentError, 
-                 "Bad arg composition of #{mixed_args.inspect}"
+      Kernel.raise ArgumentError,
+                   "Bad arg composition of #{args.inspect}"
     end
 
-    unless kwa.empty?
-      Kernel.raise ArgumentError, 
-                 "Unknown keyword argument(s) : #{kwa.keys.inspect}"
+    unless kwargs.empty?
+      Kernel.raise ArgumentError,
+                   "Unknown keyword argument(s) : #{kwargs.keys.inspect}"
     end
 
     out_args
@@ -68,4 +66,32 @@ module Wx
   def self.has_feature?(featsym)
     Wx::Setup.const_defined?(featsym) && !!Wx::Setup.const_get(featsym)
   end
+
+  # returns true if WXWIDGETS_VERSION >= ver
+  # ver can be string or array of 3 integers
+  def self.at_least_wxwidgets?(ver)
+    ver = ver.split('.').collect {|s| s.to_i } unless ::Array === ver
+    ([ Wx::WXWIDGETS_MAJOR_VERSION, Wx::WXWIDGETS_MINOR_VERSION, Wx::WXWIDGETS_RELEASE_NUMBER ] <=> ver) >= 0
+  end
+
+  # returns true if WXWIDGETS_VERSION <= ver
+  # ver can be string or array of 3 integers
+  def self.up_to_wxwidgets?(ver)
+    ver = ver.split('.').collect {|s| s.to_i } unless ::Array === ver
+    ([ Wx::WXWIDGETS_MAJOR_VERSION, Wx::WXWIDGETS_MINOR_VERSION, Wx::WXWIDGETS_RELEASE_NUMBER ] <=> ver) <= 0
+  end
+
+  # returns true if WXWIDGETS_VERSION < ver
+  # ver can be string or array of 3 integers
+  def self.before_wxwidgets?(ver)
+    ver = ver.split('.').collect {|s| s.to_i } unless ::Array === ver
+    ([ Wx::WXWIDGETS_MAJOR_VERSION, Wx::WXWIDGETS_MINOR_VERSION, Wx::WXWIDGETS_RELEASE_NUMBER ] <=> ver) < 0
+  end
+
+  # returns true if WXWIDGETS_VERSION > ver
+  # ver can be string or array of 3 integers
+  def self.after_wxwidgets?(ver)
+    ver = ver.split('.').collect {|s| s.to_i } unless ::Array === ver
+    ([ Wx::WXWIDGETS_MAJOR_VERSION, Wx::WXWIDGETS_MINOR_VERSION, Wx::WXWIDGETS_RELEASE_NUMBER ] <=> ver) > 0
+  end
 end

data/lib/wx/keyword_ctors.rb

@@ -71,7 +71,7 @@ module Wx
     # by the Rails #class_attribute method.
     module ParamSpec
 
-      if RUBY_VERSION < '2.7.0'
+      if (RUBY_VERSION.split('.').collect {|v| v.to_i} <=> [2,7,0]) < 0
         PARAM_SPEC_ARG = [:param_spec]
       else
         PARAM_SPEC_ARG = [:param_spec, false]
@@ -164,18 +164,16 @@ module Wx
         end
       end
 
-      def args_as_list(*mixed_args)
-        Wx::args_as_list(param_spec, *mixed_args)
-      end
-
-      def args_as_hash(*mixed_args)
-        kwa = mixed_args.last.kind_of?(Hash) ? mixed_args.pop : {}
-        param_spec.zip(mixed_args) do | param, arg |
-          kwa[param.name] = arg if arg
+      if (RUBY_VERSION.split('.').collect {|v| v.to_i} <=> [3,0,0]) <= 0
+        def args_as_list(*mixed_args)
+          Wx::args_as_list(param_spec, *mixed_args)
+        end
+      else
+        def args_as_list(*args, **kwargs)
+          Wx::args_as_list(param_spec, *args, **kwargs)
         end
-        kwa 
       end
-      
+
       def describe_constructor(txt = '')
         param_spec.inject(txt) do | desc, param |
           if Proc === param.default_or_proc
@@ -198,7 +196,7 @@ module Wx
         # The new definition of initialize; accepts a parent arg
         # mixed_args, which may zero or more position args, optionally
         # terminated with hash keyword args, and an optional block
-        wx_redefine_method :initialize do |parent = :default_ctor, *mixed_args, &block|
+        wx_redefine_method :initialize do |parent = :default_ctor, *args, **kwargs, &block|
           # allow zero-args ctor for use with XRC
           if parent == :default_ctor
             pre_wx_kwctor_init
@@ -206,11 +204,11 @@ module Wx
           end
 
           real_args = begin
-                        [ parent ] + self.class.args_as_list(*mixed_args)
+                        [ parent ] + self.class.args_as_list(*args, **kwargs)
                       rescue => err
                         msg = "Error initializing #{self.inspect}\n"+
                           " : #{err.message} \n" +
-                          "Provided are #{[parent] + mixed_args} \n" +
+                          "Provided are #{[parent] + args + [kwargs]} \n" +
                           "Correct parameters for #{self.class.name}.new are:\n" +
                           self.class.describe_constructor(":parent => (Wx::Window)\n")
 

data/lib/wx/keyword_defs.rb

@@ -389,8 +389,7 @@ end
 
 # wxGenericDirCtrl 	A control for displaying a directory tree
 Wx::define_keyword_ctors(Wx::GenericDirCtrl) do
-  # TODO :dir => Wx::DIR_DIALOG_DEFAULT_FOLDER_STR
-  wx_ctor_params :id, :dir => ''
+  wx_ctor_params :id, :dir => Wx::DIR_DIALOG_DEFAULT_FOLDER_STR
   wx_ctor_params :pos, :size,
                  :style => Wx::DIRCTRL_3D_INTERNAL|Wx::SUNKEN_BORDER
   wx_ctor_params :filter => ''
@@ -517,6 +516,16 @@ Wx::define_keyword_ctors(Wx::HyperlinkCtrl) do
   wx_ctor_params :name => Wx::HYPERLINK_CTRL_NAME_STR
 end
 
+# HyperlinkCtrl is identical to GenericHyperlinkCtrl on MacOS
+unless Wx::PLATFORM == 'WXOSX'
+  Wx::define_keyword_ctors(Wx::GenericHyperlinkCtrl) do
+    wx_ctor_params :id, :label => ''
+    wx_ctor_params :url => ''
+    wx_ctor_params :pos, :size, :style => Wx::HL_DEFAULT_STYLE
+    wx_ctor_params :name => Wx::HYPERLINK_CTRL_NAME_STR
+  end
+end
+
 Wx::define_keyword_ctors(Wx::CollapsiblePane) do
   wx_ctor_params :id, :label => ''
   wx_ctor_params :pos, :size, :style => 0

data/lib/wx/pg/pg_property.rb

@@ -14,7 +14,7 @@ module Wx::PG
 
   PG_DEFAULT_IMAGE_SIZE = Wx::DEFAULT_SIZE
 
-  if Wx::WXWIDGETS_VERSION >= '3.3.0'
+  if Wx.at_least_wxwidgets?('3.3.0')
     # backward compatibility constants
     PG_FULL_VALUE                     = PGPropValFormatFlags::FullValue
     PG_REPORT_ERROR                   = PGPropValFormatFlags::ReportError

data/lib/wx/rtc/richtext_formatting_dialog.rb

@@ -23,7 +23,7 @@ module Wx::RTC
     end
 
     # now redefine the overridden ctor to account for deviating arglist
-    wx_redefine_method :initialize do |flags = nil, parent = nil, *mixed_args, &block|
+    wx_redefine_method :initialize do |flags = nil, parent = nil, *args, **kwargs, &block|
       # allow zero-args ctor for use with XRC
       if flags.nil?
         pre_wx_kwctor_init
@@ -31,11 +31,11 @@ module Wx::RTC
       end
 
       real_args = begin
-                    [ flags, parent ] + self.class.args_as_list(*mixed_args)
+                    [ flags, parent ] + self.class.args_as_list(*args, **kwargs)
                   rescue => err
                     msg = "Error initializing #{self.inspect}\n"+
                       " : #{err.message} \n" +
-                      "Provided are #{[ flags, parent ] + mixed_args} \n" +
+                      "Provided are #{[ flags, parent ] + args + [kwargs]} \n" +
                       "Correct parameters for #{self.class.name}.new are:\n" +
                       self.class.describe_constructor(
                         ":flags => (Integer)\n:parent => (Wx::Window)\n")

data/lib/wx/rtc/richtext_style_organiser_dialog.rb

@@ -12,13 +12,13 @@ class Wx::RTC::RichTextStyleOrganiserDialog
   end
 
   # now redefine the overridden ctor to account for deviating arglist
-  wx_redefine_method :initialize do |flags, sheet, ctrl, parent = nil, *mixed_args, &block|
+  wx_redefine_method :initialize do |flags, sheet, ctrl, parent = nil, *args, **kwargs, &block|
     real_args = begin
-                  [ flags, sheet, ctrl, parent ] + self.class.args_as_list(*mixed_args)
+                  [ flags, sheet, ctrl, parent ] + self.class.args_as_list(*args, **kwargs)
                 rescue => err
                   msg = "Error initializing #{self.inspect}\n"+
                     " : #{err.message} \n" +
-                    "Provided are #{[ flags, sheet, ctrl, parent ] + mixed_args} \n" +
+                    "Provided are #{[ flags, sheet, ctrl, parent ] + args + [kwargs]} \n" +
                     "Correct parameters for #{self.class.name}.new are:\n" +
                     self.class.describe_constructor(
                       ":flags => (Integer)\n:sheet => (Wx::RTC::RichTextStyleSheet)\n:ctrl => (Wx::RTC::RichTextCtrl)\n:parent => (Wx::Window)\n")

data/lib/wx/rtc/symbol_picker_dialog.rb

@@ -13,13 +13,13 @@ class Wx::RTC::SymbolPickerDialog
   end
 
   # now redefine the overridden ctor to account for deviating arglist
-  wx_redefine_method :initialize do |symbol, initialFont, normalTextFont, parent = nil, *mixed_args, &block|
+  wx_redefine_method :initialize do |symbol, initialFont, normalTextFont, parent = nil, *args, **kwargs, &block|
     real_args = begin
-                  [ symbol, initialFont, normalTextFont, parent ] + self.class.args_as_list(*mixed_args)
+                  [ symbol, initialFont, normalTextFont, parent ] + self.class.args_as_list(*args, **kwargs)
                 rescue => err
                   msg = "Error initializing #{self.inspect}\n"+
                     " : #{err.message} \n" +
-                    "Provided are #{[ symbol, initialFont, normalTextFont, parent ] + mixed_args} \n" +
+                    "Provided are #{[ symbol, initialFont, normalTextFont, parent ] + args + [kwargs]} \n" +
                     "Correct parameters for #{self.class.name}.new are:\n" +
                     self.class.describe_constructor(
                       ":symbol => (String)\n:initialFont => (String)\n:normalTextFont => (String)\n:parent => (Wx::Window)\n")

data/lib/wx/version.rb

@@ -3,5 +3,5 @@
 # This software is released under the MIT license.
 
 module Wx
-  WXRUBY_VERSION    = '1.5.3'
+  WXRUBY_VERSION    = '1.6.0'
 end

data/rakelib/lib/config/mingw.rb

@@ -177,7 +177,7 @@ module WXRuby3
           @rescomp << ' --define __WXMSW__ --define wxUSE_DPI_AWARE_MANIFEST=2 --define wxUSE_RC_MANIFEST=1 --define ISOLATION_AWARE_ENABLED'
           @rescomp << ' --define WXUSINGDLL'
           @extra_cflags << '-DISOLATION_AWARE_ENABLED'
-          if @wx_version >= '3.3.0'
+          if wx_version_check('3.3.0') >= 0
             @extra_cflags << '-D_UNICODE' << '-DUNICODE'
           end
         end

data/rakelib/lib/config.rb

@@ -728,6 +728,12 @@ module WXRuby3
             @wx_version || ''
           end
 
+          def wx_version_check(ver)
+            @wx_version_list ||= (@wx_version || '0.0.0').split('.').collect {|s| s.to_i }
+            ver = ver.split('.').collect {|s| s.to_i }  unless ::Array === ver
+            @wx_version_list <=> ver
+          end
+
           def mingw?
             @platform == :mingw
           end

data/rakelib/lib/director/affine_matrix.rb

@@ -19,6 +19,39 @@ module WXRuby3
         spec.disable_proxies
 
         spec.map_apply 'int * OUTPUT' => ['wxDouble *']
+        spec.ignore 'wxAffineMatrix2DBase::TransformPoint(wxDouble*, wxDouble*)',
+                    'wxAffineMatrix2DBase::TransformDistance(wxDouble*, wxDouble*)'
+
+        spec.map 'wxPoint2DDouble&' => 'Array(Float, Float), Wx::Point2DDouble' do
+          add_header_code '#include <memory>'
+          map_in temp: 'std::unique_ptr<$1_basetype> tmp', code: <<~__CODE
+            if ( TYPE($input) == T_DATA )
+            {
+              void* argp$argnum;
+              SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 0);
+              $1 = reinterpret_cast< $1_basetype * >(argp$argnum);
+            }
+            else if ( TYPE($input) == T_ARRAY )
+            {
+              $1 = new $1_basetype( NUM2DBL( rb_ary_entry($input, 0) ),
+                                    NUM2DBL( rb_ary_entry($input, 1) ) );
+              tmp.reset($1); // auto destruct when method scope ends 
+            }
+            else
+            {
+              rb_raise(rb_eTypeError, "Wrong type for $1_basetype parameter");
+            }
+            __CODE
+          map_typecheck precedence: 'POINTER', code: <<~__CODE
+            void *vptr = 0;
+            $1 = 0;
+            if (TYPE($input) == T_ARRAY && RARRAY_LEN($input) == 2)
+              $1 = 1;
+            else if (TYPE($input) == T_DATA && SWIG_CheckState (SWIG_ConvertPtr ($input, &vptr, $1_descriptor, 0)))
+              $1 = 1;
+            __CODE
+        end
+
         spec.map 'wxPoint2DDouble *' => 'Wx::Point2DDouble' do
           map_in ignore: true, temp: 'wxPoint2DDouble tmp', code: '$1 = &tmp;'
 

data/rakelib/lib/director/animation_ctrl.rb

@@ -21,7 +21,7 @@ module WXRuby3
         spec.items << 'wxGenericAnimationCtrl'
         spec.include 'wx/animate.h'
         spec.include 'wx/generic/animate.h'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           spec.items << 'wxAnimationBundle'
           spec.ignore 'wxAnimationBundle::GetAll', ignore_doc: false
           spec.add_extend_code 'wxAnimationBundle', <<~__HEREDOC

data/rakelib/lib/director/app.rb

@@ -16,7 +16,7 @@ module WXRuby3
 
       def setup
         spec.items << 'wxAppConsole' << 'wxEventFilter'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           spec.items << 'wxDarkModeSettings'
           spec.ignore_unless('WXMSW', 'wxDarkModeSettings', 'wxMenuColour')
           if Config.instance.features_set?('WXMSW')

data/rakelib/lib/director/aui_manager.rb

@@ -17,7 +17,7 @@ module WXRuby3
       def setup
         super
         spec.gc_as_object 'wxAuiManager'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           spec.items  << 'wxAuiBookSerializer' << 'wxAuiSerializer' <<
                          'wxAuiDockLayoutInfo' << 'wxAuiPaneLayoutInfo' << 'wxAuiTabLayoutInfo' <<
                          'wxAuiBookDeserializer' << 'wxAuiDeserializer'
@@ -303,7 +303,7 @@ module WXRuby3
 
       def gen_class_doc_members(fdoc, clsdef, cls_members, alias_methods)
         super
-        if Config.instance.wx_version >= '3.3.0' && clsdef.name == 'wxAuiTabLayoutInfo'
+        if Config.instance.wx_version_check('3.3.0') >= 0 && clsdef.name == 'wxAuiTabLayoutInfo'
           fdoc.doc.puts 'Returns the indices of the pages in this tab control in their order on screen.'
           fdoc.doc.puts 'If this array is empty, it means that the tab control contains all notebook pages in natural order.'
           fdoc.doc.puts '@return [::Array<Integer>] indices of the pages in this tab control'

data/rakelib/lib/director/aui_notebook.rb

@@ -24,7 +24,7 @@ module WXRuby3
                          wxAuiNotebookPage::tooltip
                          wxAuiNotebookPage::bitmap
                          wxAuiNotebookPage::active]
-          if Config.instance.wx_version >= '3.3.0'
+          if Config.instance.wx_version_check('3.3.0') >= 0
             spec.items << 'wxAuiNotebookPosition'
             spec.regard 'wxAuiNotebookPosition::tabCtrl',
                         'wxAuiNotebookPosition::tabIdx'

data/rakelib/lib/director/aui_tab_art.rb

@@ -14,7 +14,7 @@ module WXRuby3
 
       def setup
         super
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           spec.items << 'wxAuiFlatTabArt' << 'wxAuiSimpleTabArt'
           spec.ignore 'wxAuiDefaultTabArt', 'wxAuiNativeTabArt'
         else
@@ -117,7 +117,7 @@ module WXRuby3
 
     def gen_interface_classes(fout)
       super
-      if Config.instance.wx_version >= '3.3.0'
+      if Config.instance.wx_version_check('3.3.0') >= 0
         fout.puts
         fout.puts 'class wxAuiNativeTabArt : public wxAuiTabArt'
         fout.puts '{'
@@ -130,7 +130,7 @@ module WXRuby3
   class AuiTabArtDocGenerator < DocGenerator
     def gen_class_doc(fdoc)
       super
-      if Config.instance.wx_version >= '3.3.0'
+      if Config.instance.wx_version_check('3.3.0') >= 0
         fdoc.doc.puts 'Wx::AUI::AuiNativeTabArt is either an art provider providing native-like appearance (WXMSW and WXGTK) or a generic Tab Art provider if not available.'
         fdoc.puts 'class AuiNativeTabArt < AuiTabArt; end'
         fdoc.puts
@@ -138,7 +138,7 @@ module WXRuby3
     end
     def gen_constants_doc(fdoc)
       super
-      if Config.instance.wx_version >= '3.3.0'
+      if Config.instance.wx_version_check('3.3.0') >= 0
         fdoc.doc.puts 'Wx::AUI::AuiDefaultTabArt is an alias for the tab art provider used by {Wx::AUI::AuiNotebook} by default.'
         fdoc.doc.puts 'Since wxWidgets 3.3.0, this is {Wx::AUI::AuiFlatTabArt} under all platforms. In the previous versions, this was wxAuiNativeTabArt.'
         fdoc.puts 'AuiDefaultTabArt = Wx::AUI::AuiFlatTabArt'

data/rakelib/lib/director/ctrl_with_items.rb

@@ -54,7 +54,7 @@ module WXRuby3
             'wxItemContainer::Append(const wxArrayString &, wxClientData **)',
             'wxItemContainer::Insert(const wxArrayString &, unsigned int, wxClientData **)',
             'wxItemContainer::Set(const wxArrayString &, wxClientData **)'], ignore_doc: false)
-          if Config.instance.wx_version < '3.3.0'
+          if Config.instance.wx_version_check('3.3.0') < 0
             # add undocumented method
             spec.extend_interface 'wxControlWithItems',
                                   'bool IsSorted() const'

data/rakelib/lib/director/cursor.rb

@@ -21,8 +21,18 @@ module WXRuby3
                          'wxCursor::wxCursor(const char *const *)',
                          'wxCursor::wxCursor(const wxCursor &)'
         spec.ignore 'wxCursor::wxCursor(const char *const *)'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           spec.ignore 'wxCursor::wxCursor(const char[],int,int,int,int,const char[], const wxColour*, const wxColour*)'
+
+          spec.items << 'wxCursorBundle'
+          spec.gc_as_untracked 'wxCursorBundle'
+          # all but the default ctor require a running App
+          spec.require_app 'wxCursorBundle::wxCursorBundle(const wxBitmapBundle &, const wxPoint &)',
+                           'wxCursorBundle::wxCursorBundle(const wxBitmapBundle &, int, int)',
+                           'wxCursorBundle::wxCursorBundle(const wxCursorBundle &)'
+          # add undocumented but useful ctor
+          spec.extend_interface 'wxCursorBundle',
+                                'wxCursorBundle(const wxCursor& cursor)'
         else
           spec.ignore 'wxCursor::wxCursor(const char[],int,int,int,int,const char[])'
         end

data/rakelib/lib/director/dc.rb

@@ -16,7 +16,7 @@ module WXRuby3
 
       def setup
         super
-        _readDC = if Config.instance.wx_version >= '3.3.0'
+        _readDC = if Config.instance.wx_version_check('3.3.0') >= 0
                     spec.items.unshift 'wxReadOnlyDC' # prepend before wxDC
                     spec.items << 'wxInfoDC'
                     'wxReadOnlyDC'
@@ -70,7 +70,7 @@ module WXRuby3
         # for GetUserScale and GetLogicalScale
         spec.map_apply 'double * OUTPUT' => 'double *'
         spec.swig_import 'swig/classes/include/wxGDICommon.h'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           # add similar block-style creator as #draw_on methods
           spec.add_extend_code 'wxInfoDC', <<~__HEREDOC
             static VALUE inform_on(wxWindow* win)

data/rakelib/lib/director/defs.rb

@@ -32,7 +32,7 @@ module WXRuby3
           wxDELETEA
           wxSwap
         }
-        if Config.instance.wx_version >= '3.2.7'
+        if Config.instance.wx_version_check('3.2.7') >= 0
           spec.ignore %w[wxWARN_UNUSED]
         end
         spec.ignore 'wxOVERRIDE'

data/rakelib/lib/director/derived_dc.rb

@@ -18,7 +18,7 @@ module WXRuby3
         spec.gc_as_untracked spec.module_name
         case spec.module_name
         when 'wxScreenDC'
-          spec.override_inheritance_chain('wxScreenDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
+          spec.override_inheritance_chain('wxScreenDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
           spec.make_abstract 'wxScreenDC'
           # as a ScreenDC should always be a temporary stack object
           # we do not allow creation in Ruby but rather provide a class
@@ -44,7 +44,7 @@ module WXRuby3
                       'wxScreenDC::EndDrawingOnTop',
                       'wxScreenDC::wxScreenDC'
         when 'wxClientDC'
-          spec.override_inheritance_chain('wxClientDC', ['wxWindowDC', 'wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
+          spec.override_inheritance_chain('wxClientDC', ['wxWindowDC', 'wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
           spec.make_abstract 'wxClientDC'
           spec.ignore 'wxClientDC::wxClientDC'
           # as a ClientDC should best always be a temporary stack object
@@ -67,7 +67,7 @@ module WXRuby3
             }
           __HEREDOC
         when 'wxPaintDC'
-          spec.override_inheritance_chain('wxPaintDC', ['wxClientDC', 'wxWindowDC', 'wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
+          spec.override_inheritance_chain('wxPaintDC', ['wxClientDC', 'wxWindowDC', 'wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
           spec.make_abstract 'wxPaintDC'
           spec.ignore 'wxPaintDC::wxPaintDC'
           spec.add_header_code <<~__HEREDOC
@@ -92,10 +92,10 @@ module WXRuby3
             __HEREDOC
         when 'wxMemoryDC'
           spec.items << 'wxBufferedDC' << 'wxBufferedPaintDC'
-          spec.override_inheritance_chain('wxMemoryDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
+          spec.override_inheritance_chain('wxMemoryDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
           spec.gc_as_untracked %w[wxBufferedDC wxBufferedPaintDC]
-          spec.override_inheritance_chain('wxBufferedDC', ['wxMemoryDC', 'wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
-          spec.override_inheritance_chain('wxBufferedPaintDC', ['wxBufferedDC', 'wxMemoryDC', 'wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
+          spec.override_inheritance_chain('wxBufferedDC', ['wxMemoryDC', 'wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
+          spec.override_inheritance_chain('wxBufferedPaintDC', ['wxBufferedDC', 'wxMemoryDC', 'wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
           spec.make_abstract 'wxMemoryDC'
           spec.make_abstract 'wxBufferedDC'
           spec.make_abstract 'wxBufferedPaintDC'
@@ -224,7 +224,7 @@ module WXRuby3
             }
           __HEREDOC
         when 'wxMirrorDC'
-          spec.override_inheritance_chain('wxMirrorDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
+          spec.override_inheritance_chain('wxMirrorDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
           spec.make_abstract 'wxMirrorDC'
           spec.ignore 'wxMirrorDC::wxMirrorDC'
           # as a MirrorDC should best always be a temporary stack object
@@ -247,7 +247,7 @@ module WXRuby3
             }
           __HEREDOC
         when 'wxSVGFileDC'
-          spec.override_inheritance_chain('wxSVGFileDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
+          spec.override_inheritance_chain('wxSVGFileDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
           spec.items.concat %w[wxSVGBitmapHandler wxSVGBitmapFileHandler wxSVGBitmapEmbedHandler]
           spec.make_abstract 'wxSVGFileDC'
           spec.ignore 'wxSVGFileDC::wxSVGFileDC'
@@ -285,7 +285,7 @@ module WXRuby3
                       'wxSVGFileDC::StartPage',
                       'wxSVGFileDC::EndPage'
         when 'wxGCDC'
-          spec.override_inheritance_chain('wxGCDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
+          spec.override_inheritance_chain('wxGCDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
           spec.make_abstract 'wxGCDC'
           spec.ignore 'wxGCDC::wxGCDC'
           # like all DC this should best always be a temporary stack object
@@ -391,7 +391,7 @@ module WXRuby3
           spec.ignore 'wxGCDC::wxGCDC(const wxEnhMetaFileDC &)'
         when 'wxScaledDC'
           spec.items.clear # wxRuby extension; no XML docs
-          if Config.instance.wx_version >= '3.3.0'
+          if Config.instance.wx_version_check('3.3.0') >= 0
             spec.override_inheritance_chain('wxScaledDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject'])
           else
             spec.override_inheritance_chain('wxScaledDC', %w[wxDC wxObject])
@@ -435,7 +435,7 @@ module WXRuby3
             };
             __HEREDOC
         when 'wxPrinterDC'
-          spec.override_inheritance_chain('wxPrinterDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
+          spec.override_inheritance_chain('wxPrinterDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
           spec.make_abstract 'wxPrinterDC'
           spec.ignore 'wxPrinterDC::wxPrinterDC'
           # as a PrinterDC should best always be a temporary stack object
@@ -458,7 +458,7 @@ module WXRuby3
             }
           __HEREDOC
         when 'wxPostScriptDC'
-          spec.override_inheritance_chain('wxPostScriptDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
+          spec.override_inheritance_chain('wxPostScriptDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
           spec.make_abstract 'wxPostScriptDC'
           spec.ignore 'wxPostScriptDC::wxPostScriptDC'
           # as a PostScriptDC should best always be a temporary stack object
@@ -514,7 +514,7 @@ module WXRuby3
               return rc;
             }
             __HEREDOC
-          if Config.instance.wx_version >= '3.3.0'
+          if Config.instance.wx_version_check('3.3.0') >= 0
             spec.items << 'wxOverlayDC'
             spec.override_inheritance_chain('wxOverlayDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject'])
             spec.make_abstract 'wxOverlayDC'
@@ -551,7 +551,7 @@ module WXRuby3
             __HEREDOC
           end
         else
-          spec.override_inheritance_chain(spec.module_name, ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
+          spec.override_inheritance_chain(spec.module_name, ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
           # ctors of all other derived DC require a running App
           spec.require_app spec.module_name
         end

data/rakelib/lib/director/dialog.rb

@@ -84,7 +84,7 @@ module WXRuby3
           end
         when 'wxFontDialog'
           # ignore the non-const version
-          if Config.platform == :macosx && Config.instance.wx_version < '3.3'
+          if Config.platform == :macosx && Config.instance.wx_version_check('3.3') < 0
             # MacOSX implementation is incorrect so we need to use
             # the non-const definition here
             spec.ignore 'wxFontDialog::GetFontData() const'
@@ -103,7 +103,7 @@ module WXRuby3
              __CODE
           end
           spec.ignore 'wxFileDialog::SetExtraControlCreator'
-          if Config.instance.wx_version >= '3.2.1'
+          if Config.instance.wx_version_check('3.2.1') >= 0
             # doc does not seem to match actual header code so just ignore for now
             spec.ignore('wxFileDialog::AddShortcut')
           end
@@ -252,7 +252,7 @@ module WXRuby3
           spec.regard 'wxGenericAboutDialog::DoAddCustomControls',
                       'wxGenericAboutDialog::AddControl',
                       'wxGenericAboutDialog::AddText'
-          if Config.instance.wx_version >= '3.3.0'
+          if Config.instance.wx_version_check('3.3.0') >= 0
             spec.regard 'wxGenericAboutDialog::GetCustomControlParent'
           end
           if Config.instance.features_set?('USE_COLLPANE')

data/rakelib/lib/director/gdicommon.rb

@@ -22,7 +22,7 @@ module WXRuby3
         spec.ignore %w{
           wxTheColourDatabase
         }
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           spec.ignore 'wxColourDatabase::GetAllNames', ignore_doc: false
           spec.add_extend_code 'wxColourDatabase', <<~__HEREDOC
             VALUE get_all_names() const
@@ -49,7 +49,7 @@ module WXRuby3
           'wxRect::Intersect(const wxRect &)',
           'wxRect::Union(const wxRect &)'
         ]
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version_check('3.3.0') >= 0
           # ignore these as they are supposed to specify unary minus but confuse
           # SWIG
           spec.ignore 'wxPoint::operator-(const wxPoint&)'