wxruby3 0.9.2 → 0.9.3

data/rakelib/lib/director/owner_drawn_combobox.rb

@@ -0,0 +1,192 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class OwnerDrawnComboBox < Window
+
+      include Typemap::ClientData
+
+      def setup
+        super
+        spec.items << 'wxItemContainer'
+        # override inheritance chain
+        spec.override_inheritance_chain('wxOwnerDrawnComboBox', %w[wxComboCtrl wxControl wxWindow wxEvtHandler wxObject])
+        spec.fold_bases('wxOwnerDrawnComboBox' => %w[wxItemContainer])
+        spec.regard %w[
+          wxOwnerDrawnComboBox::OnDrawBackground
+          wxOwnerDrawnComboBox::OnDrawItem
+          wxOwnerDrawnComboBox::OnMeasureItem
+          wxOwnerDrawnComboBox::OnMeasureItemWidth
+        ]
+        # unuseful overloads
+        spec.ignore 'wxOwnerDrawnComboBox::wxOwnerDrawnComboBox(wxWindow *, wxWindowID, const wxString &, const wxPoint &, const wxSize &, int, const wxString [], long, const wxValidator &, const wxString &)',
+                    'wxOwnerDrawnComboBox::Create(wxWindow *, wxWindowID, const wxString &, const wxPoint &, const wxSize &, int, const wxString [], long, const wxValidator &, const wxString &)'
+        spec.ignore('wxItemContainer::Append(const wxString &, void *)',
+                    'wxItemContainer::Append(const std::vector< wxString > &)',
+                    'wxItemContainer::Append(const wxArrayString &, void **)',
+                    'wxItemContainer::Append(unsigned int, const wxString *)',
+                    'wxItemContainer::Append(unsigned int, const wxString *, void **)',
+                    'wxItemContainer::Append(unsigned int, const wxString *, wxClientData **)',
+                    'wxItemContainer::Insert(const wxString &, unsigned int, void *)',
+                    'wxItemContainer::Insert(const std::vector< wxString > &)',
+                    'wxItemContainer::Insert(const wxArrayString &, unsigned int, void **)',
+                    'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int)',
+                    'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int, void **)',
+                    'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int, wxClientData **)',
+                    'wxItemContainer::Set(const std::vector< wxString > &)',
+                    'wxItemContainer::Set(const wxArrayString &, void **)',
+                    'wxItemContainer::Set(unsigned int, const wxString *)',
+                    'wxItemContainer::Set(unsigned int, const wxString *, void **)',
+                    'wxItemContainer::Set(unsigned int, const wxString *, wxClientData **)',
+                    'wxItemContainer::GetClientData',
+                    'wxItemContainer::SetClientData',
+                    'wxItemContainer::HasClientUntypedData',
+                    'wxItemContainer::Clear')
+        # ignore these but keep docs; will add custom versions below
+        spec.ignore([
+                      'wxItemContainer::DetachClientObject',
+                      'wxItemContainer::Append(const wxArrayString &, wxClientData **)',
+                      'wxItemContainer::Insert(const wxArrayString &, unsigned int, wxClientData **)',
+                      'wxItemContainer::Set(const wxArrayString &, wxClientData **)'], ignore_doc: false)
+        # ambiguous
+        spec.ignore 'wxOwnerDrawnComboBox::IsEmpty', ignore_doc: false
+        # missing from docs; needed to override TextEntry version
+        spec.extend_interface 'wxOwnerDrawnComboBox', 'void Clear()'
+        # missing from docs; required so proxy calls correct override
+        spec.extend_interface 'wxOwnerDrawnComboBox',
+                              'virtual void DoSetPopupControl(wxComboPopup* popup)',
+                              visibility: 'protected'
+        # missing from docs; implementations of wxItemContainerImmutable methods
+        spec.extend_interface 'wxOwnerDrawnComboBox',
+                              'unsigned int GetCount() const',
+                              'wxString GetString(unsigned int n) const',
+                              'void SetString(unsigned int n, const wxString& s)',
+                              'int FindString(const wxString& s, bool bCase = false) const',
+                              'void Select(int n)',
+                              'wxArrayString GetStrings() const'
+        # for doc only
+        spec.map 'void** clientData' => 'Array', swig: false do
+          map_in code: ''
+        end
+        # Replace the old Wx definitions of these methods adding
+        # proper checks on the data arrays.
+        # Also add an item enumerator.
+        spec.add_extend_code 'wxOwnerDrawnComboBox', <<~__HEREDOC
+          wxString GetListStringSelection()
+          {
+            return $self->wxItemContainerImmutable::GetStringSelection();
+          } 
+
+          bool SetListStringSelection(const wxString& string)
+          {
+            return $self->wxItemContainerImmutable::SetStringSelection(string);
+          } 
+
+          void SetListSelection(int n)
+          {
+            $self->SetSelection(n);
+          }
+
+          int GetListSelection()
+          {
+            return $self->GetSelection();
+          }
+
+          VALUE DetachClientObject(unsigned int n)
+          {
+            VALUE rc = Qnil;
+            wxClientData *wxcd = $self->DetachClientObject(n);
+            wxRubyClientData *rbcd = wxcd ? dynamic_cast<wxRubyClientData*> (wxcd) : nullptr;
+            if (rbcd)
+            {
+              rc = rbcd->GetData();
+              delete rbcd;
+            }
+            return rc;
+          }
+
+          int Append(const wxArrayString &items, VALUE rb_clientData)
+          {
+            if (TYPE(rb_clientData) != T_ARRAY || 
+                  static_cast<unsigned int> (RARRAY_LEN(rb_clientData)) != items.GetCount())
+            {
+              rb_raise(rb_eArgError, 
+                       TYPE(rb_clientData) == T_ARRAY ? 
+                          "expected Array for client_data" : 
+                          "client_data Array needs to be equal in size to items Array");
+            }
+
+            std::unique_ptr<wxClientData*[]> cd_arr = std::make_unique<wxClientData*[]> (RARRAY_LEN(rb_clientData));
+            for (int i=0; i<RARRAY_LEN(rb_clientData) ;++i)
+            {
+              cd_arr[i] = new wxRubyClientData(rb_ary_entry(rb_clientData, i));
+            }
+            return $self->Append(items, cd_arr.get());
+          }
+
+          int Insert(const wxArrayString &items, unsigned int pos, VALUE rb_clientData)
+          {
+            if (TYPE(rb_clientData) != T_ARRAY || 
+                  static_cast<unsigned int> (RARRAY_LEN(rb_clientData)) != items.GetCount())
+            {
+              rb_raise(rb_eArgError, 
+                       TYPE(rb_clientData) == T_ARRAY ? 
+                          "expected Array for client_data" : 
+                          "client_data Array needs to be equal in size to items Array");
+            }
+
+            std::unique_ptr<wxClientData*[]> cd_arr = std::make_unique<wxClientData*[]> (RARRAY_LEN(rb_clientData));
+            for (int i=0; i<RARRAY_LEN(rb_clientData) ;++i)
+            {
+              cd_arr[i] = new wxRubyClientData(rb_ary_entry(rb_clientData, i));
+            }
+            return $self->Insert(items, pos, cd_arr.get());
+          }
+
+          void Set(const wxArrayString &items, VALUE rb_clientData)
+          {
+            if (TYPE(rb_clientData) != T_ARRAY || 
+                  static_cast<unsigned int> (RARRAY_LEN(rb_clientData)) != items.GetCount())
+            {
+              rb_raise(rb_eArgError, 
+                       TYPE(rb_clientData) == T_ARRAY ? 
+                          "expected Array for client_data" : 
+                          "client_data Array needs to be equal in size to items Array");
+            }
+
+            std::unique_ptr<wxClientData*[]> cd_arr = std::make_unique<wxClientData*[]> (RARRAY_LEN(rb_clientData));
+            for (int i=0; i<RARRAY_LEN(rb_clientData) ;++i)
+            {
+              cd_arr[i] = new wxRubyClientData(rb_ary_entry(rb_clientData, i));
+            }
+            $self->Set(items, cd_arr.get());
+          }
+
+          VALUE each_string()
+          {
+            VALUE rc = Qnil;
+            for (unsigned int i=0; i<$self->GetCount() ;++i)
+            {
+              VALUE rb_s = WXSTR_TO_RSTR($self->GetString(i));
+              rc = rb_yield(rb_s);
+            }
+            return rc;
+          }
+          __HEREDOC
+      end
+
+    end # class OwnerDrawnComboBox
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/pgproperty.rb

@@ -18,6 +18,8 @@ module WXRuby3
 
       include Typemap::PGCell
 
+      include Typemap::ClientData
+
       def setup
         super
         if spec.module_name == 'wxPGProperty'
@@ -113,7 +115,7 @@ module WXRuby3
           # obsolete
           spec.ignore %w[wxPGProperty::AddChild wxPGProperty::GetValueString]
           # not of use in Ruby
-          spec.ignore(%w[wxPGProperty::GetClientObject wxPGProperty::SetClientObject])
+          spec.ignore(%w[wxPGProperty::GetClientData wxPGProperty::SetClientData])
           # only keep the const version
           spec.ignore 'wxPGProperty::GetCell'
           spec.regard 'wxPGProperty::GetCell(unsigned int) const'
@@ -146,32 +148,6 @@ module WXRuby3
           spec.suppress_warning(473,
                                 'wxPGProperty::DoGetEditorClass',
                                 'wxPGProperty::DoGetValidator')
-          spec.add_header_code <<~__HEREDOC
-            extern void GC_mark_wxPGProperty(void* ptr)
-            {
-            #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>1)
-              {
-                std::wcout << "> GC_mark_wxPGProperty : " << ptr;
-                if (ptr) std::wcout << " (" << ((wxPGProperty*)ptr)->GetName() << ')';
-                std::wcout << std::endl;
-              }
-            #endif
-              if (ptr)
-              {
-                VALUE object = (VALUE)((wxPGProperty*)ptr)->GetClientData();
-                if (object && !NIL_P(object))
-                {
-            #ifdef __WXRB_DEBUG__
-                  if (wxRuby_TraceLevel()>2)
-                    std::wcout << "*** marking property data " << ptr << std::endl;
-            #endif
-                  rb_gc_mark(object);
-                }
-              }
-            }
-            __HEREDOC
-          spec.add_swig_code '%markfunc wxPGProperty "GC_mark_wxPGProperty";'
           spec.ignore 'wxPGProperty::m_clientData' # not wanted for wxRuby
           # take protected members into account
           spec.regard 'wxPGProperty::wxPGProperty',
@@ -237,7 +213,6 @@ module WXRuby3
             }
             __CODE
         else
-          spec.add_header_code 'extern void GC_mark_wxPGProperty(void* ptr);'
           spec.items.each do |itm|
             unless itm == 'wxColourPropertyValue'
               # add protected member methods and var to complement base class
@@ -250,7 +225,6 @@ module WXRuby3
                                     'wxVariant m_value',
                                     visibility: 'protected'
               spec.rename_for_ruby 'value_' => "#{itm}::m_value"
-              spec.add_swig_code %Q{%markfunc #{itm} "GC_mark_wxPGProperty";}
               spec.new_object %Q{#{itm}::GetEditorDialog}
               spec.suppress_warning(473, "#{itm}::GetEditorDialog")
             end

data/rakelib/lib/director/ribbon_button_bar.rb

@@ -14,13 +14,13 @@ module WXRuby3
 
     class RibbonButtonBar < Window
 
+      include Typemap::ClientData
+
       def setup
         super
         # exclude these; far better done in pure Ruby
         spec.ignore 'wxRibbonButtonBar::SetItemClientData',
-                    'wxRibbonButtonBar::GetItemClientData', ignore_doc: false
-        spec.ignore 'wxRibbonButtonBar::SetItemClientObject',
-                    'wxRibbonButtonBar::GetItemClientObject'
+                    'wxRibbonButtonBar::GetItemClientData'
         # not needed because of type mapping
         spec.ignore 'wxRibbonButtonBar::GetItemId',
                     'wxRibbonButtonBar::GetItemById'

data/rakelib/lib/director/ribbon_gallery.rb

@@ -14,15 +14,13 @@ module WXRuby3
 
     class RibbonGallery < Window
 
+      include Typemap::ClientData
+
       def setup
         super
-        # exclude these; far better done in pure Ruby
-        spec.ignore 'wxRibbonGallery::SetItemClientObject',
-                    'wxRibbonGallery::GetItemClientObject',
-                    'wxRibbonGallery::Append(const wxBitmap &, int, wxClientData *)'
         spec.ignore 'wxRibbonGallery::SetItemClientData',
                     'wxRibbonGallery::GetItemClientData',
-                    'wxRibbonGallery::Append(const wxBitmap &, int, void *)', ignore_doc: false
+                    'wxRibbonGallery::Append(const wxBitmap &, int, void *)'
         spec.map 'wxRibbonGalleryItem*' => 'Integer' do
           map_out code: '$result = ULL2NUM(reinterpret_cast<uintptr_t> ($1));'
           map_directorout code: '$result = reinterpret_cast<wxRibbonGalleryItem*> ((uintptr_t)NUM2ULL($1));'

data/rakelib/lib/director/sizer.rb

@@ -12,12 +12,19 @@ module WXRuby3
 
     class Sizer < Director
 
+      include Typemap::ClientData
+
       def setup
-        # Any nested sizers passed to Add() in are owned by C++, not GC'd by Ruby
+        # Any nested sizers passed to Add() in are owned by C++, not GC-ed by Ruby
         case spec.module_name
         when 'wxSizer'
           spec.items << 'wxSizerFlags'
           spec.gc_as_untracked('wxSizerFlags')
+          if Config.instance.wx_version < '3.3.0'
+            # missing from docs
+            spec.extend_interface 'wxSizerFlags',
+                                  'wxSizerFlags& HorzBorder()'
+          end
           spec.make_abstract('wxSizer')
           spec.ignore %w[wxSizer::IsShown wxSizer::SetVirtualSizeHints]
           # cannot use these with wxRuby
@@ -45,7 +52,7 @@ module WXRuby3
           spec.ignore 'wxSizer::Detach(wxSizer*)',
                       'wxSizer::Detach(int)', ignore_doc: false
           spec.add_extend_code 'wxSizer', <<~__HEREDOC
-            bool detach(wxSizer* szr)
+            bool Detach(wxSizer* szr)
             {
               if ($self->Detach(szr))
               {
@@ -60,7 +67,7 @@ module WXRuby3
               return false;
             }
 
-            bool detach(int itm_nr)
+            bool Detach(int itm_nr)
             {
               wxSizerItem* itm = $self->GetItem(itm_nr);
               if (itm)
@@ -124,9 +131,13 @@ module WXRuby3
           spec.ignore 'wxGridBagSizer::Add(wxGBSizerItem *)'
           # need to adjust sizer arg name to apply disown specs
           spec.ignore 'wxGridBagSizer::Add(wxSizer *, const wxGBPosition &, const wxGBSpan &, int, int, wxObject *)',
+                      'wxGridBagSizer::Add(wxWindow *, const wxGBPosition &, const wxGBSpan &, int, int, wxObject *)',
+                      'wxGridBagSizer::Add(int, int, const wxGBPosition &, const wxGBSpan &, int, int, wxObject *)',
                       ignore_doc: false
           spec.extend_interface 'wxGridBagSizer',
-                                'wxSizerItem *Add(wxSizer *sizer_disown, const wxGBPosition &pos, const wxGBSpan &span=wxDefaultSpan, int flag=0, int border=0, wxObject *userData=NULL)'
+                                'wxSizerItem * Add(wxSizer *sizer_disown, const wxGBPosition &pos, const wxGBSpan &span=wxDefaultSpan, int flag=0, int border=0, wxObject *userData=NULL)',
+                                'wxSizerItem * Add(wxWindow *window, const wxGBPosition &pos, const wxGBSpan &span=wxDefaultSpan, int flag=0, int border=0, wxObject *userData=NULL)',
+                                'wxSizerItem * Add(int width, int height, const wxGBPosition &pos, const wxGBSpan &span=wxDefaultSpan, int flag=0, int border=0, wxObject *userData=NULL)'
           spec.disown 'wxSizer* sizer_disown'
         end
         # no real use for allowing these to be overloaded but a whole lot of grieve

data/rakelib/lib/director/sizer_item.rb

@@ -12,15 +12,27 @@ module WXRuby3
 
     class SizerItem < Director
 
+      include Typemap::ClientData
+
       def setup
         spec.disable_proxies
         # do not allow creating SizerItems in Ruby; this has limited benefits and
         # memory management of sizer items is a nightmare
         case spec.module_name
         when 'wxSizerItem'
+          spec.gc_as_untracked 'wxSizerItem'
           spec.make_abstract 'wxSizerItem'
           # ignore constructors
           spec.ignore 'wxSizerItem::wxSizerItem'
+          # needs more discriminating return type for type map
+          spec.ignore 'wxSizerItem::GetUserData', ignore_doc: false
+          spec.add_header_code 'typedef wxObject* WxUserDataObject;'
+          spec.extend_interface 'wxSizerItem',
+                                'WxUserDataObject GetUserData() const'
+          # for doc gen only
+          spec.map 'wxObject*' => 'Object', swig: false do
+            map_out code: ''
+          end
           spec.ignore(%w[wxSizerItem::SetSizer wxSizerItem::SetSpacer wxSizerItem::SetWindow])
           # need to adjust sizer arg name to apply disown specs
           spec.ignore 'wxSizerItem::AssignSizer(wxSizer *)', ignore_doc: false
@@ -45,6 +57,7 @@ module WXRuby3
             }
             __HEREDOC
         when 'wxGBSizerItem'
+          spec.gc_as_untracked 'wxGBSizerItem'
           spec.make_abstract 'wxGBSizerItem'
           # ignore constructors
           spec.ignore 'wxGBSizerItem::wxGBSizerItem',

data/rakelib/lib/director/static_bitmap.rb

@@ -20,6 +20,34 @@ module WXRuby3
           __HEREDOC
         super
       end
+
+      def process(gendoc: false)
+        defmod = super
+        spec.include 'wx/generic/statbmpg.h'
+        def_statbmp = defmod.find_item('wxStaticBitmap')
+        # create a definition for 'wxGenericStaticBitmap' which is not documented
+        def_genstatbmp = def_statbmp.dup
+        def_genstatbmp.name = 'wxGenericStaticBitmap'
+        def_genstatbmp.brief_doc = nil
+        def_genstatbmp.detailed_doc = nil
+        def_genstatbmp.items = def_genstatbmp.items.collect { |itm| itm.dup }
+        def_genstatbmp.items.each do |itm|
+          if itm.is_a?(Extractor::MethodDef)
+            itm.overloads = itm.overloads.collect { |ovl| ovl.dup }
+            itm.all.each do |ovl|
+              ovl.name = 'wxGenericStaticBitmap' if ovl.is_ctor
+              ovl.class_name = 'wxGenericStaticBitmap'
+              ovl.update_attributes(klass: def_genstatbmp)
+            end
+          end
+        end
+        def_genstatbmp.items.delete_if { |itm| itm.is_a?(Extractor::EnumDef) && itm.name == 'ScaleMode' }
+        spec.add_swig_code %Q{typedef wxStaticBitmap::ScaleMode ScaleMode; }
+        spec.add_header_code %Q{typedef wxStaticBitmap::ScaleMode ScaleMode; }
+        defmod.items << def_genstatbmp
+        defmod
+      end
+
     end # class StaticBitmap
 
   end # class Director

data/rakelib/lib/director/text_entry.rb

@@ -26,6 +26,10 @@ module WXRuby3
         spec.add_header_code '#define wxTextEntry wxTextEntryBase'
         spec.disown 'wxTextCompleter *completer' # managed by wxWidgets after passing in
         spec.map_apply 'long * OUTPUT' => 'long *' # for GetSelection
+        # missing non-pure virtual overrides in docs for wxTextCompleterSimple
+        spec.extend_interface 'wxTextCompleterSimple',
+                              'virtual bool Start(const wxString &prefix)',
+                              'virtual wxString GetNext()'
         # for wxTextCompleterSimple::GetCompletions
         spec.map 'wxArrayString &res' => 'Array<String>' do
 

data/rakelib/lib/director/text_validator.rb

@@ -6,48 +6,159 @@
 # wxRuby3 wxWidgets interface director
 ###
 
-require_relative './event_handler'
+require_relative './validator'
 
 module WXRuby3
 
   class Director
 
-    class TextValidator < EvtHandler
+    class TextValidator < Validator
 
       def setup
         super
         # need a custom implementation to handle event handler proc cleanup
         spec.add_header_code <<~__HEREDOC
-          class WXRubyTextValidator : public wxTextValidator
+          class WXRubyTextValidator : public wxTextValidator, public wxRubyValidatorBinding
           {
           public:
-            WXRubyTextValidator(const wxTextValidator& v) 
-              : wxTextValidator(v) {}
             WXRubyTextValidator(long style=wxFILTER_NONE) 
-              : wxTextValidator(style) {}
+              : wxTextValidator(style, &m_valueCache) 
+            {
+            }
+            WXRubyTextValidator(const WXRubyTextValidator& other) 
+              : wxTextValidator(other.GetStyle(), &m_valueCache)
+              , wxRubyValidatorBinding(other)
+            {
+            }
             virtual ~WXRubyTextValidator() 
             {
               wxRuby_ReleaseEvtHandlerProcs(this);
-            }               
+            }
+
+            virtual wxObject* Clone() const override
+            {
+              WXRubyTextValidator* clone = new WXRubyTextValidator(*this);
+              clone->m_valueCache = this->m_valueCache;
+              return clone;
+            }
+
+            virtual void SetWindow(wxWindow *win) override
+            {
+              this->wxTextValidator::SetWindow(win);
+              VALUE self = this->get_self();
+              // make sure Ruby does not own this validator instance anymore
+              RDATA(self)->dfree = SWIG_RubyRemoveTracking;
+            } 
+
+            virtual bool TransferFromWindow () override 
+            {
+              // call super 
+              if (this->wxTextValidator::TransferFromWindow())
+              {
+                // ok, data is retrieved from window and cached
+                // now allow any defined binding handler to pass on the data
+                return this->DoOnTransferFromWindow(WXSTR_TO_RSTR(m_valueCache));
+              } 
+              return false;
+            }
+            virtual bool TransferToWindow () override 
+            { 
+              // collect data from any defined binding handler
+              VALUE data = this->DoOnTransferToWindow();
+              // if Qnil returned there is no data returned from handler so we just keep what's in the store
+              if (!NIL_P(data))
+              {
+                m_valueCache = RSTR_TO_WXSTR(data);
+              }
+              // now allow standard functionality to transfer to window 
+              return this->wxTextValidator::TransferToWindow();
+            }
+
+            const wxString& GetValue () const
+            {
+              return m_valueCache;
+            }
+
+            void SetValue (const wxString& val)
+            {
+              m_valueCache = val;
+            }
+
+          private:
+            static VALUE c_TextValidator; 
+
+            virtual VALUE get_self() override
+            {
+              if (NIL_P(this->self_))
+              {
+                this->self_ = SWIG_RubyInstanceFor(this);
+                // if this is a C++ created clone (wxWidgets clones validators that are set) it's not tracked yet
+                if (NIL_P(this->self_))
+                {
+                  if (NIL_P(c_TextValidator))
+                  {
+                    c_TextValidator = rb_const_get(mWxCore, rb_intern("TextValidator"));
+                  }
+                  swig_type_info* swig_type = wxRuby_GetSwigTypeForClass(c_TextValidator);
+                  this->self_ = SWIG_NewPointerObj(this, swig_type, 0); // wrap but don't make Ruby own it
+                }
+              }
+              return this->self_; 
+            }
+
+            wxString m_valueCache;               
           };
-        __HEREDOC
+
+          VALUE WXRubyTextValidator::c_TextValidator = Qnil;
+
+          static void GC_mark_wxTextValidator(void* ptr)
+          {
+            if (ptr)
+            {
+              wxValidator* vp = reinterpret_cast<wxValidator*> (ptr);
+              WXRubyTextValidator* rbvp = dynamic_cast<WXRubyTextValidator*> (vp);
+              // This might be a pointer to a non-customized validator (or clone thereof) created internally 
+              // by wxWidgets C++ code 
+              if (rbvp) rbvp->GC_Mark();
+            }
+          } 
+
+          __HEREDOC
+        spec.add_swig_code '%markfunc wxTextValidator "GC_mark_wxTextValidator";'
+        # make Ruby director and wrappers use custom implementation
         spec.use_class_implementation 'wxTextValidator', 'WXRubyTextValidator'
-        # ignore copy ctor doc
-        spec.regard 'wxTextValidator::wxTextValidator(const wxTextValidator&)', regard_doc: false
         # ignore this ctor
         spec.ignore 'wxTextValidator::wxTextValidator(long, wxString*)'
         # add alternative
         spec.extend_interface 'wxTextValidator', 'wxTextValidator(long style=wxFILTER_NONE)'
-        # ignore non-virtual standard handler (not really useful in Ruby)
+        # add wxRuby extensions
+        spec.add_extend_code 'wxTextValidator', <<~__HEREDOC
+          VALUE GetValue()
+          {
+            WXRubyTextValidator* rb_self = dynamic_cast<WXRubyTextValidator*> ($self);
+            if (rb_self)
+              return WXSTR_TO_RSTR(rb_self->GetValue());
+            else
+              return Qnil;
+          }
+
+          void SetValue(const wxString& val)
+          {
+            WXRubyTextValidator* rb_self = dynamic_cast<WXRubyTextValidator*> ($self);
+            if (rb_self)
+              rb_self->SetValue(val);
+          }
+          __HEREDOC
+        # ignore non-virtual standard handler (not useful in Ruby)
         spec.ignore 'wxTextValidator::OnChar'
-        spec.no_proxy 'wxTextValidator::Clone'
         spec.new_object 'wxTextValidator::Clone'
         # handle clone mapping
         spec.map 'wxObject *' => 'Wx::TextValidator' do
           map_out code: <<~__CODE
-            $result = SWIG_NewPointerObj(SWIG_as_voidptr($1), SWIGTYPE_p_wxTextValidator, SWIG_POINTER_OWN |  0 );
+            $result = SWIG_NewPointerObj(SWIG_as_voidptr($1), SWIGTYPE_p_wxTextValidator, SWIG_POINTER_OWN);
             __CODE
         end
+        spec.suppress_warning(473, 'wxTextValidator::Clone')
         # not provided in Ruby
         spec.ignore %w[wxTextValidator::TransferFromWindow wxTextValidator::TransferToWindow]
       end

data/rakelib/lib/director/toggle_button.rb

@@ -15,6 +15,7 @@ module WXRuby3
     class ToggleButton < Window
 
       def setup
+        spec.items << 'wxBitmapToggleButton'
         spec.include('wx/tglbtn.h')
         super
       end

data/rakelib/lib/director/top_level_window.rb

@@ -26,10 +26,8 @@ module WXRuby3
           # for upcalls
           spec.extend_interface('wxTopLevelWindow',
                                 'virtual bool Destroy() override',
-                                #'virtual bool IsTopLevel() override',
                                 'virtual void SetLayoutDirection(wxLayoutDirection dir) override',
                                 'virtual bool Show(bool show = true) override',
-                                'virtual void Raise() override',
                                 'virtual void Refresh(bool eraseBackground = true, wxRect const *rect = NULL) override')
           spec.add_wrapper_code <<~__HEREDOC
             extern VALUE wxRuby_GetTopLevelWindowClass() {

data/rakelib/lib/director/tree_ctrl.rb

@@ -50,6 +50,41 @@ module WXRuby3
           wxTreeCtrl::GetFirstChild
           wxTreeCtrl::GetNextChild
           ]
+        if Config.instance.wx_version >= '3.3.0'
+          # new method with bitmap bundle vector
+          spec.no_proxy 'wxTreeCtrl::SetStateImages'
+          spec.map 'const wxVector<wxBitmapBundle>& images' => 'Array<Wx::ImageBundle>' do
+            map_in temp: 'wxVector<wxBitmapBundle> tmp', code: <<~__CODE
+            if ($input != Qnil)
+            {
+              if (TYPE($input) == T_ARRAY)
+              {
+                for (int i=0; i<RARRAY_LEN($input) ;++i)
+                {
+                  void* ptr;
+                  VALUE rb_image = rb_ary_entry($input, i);
+                  int res = SWIG_ConvertPtr(rb_image, &ptr, wxRuby_GetSwigTypeForClassName("BitmapBundle"), 0);
+                  if (!SWIG_IsOK(res)) 
+                  {
+                    VALUE msg = rb_inspect(rb_image);
+                    rb_raise(rb_eTypeError, "Expected Wx::ImageBundle at index %d but got %s", i, StringValuePtr(msg));
+                  }
+                  tmp.push_back(*static_cast<wxBitmapBundle*>(ptr));
+                }
+              }
+              else
+              {
+                VALUE msg = rb_inspect($input);
+                rb_raise(rb_eArgError, "Expected Array of Wx::ImageBundle for $argnum but got %s", StringValuePtr(msg));
+              }
+            }
+            $1 = &tmp;
+            __CODE
+          end
+        end
+        # don't see how supporting overloading this one in Ruby is helpful
+        # (also seeing SetButtonsImageList isn't virtual at all)
+        spec.no_proxy 'wxTreeCtrl::SetStateImageList'
         # these are potentially involved in GC mark phase so
         # we can't have them redirecting to Ruby calls
         spec.no_proxy %w[