wxruby3 0.9.3 → 0.9.5

data/rakelib/lib/director/menu_item.rb

@@ -24,7 +24,7 @@ module WXRuby3
         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

data/rakelib/lib/director/num_validator.rb

@@ -383,13 +383,11 @@ module WXRuby3
         # hardcoded interface declarations
         spec.add_interface_code <<~__HEREDOC
           // Bit masks used for numeric validator styles.
-          enum wxNumValidatorStyle
-          {
-              wxNUM_VAL_DEFAULT               = 0x0,
-              wxNUM_VAL_THOUSANDS_SEPARATOR   = 0x1,
-              wxNUM_VAL_ZERO_AS_BLANK         = 0x2,
-              wxNUM_VAL_NO_TRAILING_ZEROES    = 0x4
-          };
+          enum wxNumValidatorStyle;
+          %constant int NumValidatorStyle_wxNUM_VAL_DEFAULT             = 0x0;
+          %constant int NumValidatorStyle_wxNUM_VAL_THOUSANDS_SEPARATOR = 0x1;
+          %constant int NumValidatorStyle_wxNUM_VAL_ZERO_AS_BLANK       = 0x2;
+          %constant int NumValidatorStyle_wxNUM_VAL_NO_TRAILING_ZEROES  = 0x4;
 
           %alias WXIntegerValidator::GetMin "min";
           %alias WXIntegerValidator::SetMin "min=";

data/rakelib/lib/director/owner_drawn_combobox.rb

@@ -15,6 +15,7 @@ module WXRuby3
     class OwnerDrawnComboBox < Window
 
       include Typemap::ClientData
+      include Typemap::ComboPopup
 
       def setup
         super

data/rakelib/lib/director/persistence_manager.rb

@@ -0,0 +1,410 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+module WXRuby3
+
+  class Director
+
+    class PersistenceManager < Director
+
+      include Typemap::ConfigBase
+
+      def setup
+        super
+        spec.gc_as_marked
+        spec.use_class_implementation 'wxPersistenceManager', 'WxRubyPersistenceManager'
+        spec.ignore 'wxPersistenceManager::Register',
+                    'wxPersistenceManager::Find',
+                    'wxPersistenceManager::Unregister',
+                    'wxPersistenceManager::Save',
+                    'wxPersistenceManager::Restore',
+                    'wxPersistenceManager::SaveAndUnregister',
+                    'wxPersistenceManager::RegisterAndRestore',
+                    ignore_doc: false
+        # doc gen only
+        spec.map 'void *obj' => 'Object', swig: false do
+          map_in code: ''
+        end
+        spec.map 'T *obj' => 'Object', swig: false do
+          map_in code: ''
+        end
+        spec.regard 'wxPersistenceManager::wxPersistenceManager',
+                    'wxPersistenceManager::GetConfig',
+                    'wxPersistenceManager::GetKey'
+        spec.suppress_warning 473, 'wxPersistenceManager::GetConfig'
+        spec.ignore %w[wxCreatePersistentObject wxPersistentRegisterAndRestore]
+        spec.add_header_code <<~__HEREDOC
+          #include "wxruby-Persistence.h"
+
+          // default global wxRuby persistence manager
+          static WxRubyPersistenceManager s_wxruby_persistence_manager {};
+
+          static WxRuby_ID to_f_id("to_f");
+          static WxRuby_ID to_i_id("to_i");
+          static WxRuby_ID to_s_id("to_s");
+          static WxRuby_ID save_value_id("save_value");
+          static WxRuby_ID restore_value_id("save_value");
+          static WxRuby_ID create_po_id("create_persistent_object");
+          
+          #ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
+          #define PO_LONG wxLongLong_t
+          #define PO_NUM2LONG(n) NUM2LL(n)
+          #define PO_LONG2NUM(l) LL2NUM(l)
+          #else
+          #define PO_LONG long
+          #define PO_NUM2LONG(n) NUM2LONG(n)
+          #define PO_LONG2NUM(l) LONG2NUM(l)
+          #endif
+
+          bool WxRubyPersistenceManager::SaveRubyValue(const wxPersistentObject& who, const wxString& name, VALUE value)
+          {
+            Swig::Director* dir = dynamic_cast<Swig::Director*> (this);
+            // is this a user defined Ruby persistence manager with overridden #save_value?
+            if (dir && !wxRuby_IsNativeMethod(dir->swig_get_self(), save_value_id())) 
+            {
+              VALUE rb_who = SWIG_NewPointerObj(SWIG_as_voidptr(&who), SWIGTYPE_p_wxPersistentObject,  0 );
+              return wxRuby_Funcall(dir->swig_get_self(), save_value_id(), 3, rb_who, WXSTR_TO_RSTR(name), value);
+            }
+            else
+            {
+              // just call C++ base implementation
+              return DoSaveRubyValue(who, name, value);
+            }
+          }
+
+          VALUE WxRubyPersistenceManager::RestoreRubyValue(const wxPersistentObject& who, const wxString& name)
+          {
+            Swig::Director* dir = dynamic_cast<Swig::Director*> (this);
+            // is this a user defined Ruby persistence manager with overridden #restore_value?
+            if (dir && !wxRuby_IsNativeMethod(dir->swig_get_self(), restore_value_id())) 
+            {
+              VALUE rb_who = SWIG_NewPointerObj(SWIG_as_voidptr(&who), SWIGTYPE_p_wxPersistentObject,  0 );
+              return wxRuby_Funcall(dir->swig_get_self(), restore_value_id(), 3, rb_who, WXSTR_TO_RSTR(name));
+            }
+            else
+            {
+              // just call C++ base implementation
+              return DoRestoreRubyValue(who, name);
+            }
+          }
+
+          bool WxRubyPersistenceManager::DoSaveRubyValue(const wxPersistentObject& who, const wxString& name, VALUE value)
+          {
+            wxConfigBase* cfg = this->GetConfig();
+            if (!cfg)
+              return false;
+            wxString key = this->GetKey(who, name);
+            switch(TYPE(value))
+            {
+              case T_TRUE:
+              case T_FALSE:
+                return cfg->Write(key, value == Qtrue);
+        
+              case T_FIXNUM:
+              case T_BIGNUM:
+                return cfg->Write(key, PO_NUM2LONG(value));
+        
+              case T_FLOAT:
+                return cfg->Write(key, NUM2DBL(value));
+        
+              case T_STRING:
+                return cfg->Write(key, RSTR_TO_WXSTR(value));
+        
+              default:
+                if (rb_respond_to(value, to_i_id()))
+                {
+                  VALUE ival = rb_funcall(value, to_i_id(), 0);
+                  return cfg->Write(key, PO_NUM2LONG(ival));
+                }
+                else if (rb_respond_to(value, to_f_id()))
+                {
+                  VALUE fval = rb_funcall(value, to_f_id(), 0);
+                  return cfg->Write(key, NUM2DBL(fval));
+                }
+                break;
+            }
+            VALUE sval = rb_funcall(value, to_s_id(), 0);
+            return cfg->Write(key, RSTR_TO_WXSTR(sval));
+          }
+
+          VALUE WxRubyPersistenceManager::DoRestoreRubyValue(const wxPersistentObject& who, const wxString& name)
+          {
+            wxConfigBase* cfg = this->GetConfig();
+            if (!cfg)
+              return Qnil;
+            wxString key = this->GetKey(who, name);
+            wxConfigBase::EntryType vtype = cfg->GetEntryType(key);
+            switch(vtype)
+            {
+              case wxConfigBase::Type_Boolean:
+              {
+                bool v;
+                if (cfg->Read(key, &v))
+                {
+                  return v ? Qtrue : Qfalse;
+                }
+                break;
+              }
+              case wxConfigBase::Type_Integer:
+              {
+                PO_LONG v;
+                if (cfg->Read(key, &v))
+                {
+                  return PO_LONG2NUM(v);
+                }
+                break;
+              }
+              case wxConfigBase::Type_Float:
+              {
+                double v;
+                if (cfg->Read(key, &v))
+                {
+                  return DBL2NUM(v);
+                }
+                break;
+              }
+              case wxConfigBase::Type_String:
+              {
+                wxString v;
+                if (cfg->Read(key, &v))
+                {
+                  return WXSTR_TO_RSTR(v);
+                }
+                break;
+              }
+              default:
+                break;
+            }
+            return Qnil;
+          }
+
+          void WxRubyPersistenceManager::UnregisterPersistentObject(VALUE rb_obj)
+          {
+            WxRubyPersistenceManager* wxrb_pm = 
+              dynamic_cast<WxRubyPersistenceManager*> (&wxPersistenceManager::Get());
+            if (wxrb_pm) wxrb_pm->UnregisterRbPO(rb_obj);
+          } 
+
+          void WxRubyPersistenceManager::GC_markPO()
+          {
+            rb_object_to_rb_po_map_t::iterator it;
+            for( it = rb_object_po_map_.begin(); it != rb_object_po_map_.end(); ++it )
+            {
+              rb_gc_mark(it->first);
+              rb_gc_mark(it->second);
+            }
+          }
+
+          static void wxRuby_markPersistentObjects()
+          {
+            WxRubyPersistenceManager* wxrb_pm = 
+              dynamic_cast<WxRubyPersistenceManager*> (&wxPersistenceManager::Get());
+            if (wxrb_pm) wxrb_pm->GC_markPO();
+          }
+          __HEREDOC
+        spec.add_extend_code 'wxPersistenceManager', <<~__HEREDOC
+          VALUE Register(VALUE obj)
+          {
+            WxRubyPersistenceManager* wxrb_pm = dynamic_cast<WxRubyPersistenceManager*> ($self);
+            VALUE rb_po = rb_funcall(obj, create_po_id(), 0);
+            if (!NIL_P(rb_po) && wxrb_pm)
+            {
+              void* ptr;
+              int res = SWIG_ConvertPtr(rb_po, &ptr, SWIGTYPE_p_wxPersistentObject, SWIG_POINTER_DISOWN);
+              if (!SWIG_IsOK(res)) 
+              {
+                rb_raise(rb_eRuntimeError, "Unable to create Wx::PersistentObject for object"); 
+              }
+              wxPersistentObject* po = reinterpret_cast< wxPersistentObject * >(ptr);
+              if ($self->Register(po->GetObject(), po))
+              {
+                wxrb_pm->RegisterRbPO(obj, rb_po);
+                return rb_po;
+              }
+            }
+            return Qnil;
+          }
+
+          VALUE Register(VALUE obj, VALUE rb_po)
+          {
+            WxRubyPersistenceManager* wxrb_pm = dynamic_cast<WxRubyPersistenceManager*> ($self);
+            if (!NIL_P(rb_po) && wxrb_pm)
+            {
+              void* ptr;
+              int res = SWIG_ConvertPtr(rb_po, &ptr, SWIGTYPE_p_wxPersistentObject, SWIG_POINTER_DISOWN);
+              if (!SWIG_IsOK(res)) 
+              {
+                rb_raise(rb_eRuntimeError, "Unable to create Wx::PersistentObject for object"); 
+              }
+              wxPersistentObject* po = reinterpret_cast< wxPersistentObject * >(ptr);
+              if ($self->Register(po->GetObject(), po))
+              {
+                wxrb_pm->RegisterRbPO(obj, rb_po);
+                return rb_po;
+              }
+            }
+            return Qnil;
+          }
+
+          VALUE Find(VALUE obj)
+          {
+            WxRubyPersistenceManager* wxrb_pm = dynamic_cast<WxRubyPersistenceManager*> ($self);
+            VALUE rb_po = wxrb_pm ? wxrb_pm->FindRbPO(obj) : Qnil;
+            if (!NIL_P(rb_po) && wxrb_pm)
+            { 
+              void* ptr;
+              int res = SWIG_ConvertPtr(rb_po, &ptr, SWIGTYPE_p_wxPersistentObject, 0);
+              if (!SWIG_IsOK(res)) 
+              {
+                rb_raise(rb_eRuntimeError, "Invalid Wx::PersistentObject for object"); 
+              }
+              wxPersistentObject* po = reinterpret_cast< wxPersistentObject * >(ptr);
+              if ($self->Find(po->GetObject()))
+                return rb_po;
+            }
+            return Qnil;
+          }
+
+          void Unregister(VALUE obj)
+          {
+            WxRubyPersistenceManager* wxrb_pm = dynamic_cast<WxRubyPersistenceManager*> ($self);
+            VALUE rb_po = wxrb_pm ? wxrb_pm->FindRbPO(obj) : Qnil;
+            if (!NIL_P(rb_po) && wxrb_pm)
+            { 
+              void* ptr;
+              int res = SWIG_ConvertPtr(rb_po, &ptr, SWIGTYPE_p_wxPersistentObject, 0);
+              if (!SWIG_IsOK(res)) 
+              {
+                rb_raise(rb_eRuntimeError, "Invalid Wx::PersistentObject for object"); 
+              }
+              wxPersistentObject* po = reinterpret_cast< wxPersistentObject * >(ptr);
+              $self->Unregister(po->GetObject());
+            }
+          }
+
+          void Save(VALUE obj)
+          {
+            WxRubyPersistenceManager* wxrb_pm = dynamic_cast<WxRubyPersistenceManager*> ($self);
+            VALUE rb_po = wxrb_pm ? wxrb_pm->FindRbPO(obj) : Qnil;
+            if (!NIL_P(rb_po) && wxrb_pm)
+            { 
+              void* ptr;
+              int res = SWIG_ConvertPtr(rb_po, &ptr, SWIGTYPE_p_wxPersistentObject, 0);
+              if (!SWIG_IsOK(res)) 
+              {
+                rb_raise(rb_eRuntimeError, "Invalid Wx::PersistentObject for object"); 
+              }
+              wxPersistentObject* po = reinterpret_cast< wxPersistentObject * >(ptr);
+              $self->Save(po->GetObject());
+            }
+          }
+
+          bool Restore(VALUE obj)
+          {
+            WxRubyPersistenceManager* wxrb_pm = dynamic_cast<WxRubyPersistenceManager*> ($self);
+            VALUE rb_po = wxrb_pm ? wxrb_pm->FindRbPO(obj) : Qnil;
+            if (!NIL_P(rb_po) && wxrb_pm)
+            { 
+              void* ptr;
+              int res = SWIG_ConvertPtr(rb_po, &ptr, SWIGTYPE_p_wxPersistentObject, 0);
+              if (!SWIG_IsOK(res)) 
+              {
+                rb_raise(rb_eRuntimeError, "Invalid Wx::PersistentObject for object"); 
+              }
+              wxPersistentObject* po = reinterpret_cast< wxPersistentObject * >(ptr);
+              return $self->Restore(po->GetObject());
+            }
+            return false;
+          }
+
+          void SaveAndUnregister(VALUE obj)
+          {
+            WxRubyPersistenceManager* wxrb_pm = dynamic_cast<WxRubyPersistenceManager*> ($self);
+            VALUE rb_po = wxrb_pm ? wxrb_pm->FindRbPO(obj) : Qnil;
+            if (!NIL_P(rb_po) && wxrb_pm)
+            { 
+              void* ptr;
+              int res = SWIG_ConvertPtr(rb_po, &ptr, SWIGTYPE_p_wxPersistentObject, 0);
+              if (!SWIG_IsOK(res)) 
+              {
+                rb_raise(rb_eRuntimeError, "Invalid Wx::PersistentObject for object"); 
+              }
+              wxPersistentObject* po = reinterpret_cast< wxPersistentObject * >(ptr);
+              $self->Save(po->GetObject());
+              $self->Unregister(po->GetObject());
+            }
+          }
+
+          bool RegisterAndRestore(VALUE obj)
+          {
+            WxRubyPersistenceManager* wxrb_pm = dynamic_cast<WxRubyPersistenceManager*> ($self);
+            VALUE rb_po = rb_funcall(obj, create_po_id(), 0);
+            if (!NIL_P(rb_po) && wxrb_pm)
+            {
+              void* ptr;
+              int res = SWIG_ConvertPtr(rb_po, &ptr, SWIGTYPE_p_wxPersistentObject, SWIG_POINTER_DISOWN);
+              if (!SWIG_IsOK(res)) 
+              {
+                rb_raise(rb_eRuntimeError, "Unable to create Wx::PersistentObject for object"); 
+              }
+              wxPersistentObject* po = reinterpret_cast< wxPersistentObject * >(ptr);
+              if ($self->Register(po->GetObject(), po))
+              {
+                wxrb_pm->RegisterRbPO(obj, rb_po);
+                return $self->Restore(po->GetObject());
+              }
+            }
+            return false;
+          }
+
+          bool RegisterAndRestore(VALUE obj, VALUE rb_po)
+          {
+            WxRubyPersistenceManager* wxrb_pm = dynamic_cast<WxRubyPersistenceManager*> ($self);
+            if (!NIL_P(rb_po) && wxrb_pm)
+            {
+              void* ptr;
+              int res = SWIG_ConvertPtr(rb_po, &ptr, SWIGTYPE_p_wxPersistentObject, SWIG_POINTER_DISOWN);
+              if (!SWIG_IsOK(res)) 
+              {
+                rb_raise(rb_eRuntimeError, "Unable to create Wx::PersistentObject for object"); 
+              }
+              wxPersistentObject* po = reinterpret_cast< wxPersistentObject * >(ptr);
+              if ($self->Register(po->GetObject(), po))
+              {
+                wxrb_pm->RegisterRbPO(obj, rb_po);
+                return $self->Restore(po->GetObject());
+              }
+            }
+            return false;
+          }
+          
+          bool SaveValue(const wxPersistentObject& who, const wxString& name, VALUE value)
+          {
+            WxRubyPersistenceManager* wxrb_pm = dynamic_cast<WxRubyPersistenceManager*> ($self);
+            return wxrb_pm ? wxrb_pm->DoSaveRubyValue(who, name, value) : false;
+          } 
+
+          VALUE RestoreValue(const wxPersistentObject& who, const wxString& name)
+          {
+            WxRubyPersistenceManager* wxrb_pm = dynamic_cast<WxRubyPersistenceManager*> ($self);
+            return wxrb_pm ? wxrb_pm->DoRestoreRubyValue(who, name) : Qnil;
+          }
+          __HEREDOC
+        spec.add_init_code <<~__HEREDOC
+          // install the default global wxRuby persistence manager
+          wxPersistenceManager::Set(s_wxruby_persistence_manager);
+          // and the persistent object marker
+          wxRuby_AppendMarker(wxRuby_markPersistentObjects);
+          __HEREDOC
+      end
+
+    end # class PersistenceManager
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/persistent_object.rb

@@ -0,0 +1,70 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+module WXRuby3
+
+  class Director
+
+    class PersistentObject < Director
+
+      def setup
+        super
+        spec.gc_as_marked
+        spec.add_header_code <<~__HEREDOC
+          #include "wxruby-Persistence.h"
+
+          WxRubyPersistentObject::WxRubyPersistentObject(VALUE rb_obj)
+            : wxPersistentObject((void*)rb_obj)
+          {}
+
+          WxRubyPersistentObject::~WxRubyPersistentObject()
+          {
+            if (this->GetObject())
+              WxRubyPersistenceManager::UnregisterPersistentObject(
+                reinterpret_cast<VALUE> (this->GetObject()));
+          } 
+          __HEREDOC
+        spec.use_class_implementation 'wxPersistentObject', 'WxRubyPersistentObject'
+        spec.ignore %w[wxPersistentObject::GetObject wxPersistentObject::wxPersistentObject]
+        spec.ignore %w[wxCreatePersistentObject wxPersistentRegisterAndRestore]
+        spec.extend_interface 'wxPersistentObject',
+                              'wxPersistentObject(VALUE rb_obj)',
+                              visibility: 'protected'
+        spec.add_extend_code 'wxPersistentObject', <<~__HEREDOC
+          bool SaveValue(const wxString& name, VALUE value)
+          {
+            WxRubyPersistenceManager* wxrb_pm = dynamic_cast<WxRubyPersistenceManager*> (&wxPersistenceManager::Get());
+            return wxrb_pm ? wxrb_pm->SaveRubyValue(*$self, name, value) : false;
+          }
+          VALUE RestoreValue(const wxString& name)
+          {
+            WxRubyPersistenceManager* wxrb_pm = dynamic_cast<WxRubyPersistenceManager*> (&wxPersistenceManager::Get());
+            return wxrb_pm ? wxrb_pm->RestoreRubyValue(*$self, name) : Qnil;
+          } 
+          __HEREDOC
+        spec.add_extend_code 'wxPersistentObject', <<~__HEREDOC
+          VALUE GetObject()
+          {
+            WxRubyPersistentObject* rpo = dynamic_cast<WxRubyPersistentObject*> ($self);
+            if (rpo)
+            {
+              return reinterpret_cast<VALUE> (rpo->GetObject());
+            } 
+            else
+            {
+              return Qnil;
+            }
+          }
+          __HEREDOC
+        super
+      end
+    end # class PersistentObject
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/persistent_window.rb

@@ -0,0 +1,73 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+module WXRuby3
+
+  class Director
+
+    class PersistentWindow < Director
+
+      def setup
+        spec.items << 'wxPersistentTLW' << 'wxPersistentBookCtrl' << 'wxPersistentTreeBookCtrl'
+        if Config.instance.wx_version > '3.2.4'
+          # only after 3.2.4 properly available
+          spec.items << 'wxPersistentComboBox'
+        end
+        super
+        spec.gc_as_marked
+        spec.use_template_as_class('wxPersistentWindow', 'wxPersistentWindowBase')
+        spec.override_inheritance_chain('wxPersistentWindow', %w[wxPersistentObject])
+        spec.ignore 'wxPersistentWindow::wxPersistentWindow',
+                    'wxPersistentWindow::Get',
+                    ignore_doc: false
+        # make ctor protected because of pure virt methods
+        spec.extend_interface 'wxPersistentWindow',
+                              'wxPersistentWindowBase(wxWindow *win)',
+                              visibility: 'protected'
+        spec.add_header_code 'typedef wxWindow WindowType;'
+        spec.add_swig_code 'typedef wxWindow WindowType;'
+        spec.map 'WindowType *' => 'Wx::Window', swig: false do
+          map_in code: ''
+          map_out code: ''
+        end
+        spec.add_extend_code 'wxPersistentWindowBase', <<~__HEREDOC
+          wxWindow * GetObject()
+          {
+            return reinterpret_cast<wxWindow*> ($self->GetObject());
+          }
+        __HEREDOC
+        # wxPersistentTLW
+        spec.override_inheritance_chain('wxPersistentTLW', [{ 'wxPersistentWindowBase' => 'wxPersistentWindow' }, 'wxPersistentObject'])
+        # add method override missing from docs
+        spec.extend_interface 'wxPersistentTLW',
+                              'virtual wxString GetKind() const override'
+        # wxPersistentBookCtrl
+        spec.override_inheritance_chain('wxPersistentBookCtrl', [{ 'wxPersistentWindowBase' => 'wxPersistentWindow' }, 'wxPersistentObject'])
+        # add method override missing from docs
+        spec.extend_interface 'wxPersistentBookCtrl',
+                              'virtual wxString GetKind() const override'
+        # wxPersistentTreeBookCtrl
+        spec.override_inheritance_chain('wxPersistentTreeBookCtrl', ['wxPersistentBookCtrl', { 'wxPersistentWindowBase' => 'wxPersistentWindow' }, 'wxPersistentObject'])
+        # add method override missing from docs
+        spec.extend_interface 'wxPersistentTreeBookCtrl',
+                              'virtual wxString GetKind() const override'
+        spec.do_not_generate :functions, :defines, :typedefs, :variables, :enums
+        if Config.instance.wx_version >= '3.0.0'
+          # wxPersistentComboBox
+          spec.override_inheritance_chain('wxPersistentComboBox', [{ 'wxPersistentWindowBase' => 'wxPersistentWindow' }, 'wxPersistentObject'])
+          # add method override missing from docs
+          spec.extend_interface 'wxPersistentComboBox',
+                                'virtual wxString GetKind() const override'
+        end
+      end
+
+    end
+
+  end
+
+end

data/rakelib/lib/director/pgeditor.rb

@@ -17,7 +17,7 @@ module WXRuby3
         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

data/rakelib/lib/director/pgproperties.rb

@@ -65,7 +65,7 @@ module WXRuby3
                     '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 @@ module WXRuby3
         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 @@ module WXRuby3
                     '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

data/rakelib/lib/director/pgproperty.rb

@@ -113,7 +113,11 @@ module WXRuby3
           # do not think this useful for wxRuby (Also; caused GC problems)
           spec.ignore 'wxPGProperty::GetCellRenderer'
           # obsolete
-          spec.ignore %w[wxPGProperty::AddChild wxPGProperty::GetValueString]
+          if Config.instance.wx_version < '3.3.0'
+            spec.ignore %w[wxPGProperty::AddChild wxPGProperty::GetValueString]
+          else
+            spec.ignore 'wxPGProperty::AddChild'
+          end
           # not of use in Ruby
           spec.ignore(%w[wxPGProperty::GetClientData wxPGProperty::SetClientData])
           # only keep the const version

data/rakelib/lib/director/richtext_style_listbox.rb

@@ -15,6 +15,7 @@ module WXRuby3
     class RichTextStyleListBox < Window
 
       include Typemap::RichText
+      include Typemap::ComboPopup
 
       def setup
         super
@@ -28,6 +29,10 @@ module WXRuby3
                                            wxWindow
                                            wxEvtHandler
                                            wxObject])
+        # missing from docs; required so proxy calls correct override
+        spec.extend_interface 'wxRichTextStyleComboCtrl',
+                              'virtual void DoSetPopupControl(wxComboPopup* popup)',
+                              visibility: 'protected'
       end
 
     end

data/rakelib/lib/director/sizer.rb

@@ -20,7 +20,7 @@ module WXRuby3
         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()'