From c90a133fc4222549b82cdf07868b8145a8d608be Mon Sep 17 00:00:00 2001
From: Martin Corino <mcorino@m2c-software.nl>
Date: Fri, 12 Jan 2024 12:38:02 +0100
Subject: [PATCH] change version checks to allow for backport version upgrades

---
 rakelib/lib/director/defs.rb              | 4 +---
 rakelib/lib/director/menu_item.rb         | 2 +-
 rakelib/lib/director/persistent_window.rb | 4 ++--
 rakelib/lib/director/pgeditor.rb          | 2 +-
 rakelib/lib/director/pgproperties.rb      | 6 +++---
 rakelib/lib/director/sizer.rb             | 2 +-
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/rakelib/lib/director/defs.rb b/rakelib/lib/director/defs.rb
index 901ee45d..fbbf1b44 100644
--- a/rakelib/lib/director/defs.rb
+++ b/rakelib/lib/director/defs.rb
@@ -32,9 +32,7 @@ def setup
           wxDELETEA
           wxSwap
         }
-        if Config.instance.wx_version >= '3.3.0'
-          spec.ignore 'wxOVERRIDE'
-        end
+        spec.ignore 'wxOVERRIDE'
         super
       end
 
diff --git a/rakelib/lib/director/menu_item.rb b/rakelib/lib/director/menu_item.rb
index 66885938..eff02f6f 100644
--- a/rakelib/lib/director/menu_item.rb
+++ b/rakelib/lib/director/menu_item.rb
@@ -24,7 +24,7 @@ def setup
         spec.ignore_unless('USE_ACCEL', 'wxMenuItem::GetAccel')
         spec.no_proxy 'wxMenuItem::GetAccel'
         spec.ignore 'wxMenuItem::GetBitmap(bool)' # not portable
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version > '3.2.4'
           spec.ignore_unless('WXMSW', 'wxMenuItem::SetBackgroundColour','wxMenuItem::SetFont','wxMenuItem::SetTextColour')
         end
         super
diff --git a/rakelib/lib/director/persistent_window.rb b/rakelib/lib/director/persistent_window.rb
index c5d9f595..ae468dd3 100644
--- a/rakelib/lib/director/persistent_window.rb
+++ b/rakelib/lib/director/persistent_window.rb
@@ -14,8 +14,8 @@ class PersistentWindow < Director
 
       def setup
         spec.items << 'wxPersistentTLW' << 'wxPersistentBookCtrl' << 'wxPersistentTreeBookCtrl'
-        if Config.instance.wx_version >= '3.3.0'
-          # before 3.3.0 this was not properly available
+        if Config.instance.wx_version > '3.2.4'
+          # only after 3.2.4 properly available
           spec.items << 'wxPersistentComboBox'
         end
         super
diff --git a/rakelib/lib/director/pgeditor.rb b/rakelib/lib/director/pgeditor.rb
index 476f44a9..ff941d41 100644
--- a/rakelib/lib/director/pgeditor.rb
+++ b/rakelib/lib/director/pgeditor.rb
@@ -17,7 +17,7 @@ def setup
         spec.items.concat %w[wxPGCheckBoxEditor wxPGChoiceEditor wxPGChoiceAndButtonEditor wxPGComboBoxEditor
                              wxPGTextCtrlEditor wxPGSpinCtrlEditor wxPGTextCtrlAndButtonEditor wxPGEditorDialogAdapter]
         spec.includes << 'wx/propgrid/propgriddefs.h'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version > '3.2.4'
           # make sure SWIG knows this as enum type
           spec.add_swig_code 'enum wxPGPropertyFlags;'
         end
diff --git a/rakelib/lib/director/pgproperties.rb b/rakelib/lib/director/pgproperties.rb
index becaf46a..0633cf73 100644
--- a/rakelib/lib/director/pgproperties.rb
+++ b/rakelib/lib/director/pgproperties.rb
@@ -65,7 +65,7 @@ def setup
                     'wxUIntProperty::m_prefix',
                     'wxDateProperty::m_format',
                     'wxDateProperty::m_dpStyle'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version > '3.2.4'
           # currently missing from interface docs
           spec.extend_interface 'wxEnumProperty',
                                 'bool ValueFromString_(wxVariant& value, int* pIndex, const wxString& text,int argFlags) const',
@@ -111,7 +111,7 @@ def setup
         end
         # make sure the derived Enum property classes provide the protected accessors too
         %w[wxCursorProperty wxEditEnumProperty wxSystemColourProperty wxColourProperty].each do |kls|
-          if Config.instance.wx_version >= '3.3.0'
+          if Config.instance.wx_version > '3.2.4'
             # currently missing from interface docs
             spec.extend_interface kls,
                                   'int GetIndex() const',
@@ -136,7 +136,7 @@ def setup
                     'wxLongStringProperty::DisplayEditorDialog',
                     'wxMultiChoiceProperty::DisplayEditorDialog',
                     'wxFontProperty::DisplayEditorDialog'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version > '3.2.4'
           # for wxEnumProperty and derivatives ValueFromString_/ValueFromInt_
           spec.map_apply 'int * OUTPUT' => 'int* pIndex'
         end
diff --git a/rakelib/lib/director/sizer.rb b/rakelib/lib/director/sizer.rb
index d9269ac2..42307073 100644
--- a/rakelib/lib/director/sizer.rb
+++ b/rakelib/lib/director/sizer.rb
@@ -20,7 +20,7 @@ def setup
         when 'wxSizer'
           spec.items << 'wxSizerFlags'
           spec.gc_as_untracked('wxSizerFlags')
-          if Config.instance.wx_version < '3.3.0'
+          unless Config.instance.wx_version > '3.2.4'
             # missing from docs
             spec.extend_interface 'wxSizerFlags',
                                   'wxSizerFlags& HorzBorder()'