wxruby3 1.6.1 → 1.7.0

data/rakelib/lib/director/property_grid_page.rb

@@ -71,6 +71,66 @@ module WXRuby3
           map_in ignore: true, code: '$1= true;'
         end
         spec.suppress_warning(473, 'wxPropertyGridPage::DoInsert')
+        # customize mark function
+        spec.add_header_code <<~__HEREDOC
+          WXRUBY_TRACE_GUARD(WxRubyTraceGCMarkPropGridPage, "GC_MARK_PROPGRID_PAGE")
+
+          extern void WXRuby_GC_mark_wxPropertyGridPage(wxPropertyGridPage* wx_pgp)
+          {
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkPropGridPage, 2)
+              WXRUBY_TRACE("> WXRuby_GC_mark_wxPropertyGridPage : " << wx_pgp)
+            WXRUBY_TRACE_END
+            
+          #ifdef __WXRB_DEBUG__
+            long l = 0, n = 0;
+          #endif
+            VALUE rb_root_prop = SWIG_RubyInstanceFor(wx_pgp->GetRoot());
+            if (!NIL_P(rb_root_prop))
+            {
+              rb_gc_mark(rb_root_prop);
+          #ifdef __WXRB_DEBUG__
+              ++n;
+          #endif
+            }
+            // mark all properties
+            wxPGVIterator it =
+                wx_pgp->GetVIterator(wxPG_ITERATOR_FLAGS_ALL | wxPG_IT_CHILDREN(wxPG_ITERATOR_FLAGS_ALL));
+            // iterate all
+            for ( ; !it.AtEnd(); it.Next() )
+            {
+          #ifdef __WXRB_DEBUG__
+              ++l;
+          #endif
+              wxPGProperty* wx_p = it.GetProperty();
+              VALUE rb_prop = SWIG_RubyInstanceFor(wx_p);
+              if (!RB_NIL_P(rb_prop)) 
+              { 
+                rb_gc_mark(rb_prop);
+          #ifdef __WXRB_DEBUG__
+                ++n;
+          #endif
+              }
+            }
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkPropGridPage, 2)
+              WXRUBY_TRACE("< WXRuby_GC_mark_wxPropertyGridPage: iterated " << l << " properties; marked " << n)
+            WXRUBY_TRACE_END
+          } 
+
+          static void GC_mark_wxPropertyGridPage(void* ptr) 
+          {
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkPropGridPage, 2)
+              WXRUBY_TRACE("> GC_mark_wxPropertyGridPage : " << ptr)
+            WXRUBY_TRACE_END
+            
+            WXRuby_GC_mark_wxPropertyGridPage((wxPropertyGridPage*) ptr);
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkPropGridPage, 2)
+              WXRUBY_TRACE("< GC_mark_wxPropertyGridPage : " << ptr)
+            WXRUBY_TRACE_END
+          }
+          __HEREDOC
+        spec.add_swig_code '%markfunc wxPropertyGridPage "GC_mark_wxPropertyGridPage";'
       end
     end # class PropertyGridPage
 

data/rakelib/lib/director/rich_tooltip.rb

@@ -0,0 +1,22 @@
+# 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 RichToolTip < Director
+
+      def setup
+        super
+      end
+    end # class RichToolTip
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/richtext_ctrl.rb

@@ -101,9 +101,14 @@ module WXRuby3
           wxRichTextCtrl::KeyboardNavigate
           wxRichTextCtrl::PositionToXY
           wxRichTextCtrl::XYToPosition
+          wxRichTextCtrl::PrepareContextMenu
           ]
         # this method contains worrisome code and is unclearly documented so I doubt it's usefulness
         spec.ignore 'wxRichTextCtrl::FindContainerAtPoint'
+        # redefine for GC specs
+        spec.ignore 'wxRichTextCtrl::SetContextMenu', ignore_doc: false
+        spec.extend_interface 'wxRichTextCtrl', 'void SetContextMenu(wxMenu *new_context_menu)'
+        spec.disown 'wxMenu *new_context_menu'
         # do not think having these proxied is going to bring much for wxRuby and suppressing them
         # prevents code bloat
         spec.no_proxy %w[

data/rakelib/lib/director/richtext_object.rb

@@ -48,17 +48,26 @@ module WXRuby3
                                'wxRichTextSelection',
                                'wxRichTextProperties'
           spec.add_header_code <<~__HEREDOC
+            WXRUBY_TRACE_GUARD(WxRubyTraceFreeRichTextObject, "GC_FREE_RTOBJECT")
+
             extern void GC_RichTextObjectFreeFunc(void* ptr)
             {
+              WXRUBY_TRACE_IF(WxRubyTraceFreeRichTextObject, 2)
+                WXRUBY_TRACE("> GC_RichTextObjectFreeFunc : " << ptr)
+              WXRUBY_TRACE_END
+
               SWIG_RubyRemoveTracking(ptr);
               if (ptr)
               {
-            #ifdef __WXRB_DEBUG__
-                if (wxRuby_TraceLevel()>1)
-                  std::wcout << "GC_RichTextObjectFreeFunc(" << ptr << ")" << std::endl;
-            #endif
+                WXRUBY_TRACE_IF(WxRubyTraceFreeRichTextObject, 3)
+                  WXRUBY_TRACE("| GC_RichTextObjectFreeFunc : dereferencing")
+                WXRUBY_TRACE_END
                 ((wxRichTextObject*)ptr)->Dereference();            
               } 
+
+              WXRUBY_TRACE_IF(WxRubyTraceFreeRichTextObject, 2)
+                WXRUBY_TRACE("< GC_RichTextObjectFreeFunc : " << ptr)
+              WXRUBY_TRACE_END
             }
             __HEREDOC
           spec.make_abstract 'wxRichTextObject'

data/rakelib/lib/director/richtext_style_listbox.rb

@@ -20,9 +20,12 @@ module WXRuby3
       def setup
         super
         spec.items << 'wxRichTextStyleListCtrl' << 'wxRichTextStyleComboCtrl'
+        spec.gc_as_window('wxRichTextStyleListBox')
         spec.include 'wx/odcombo.h'
         spec.add_header_code 'extern VALUE wxRuby_RichTextStyleDefinition2Ruby(const wxRichTextStyleDefinition *wx_rtsd, int own);'
-        if Config.instance.wx_version_check('3.3.0') > 0
+        if Config.instance.wx_version_check('3.3.1') > 0
+          spec.override_inheritance_chain('wxRichTextStyleListBox', ['wxHtmlListBox', 'wxVListBox', 'wxVScrolledCanvas', 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        elsif Config.instance.wx_version_check('3.3.0') > 0
           spec.override_inheritance_chain('wxRichTextStyleListBox', ['wxHtmlListBox', 'wxVListBox', 'wxVScrolledWindow', 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
         else
           spec.override_inheritance_chain('wxRichTextStyleListBox', ['wxHtmlListBox', 'wxVListBox', { 'wxVScrolledWindow' => 'wxHScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])

data/rakelib/lib/director/scrolled_t.rb

@@ -61,6 +61,9 @@ module WXRuby3
         end
         spec.ignore 'wxScrolled::OnDraw'
         spec.ignore 'wxScrolled::GetViewStart(int *,int *)'
+        if Config.instance.wx_version_check('3.3.2') >= 0
+          spec.ignore 'wxScrolled::GetViewStartPixels(int *,int *) const'
+        end
         spec.map_apply 'int * OUTPUT' => 'int *'
       end
 

data/rakelib/lib/director/searchctrl.rb

@@ -20,6 +20,7 @@ module WXRuby3
         spec.include_mixin 'wxSearchCtrl', { 'Wx::TextEntry' => 'wxTextEntryBase' }
         spec.suppress_warning(473, 'wxSearchCtrl::GetMenu')
         spec.override_inheritance_chain('wxSearchCtrl', %w[wxControl wxWindow wxEvtHandler wxObject])
+        spec.disown 'wxMenu *'
       end
     end # class SearchCtrl
 

data/rakelib/lib/director/task_bar_icon.rb

@@ -35,25 +35,31 @@ module WXRuby3
         # this one is protected so ignored by default but we want it here
         # (we do not want GetPopupMenu available for override in Ruby)
         spec.regard %w[wxTaskBarIcon::CreatePopupMenu]
-        # This is used for CreatePopupMenu, a virtual method which is
-        # overridden in user subclasses of TaskBarIcon to create the menu over
-        # the icon.
-        #
-        # The Wx::Menu needs to be protected from GC so the typemap stores the
+        if Config.instance.wx_version_check('3.1.5') >= 0
+          spec.regard %w[wxTaskBarIcon::GetPopupMenu]
+        end
+        # This is used for CreatePopupMenu and possibly GetPopupMenu, virtual methods which can be
+        # overridden in user subclasses of TaskBarIcon to provide the menu over the icon.
+        # In the case of GetPopupMenu the menu will be used but not deleted so it can be stored in
+        # a member variable and reused.
+        # In the case of CreatePopupMenu the menu is disowned and deleted of use. The Wx::Menu Ruby
+        # instance than needs to be protected from GC so the typemap stores the
         # object returned by the ruby method in an instance variable so it's
         # marked. It also handles the special case where +nil+ is returned, to
         # signal to Wx that no menu is to be shown.
         spec.map 'wxMenu *' do
           map_directorout code: <<~__CODE
-            rb_iv_set(swig_get_self(), "@__popmenu__", $1);
+            static const std::string create_popup_menu("CreatePopupMenu");
+            bool disown = (std::string("$symname") == create_popup_menu);
+            if (disown) rb_iv_set(swig_get_self(), "@__popmenu__", $1);
             if (NIL_P($1))
             {
-              $result = NULL;
+              $result = nullptr;
             }
             else
             {
               void * ptr;
-              int swig_res = SWIG_ConvertPtr(result, &ptr, $1_descriptor, 0 | SWIG_POINTER_DISOWN);
+              int swig_res = SWIG_ConvertPtr(result, &ptr, $1_descriptor, disown ? SWIG_POINTER_DISOWN : 0);
               if (!SWIG_IsOK(swig_res))
               {
                 Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError,

data/rakelib/lib/director/text_validator.rb

@@ -32,7 +32,16 @@ module WXRuby3
             }
             virtual ~WXRubyTextValidator() 
             {
+              // All Validators are EvtHandlers, so prevent any pending events being
+              // sent after destruction (otherwise ObjectPreviouslyDeleted errors result)
+              this->SetEvtHandlerEnabled(false);
               wxRuby_ReleaseEvtHandlerProcs(this);
+              // Disassociate the C++ and Ruby objects if not done by Ruby free method
+              if (!NIL_P(SWIG_RubyInstanceFor(this)))
+              {
+                SWIG_RubyUnlinkObjects(this);
+                SWIG_RubyRemoveTracking(this);
+              }
             }
 
             virtual wxObject* Clone() const override

data/rakelib/lib/director/tip_window.rb

@@ -19,12 +19,123 @@ module WXRuby3
         spec.disable_proxies
         spec.ignore 'wxTipWindow::SetTipWindowPtr'
         spec.ignore 'wxTipWindow::wxTipWindow'
-        spec.add_extend_code 'wxTipWindow', <<~__HEREDOC
-          wxTipWindow(wxWindow* parent, const wxString& text, wxCoord maxLength = 100)
-          {
-            return new wxTipWindow(parent, text, maxLength);
-          }   
-          __HEREDOC
+        if Config.instance.wx_version_check('3.3.2') >= 0
+          spec.ignore 'wxTipWindow::Create'
+          # need to re-implement this
+          spec.ignore 'wxTipWindow::New', ignore_doc: false
+          # Rubified version
+          spec.add_extend_code 'wxTipWindow', <<~__HEREDOC
+            static VALUE New(wxWindow* parent, const wxString& text, wxCoord maxLength = 100, wxRect* rectBounds = nullptr)
+            {
+                wxTipWindow::Ref tipRef = wxTipWindow::New(parent, text, maxLength, rectBounds);   
+
+                return SWIG_NewPointerObj((new wxTipWindow::Ref(std::move(tipRef))), SWIGTYPE_p_wxTipWindow__Ref, SWIG_POINTER_OWN |  0 );
+            }
+            __HEREDOC
+          # add Ruby-style methods
+          spec.add_extend_code 'wxTipWindow::Ref', <<~__HEREDOC
+            VALUE is_ok()
+            {
+                return *$self ? Qtrue : Qfalse;
+            }
+ 
+            wxTipWindow* get_tip_window()
+            {
+                return $self->Ref::operator->();
+            }
+            __HEREDOC
+          # and aliases
+          spec.add_swig_code '%alias wxTipWindow::Ref::is_ok "ok?";'
+          spec.add_swig_code '%alias wxTipWindow::Ref::get_tip_window "tip_window";'
+          spec.rename_for_ruby 'TipWindow_Ref' => 'wxTipWindow::Ref'
+          spec.rename_for_ruby 'new_tip' => 'wxTipWindow::New'
+        else
+          spec.make_abstract 'wxTipWindow'
+          # provide custom wxRuby reference class
+          spec.add_header_code <<~__HEREDOC
+            class WXTipWindow_Ref
+            {
+              public:
+                WXTipWindow_Ref() {}
+                WXTipWindow_Ref& operator=(WXTipWindow_Ref&& o)
+                {
+                    if (_ptr != o._ptr)
+                    {
+                        if (_ptr)
+                        {
+                            _ptr->SetTipWindowPtr(nullptr);
+                        }
+                
+                        _ptr = o._ptr;
+                        if (_ptr)
+                        {
+                            o._ptr = nullptr;
+                            _ptr->SetTipWindowPtr(&_ptr);
+                        }
+                    }
+                    return *this;
+                }
+
+                bool is_ok()
+                {
+                    return _ptr ? true : false;
+                }
+     
+                wxTipWindow* get_tip_window()
+                {
+                    return _ptr;
+                }
+
+                wxTipWindow* _ptr = {};  
+            };
+            __HEREDOC
+          spec.add_swig_code <<~__HEREDOC
+            %alias WXTipWindow_Ref::is_ok "ok?";
+            %alias WXTipWindow_Ref::get_tip_window "tip_window";
+
+            class WXTipWindow_Ref
+            {
+              private:
+                WXTipWindow_Ref();
+
+              public:
+                bool is_ok();
+     
+                wxTipWindow* get_tip_window();
+            };
+            __HEREDOC
+          # add constructor method
+          spec.add_extend_code 'wxTipWindow', <<~__HEREDOC
+            static VALUE New_Tip(wxWindow* parent, const wxString& text, wxCoord maxLength = 100, wxRect* rectBounds = nullptr)
+            {
+                std::unique_ptr<WXTipWindow_Ref> retval(new WXTipWindow_Ref);
+                std::unique_ptr<wxTipWindow> temp(new wxTipWindow(parent, text, maxLength, &retval->_ptr, rectBounds));
+                retval->_ptr = temp.release();
+            
+                return SWIG_NewPointerObj(retval.release(), SWIGTYPE_p_WXTipWindow_Ref, SWIG_POINTER_OWN |  0 );
+            }
+            __HEREDOC
+        end
+      end
+
+      def doc_generator
+        TipWindowDocGenerator.new(self)
+      end
+
+    end
+
+    class TipWindowDocGenerator < DocGenerator
+
+      def gen_class_doc_members(fdoc, clsdef, cls_members, alias_methods)
+        super
+        fdoc.doc.puts 'Constructs a new TipWindow object which is immediately shown.'
+        fdoc.doc.puts 'Returns a {Wx::TipWindow::Ref}.'
+        fdoc.doc.puts '@param parent [Wx::Window] parent window (not nil).'
+        fdoc.doc.puts '@param text [String] The text to show, may contain the new line characters.'
+        fdoc.doc.puts '@param maxLength [Integer] The length of each line, in pixels. Set to a very large value to avoid wrapping lines.'
+        fdoc.doc.puts '@param rectBounds [Wx::Rect] If given, passed to {Wx::TipWindow#set_bounding_rect}, please see its documentation for the description of this parameter.'
+        fdoc.doc.puts '@return [Wx::TipWindow::Ref] weak tip window reference'
+        fdoc.puts 'def self.new_tip(parent, text, maxLength = 100, rectBounds = nil) end'
       end
 
     end

data/rakelib/lib/director/tool_bar.rb

@@ -33,6 +33,8 @@ module WXRuby3
           wxToolBarToolBase::Attach
           ]
         spec.no_proxy 'wxToolBarToolBase'
+        # for SetDropdownMenu
+        spec.disown 'wxMenu *'
         # more sensible name to use
         spec.rename_for_ruby('ToolBarTool' => 'wxToolBarToolBase')
         spec.map 'wxToolBarBase *' => 'Wx::ToolBar' do
@@ -73,6 +75,10 @@ module WXRuby3
           'wxToolBar::AddTool(wxToolBarToolBase *)',
           'wxToolBar::InsertTool(size_t,wxToolBarToolBase *)'
           ]
+        if Config.instance.features_set?('WXOSX')
+          spec.extend_interface('wxToolBar',
+                                'virtual bool Destroy() override')
+        end
       end
     end # class Object
 

data/rakelib/lib/director/validator.rb

@@ -37,7 +37,16 @@ module WXRuby3
             {}
             wxRubyValidator::~wxRubyValidator ()
             {
+              // All Validators are EvtHandlers, so prevent any pending events being
+              // sent after destruction (otherwise ObjectPreviouslyDeleted errors result)
+              this->SetEvtHandlerEnabled(false);
               wxRuby_ReleaseEvtHandlerProcs(this);
+              // Disassociate the C++ and Ruby objects if not done by Ruby free method
+              if (!NIL_P(SWIG_RubyInstanceFor(this)))
+              {
+                SWIG_RubyUnlinkObjects(this);
+                SWIG_RubyRemoveTracking(this);
+              }
             }
 
             wxObject* wxRubyValidator::Clone() const
@@ -147,6 +156,9 @@ module WXRuby3
           spec.add_swig_code '%markfunc wxValidator "GC_mark_wxValidator";'
           # will be provided as a pure Ruby method
           spec.ignore 'wxValidator::Clone', ignore_doc: false
+          # ignore default ctor docs
+          spec.ignore 'wxValidator::wxValidator'
+          spec.regard 'wxValidator::wxValidator', regard_doc: false # only use interface spec, not docs
           # add wxRuby specifics
           spec.extend_interface 'wxValidator',
                                 'wxValidator(const wxValidator& other)'

data/rakelib/lib/director/variant.rb

@@ -384,48 +384,64 @@ module WXRuby3
         # provide a custom wxVariantData implementation for Ruby VALUE
         # and some interface extensions to use that from Ruby
         spec.add_header_code <<~__HEREDOC
+          WXRUBY_TRACE_GUARD(WxRubyTraceGCMarkVariant, "GC_MARK_VARIANT")
+          WXRUBY_TRACE_GUARD(WxRubyTraceGCTrackVariant, "GC_TRACK_VARIANT")
+
           class WXRBValueVariantData;
           // Mapping of WXRBValueVariantData* to Ruby VALUE
           WX_DECLARE_VOIDPTR_HASH_MAP(VALUE,
                                       WXRBVariantDataToRbValueHash);
           static WXRBVariantDataToRbValueHash Variant_Value_Map;
 
-          static void wxRuby_markRbValueVariants()
+          static void GC_mark_RbValueVariants()
           {
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkVariant, 2)
+              WXRUBY_TRACE("> GC_mark_RbValueVariants")
+            WXRUBY_TRACE_END
+
             WXRBVariantDataToRbValueHash::iterator it;
             for( it = Variant_Value_Map.begin(); it != Variant_Value_Map.end(); ++it )
             {
               VALUE obj = it->second;
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>1)
-              {
-                void *c_ptr = (TYPE(obj) == T_DATA ? DATA_PTR(obj) : 0);
-                std::wcout << "**** wxRuby_markRbValueVariants : " << it->first << "|" << (void*)c_ptr << std::endl;
-              }
-          #endif 
+
+              WXRUBY_TRACE_IF(WxRubyTraceGCMarkVariant, 2)
+                WXRUBY_TRACE_WITH(void *c_ptr = (TYPE(obj) == T_DATA ? DATA_PTR(obj) : 0))
+                WXRUBY_TRACE("| GC_mark_RbValueVariants : " << it->first << "|" << (void*)c_ptr)
+              WXRUBY_TRACE_END
+
               rb_gc_mark(obj);
             }
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkVariant, 2)
+              WXRUBY_TRACE("< GC_mark_RbValueVariants")
+            WXRUBY_TRACE_END
           }
 
           static void wxRuby_RegisterValueVariantData(void* ptr, VALUE rbval)
           {
-          #ifdef __WXRB_DEBUG__
-            if (wxRuby_TraceLevel()>1)
-            {
-              void *c_ptr = (TYPE(rbval) == T_DATA ? DATA_PTR(rbval) : 0);
-              std::wcout << "**** wxRuby_RegisterValueVariantData : " << ptr << "|" << (void*)c_ptr << std::endl;
-            } 
-          #endif 
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackVariant, 2)
+              WXRUBY_TRACE_WITH(void *c_ptr = (TYPE(rbval) == T_DATA ? DATA_PTR(rbval) : 0))
+              WXRUBY_TRACE("> wxRuby_RegisterValueVariantData : " << ptr << "|" << (void*)c_ptr)
+            WXRUBY_TRACE_END
+
             Variant_Value_Map[ptr] = rbval;
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkVariant, 2)
+              WXRUBY_TRACE("< wxRuby_RegisterValueVariantData")
+            WXRUBY_TRACE_END
           }
 
           static void wxRuby_UnregisterValueVariantData(void* ptr)
           {
-          #ifdef __WXRB_DEBUG__
-            if (wxRuby_TraceLevel()>1)
-              std::wcout << "**** wxRuby_UnregisterValueVariantData : " << ptr << std::endl; 
-          #endif 
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackVariant, 2)
+              WXRUBY_TRACE("> wxRuby_UnregisterValueVariantData : " << ptr)
+            WXRUBY_TRACE_END
+
             Variant_Value_Map.erase(ptr);
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkVariant, 2)
+              WXRUBY_TRACE("< wxRuby_UnregisterValueVariantData")
+            WXRUBY_TRACE_END
           }
 
           class WXRUBY_EXPORT WXRBValueVariantData : public wxVariantData
@@ -486,7 +502,7 @@ module WXRuby3
             return variant;
           }
           __HEREDOC
-        spec.add_init_code 'wxRuby_AppendMarker(wxRuby_markRbValueVariants);'
+        spec.add_init_code 'wxRuby_AppendMarker(GC_mark_RbValueVariants);'
         # ignore GetType (not doc)
         spec.ignore 'wxVariant::GetType', ignore_doc: false
         # replace with custom implementation

data/rakelib/lib/director/vlistbox.rb

@@ -16,34 +16,37 @@ module WXRuby3
 
       def setup
         super
-        if Config.instance.wx_version_check('3.3.0') > 0
+        spec.gc_as_window
+        if Config.instance.wx_version_check('3.3.1') > 0
+          spec.override_inheritance_chain('wxVListBox', [{ 'wxVScrolledCanvas' => 'wxVScrolledCanvas' }, 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        elsif Config.instance.wx_version_check('3.3.0') > 0
           spec.override_inheritance_chain('wxVListBox', [{ 'wxVScrolledWindow' => 'wxVScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
         else
           spec.override_inheritance_chain('wxVListBox', [{ 'wxVScrolledWindow' => 'wxHScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
         end
         spec.make_abstract 'wxVListBox'
         # provide base implementations for OnDrawItem and OnMeasureItem
-        spec.add_header_code <<~__HEREDOC
-          // Custom subclass implementation. 
-          class wxRubyVListBox : public wxVListBox
-          {
-          public:
-            wxRubyVListBox() 
-              : wxVListBox () {}
-            wxRubyVListBox(wxWindow *parent, wxWindowID id=wxID_ANY, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=0, const wxString &name=wxVListBoxNameStr)
-              : wxVListBox(parent, id, pos, size, style, name) {}
-          protected:
-            virtual void OnDrawItem(wxDC&, const wxRect&, size_t) const
-            {
-            }
-            virtual wxCoord OnMeasureItem(size_t) const
-            {
-              return {};
-            }
-          };
-        __HEREDOC
-        # make Ruby director and wrappers use custom implementation
-        spec.use_class_implementation('wxVListBox', 'wxRubyVListBox')
+        # spec.add_header_code <<~__HEREDOC
+        #   // Custom subclass implementation.
+        #   class wxRubyVListBox : public wxVListBox
+        #   {
+        #   public:
+        #     wxRubyVListBox()
+        #       : wxVListBox () {}
+        #     wxRubyVListBox(wxWindow *parent, wxWindowID id=wxID_ANY, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=0, const wxString &name=wxVListBoxNameStr)
+        #       : wxVListBox(parent, id, pos, size, style, name) {}
+        #   protected:
+        #     virtual void OnDrawItem(wxDC&, const wxRect&, size_t) const
+        #     {
+        #     }
+        #     virtual wxCoord OnMeasureItem(size_t) const
+        #     {
+        #       return {};
+        #     }
+        #   };
+        # __HEREDOC
+        # # make Ruby director and wrappers use custom implementation
+        # spec.use_class_implementation('wxVListBox', 'wxRubyVListBox')
         # make sure protected methods are included
         spec.regard 'wxVListBox::OnDrawItem',
                     'wxVListBox::OnMeasureItem',

data/rakelib/lib/director/window.rb

@@ -127,7 +127,7 @@ module WXRuby3
             spec.ignore 'wxWindow::EnableTouchEvents'
           end
           if Config.instance.wx_version_check('3.3.0') >= 0
-            spec.ignore_unless('WXMSW', 'wxWindow::MSWDisableComposited')
+            spec.ignore_unless('WXMSW', 'wxWindow::MSWDisableComposited') if Config.instance.wx_version_check('3.3.1') <= 0
             spec.ignore('wxWindow::GTKGetWin32Handle')
           end
           if Config.instance.features_set?('USE_ACCESSIBILITY')
@@ -236,6 +236,10 @@ module WXRuby3
           spec.override_events 'wxWindow', 'EVT_ACTIVATE' => ['EVT_ACTIVATE', 0, 'wxActivateEvent']
         when 'wxNonOwnedWindow'
           spec.no_proxy('wxNonOwnedWindow')
+          if Config.instance.features_set?('WXOSX')
+            spec.extend_interface('wxNonOwnedWindow',
+                                  'virtual bool Destroy() override')
+          end
         when 'wxControl'
           # add these to the generated interface to be parsed by SWIG
           # the wxWidgets docs are flawed in this respect that several reimplemented
@@ -288,6 +292,7 @@ module WXRuby3
                           "#{spec.class_name(citem)}::GetScrollRange",
                           "#{spec.class_name(citem)}::GetScrollThumb",
                           "#{spec.class_name(citem)}::GetTextExtent",
+                          "#{spec.class_name(citem)}::GetDPI",
                           "#{spec.class_name(citem)}::HasCapture",
                           "#{spec.class_name(citem)}::HasMultiplePages",
                           "#{spec.class_name(citem)}::IsDoubleBuffered",
@@ -305,6 +310,9 @@ module WXRuby3
                           "#{spec.class_name(citem)}::SetBackgroundColour",
                           "#{spec.class_name(citem)}::SetBackgroundStyle",
                           "#{spec.class_name(citem)}::HasTransparentBackground",
+                          "#{spec.class_name(citem)}::CanSetTransparent",
+                          "#{spec.class_name(citem)}::SetTransparent",
+                          "#{spec.class_name(citem)}::GetThemeEnabled",
                           "#{spec.class_name(citem)}::SetCursor",
                           "#{spec.class_name(citem)}::SetFocus",
                           "#{spec.class_name(citem)}::SetFocusFromKbd",
@@ -329,6 +337,7 @@ module WXRuby3
                           "#{spec.class_name(citem)}::GetDefaultAttributes",
                           "#{spec.class_name(citem)}::GetWindowStyleFlag",
                           "#{spec.class_name(citem)}::GetDropTarget",
+                          "#{spec.class_name(citem)}::SetDropTarget",
                           "#{spec.class_name(citem)}::GetValidator",
                           "#{spec.class_name(citem)}::IsTopLevel",
                           "#{spec.class_name(citem)}::EnableTouchEvents",

data/rakelib/lib/director/xml_resource.rb

@@ -18,6 +18,12 @@ module WXRuby3
         spec.ignore %w[wxXmlResource::AddHandler wxXmlResource::ClearHandlers wxXmlResource::InsertHandler]
         # not really added value; will add alternative allowing more flexibility (see below)
         spec.ignore 'wxXmlResource::LoadDocument(wxXmlDocument *, const wxString &)'
+        # unwanted in Ruby
+        spec.ignore 'wxXmlResource::LoadObject',
+                    'wxXmlResource::LoadObjectRecursively'
+        # unattached loaders return owned objects
+        spec.new_object 'wxXmlResource::LoadMenu(const wxString &)',
+                        'wxXmlResource::LoadMenuBar(const wxString &)'
         # For these three methods, there are two variants in wxWidgets. One loads an
         # XRC from scratch and returns an instance of a core Wx class
         # (Wx::Dialog, Wx::Frame, or Wx::Panel). The other loads a layout into

data/rakelib/lib/generate/doc/aui_manager.yaml

@@ -25,4 +25,4 @@
       :para:
         - :pattern: !ruby/regexp /The overridden version may return true but modify.*appending them./
           :replace: |
-            The overridden version may return a 2-element array with an AuiTabCtrl and tab index instead to change where the page should be inserted, e.g. by returning a tab index of 0 to insert the new pages at the beginning instead of appending them.
+            The overridden version may return a 2-element array with an {Wx::AUI::AuiTabCtrl} and tab index instead to change where the page should be inserted, e.g. by returning a tab index of 0 to insert the new pages at the beginning instead of appending them.