Skip to content

Commit

Permalink
change version checks to allow for backport version upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
mcorino committed Jan 12, 2024
1 parent 4c9b87f commit c90a133
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 11 deletions.
4 changes: 1 addition & 3 deletions rakelib/lib/director/defs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion rakelib/lib/director/menu_item.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions rakelib/lib/director/persistent_window.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rakelib/lib/director/pgeditor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions rakelib/lib/director/pgproperties.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rakelib/lib/director/sizer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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()'
Expand Down

0 comments on commit c90a133

Please sign in to comment.