wxruby3 1.6.1 → 1.7.0

data/rakelib/lib/director/grid_ctrl.rb

@@ -175,12 +175,14 @@ module WXRuby3
         spec.disown('wxGridTableBase* table')
         # customize mark function to handle safeguarding any customized Grid tables installed
         spec.add_header_code <<~__HEREDOC
+          WXRUBY_TRACE_GUARD(WxRubyTraceGCMarkGrid, "GC_MARK_GRID")
+
           static void GC_mark_wxGridCtrl(void* ptr) 
           {
-          #ifdef __WXRB_DEBUG__
-            if (wxRuby_TraceLevel()>1)
-              std::wcout << "> GC_mark_wxGridCtrl : " << ptr << std::endl;
-          #endif
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkGrid, 2)
+              WXRUBY_TRACE("> GC_mark_wxGridCtrl : " << ptr)
+            WXRUBY_TRACE_END
+
             if ( GC_IsWindowDeleted(ptr) )
             {
               return;
@@ -194,8 +196,16 @@ module WXRuby3
             VALUE rb_gtbl = SWIG_RubyInstanceFor(wx_gtbl);
             if (!NIL_P(rb_gtbl))
             {
+              WXRUBY_TRACE_IF(WxRubyTraceGCMarkGrid, 3)
+                WXRUBY_TRACE("| GC_mark_wxGridCtrl : marking gridtable " << wx_gtbl << " -> " << rb_gtbl);
+              WXRUBY_TRACE_END
+
               rb_gc_mark(rb_gtbl);
             }
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkGrid, 2)
+              WXRUBY_TRACE("< GC_mark_wxGridCtrl : " << ptr)
+            WXRUBY_TRACE_END
           }
         __HEREDOC
         spec.add_swig_code '%markfunc wxGrid "GC_mark_wxGridCtrl";'
@@ -298,12 +308,19 @@ module WXRuby3
                                       WXRBGridCellAttrValueHash);
           static WXRBGridCellAttrValueHash Grid_Cell_Attr_Value_Map;
 
+          WXRUBY_TRACE_GUARD(WxRubyTraceGCMarkGridCellAttr, "GC_MARK_GRID_CELL_ATTR")
+          WXRUBY_TRACE_GUARD(WxRubyTraceGCTrackGridCellAttr, "GC_TRACK_GRID_CELL_ATTR")
+          WXRUBY_TRACE_GUARD(WxRubyTraceGCMarkGridCellEditor, "GC_MARK_GRID_CELL_EDITOR")
+          WXRUBY_TRACE_GUARD(WxRubyTraceGCTrackGridCellEditor, "GC_TRACK_GRID_CELL_EDITOR")
+          WXRUBY_TRACE_GUARD(WxRubyTraceGCMarkGridCellRenderer, "GC_MARK_GRID_CELL_RENDERER")
+          WXRUBY_TRACE_GUARD(WxRubyTraceGCTrackGridCellRenderer, "GC_TRACK_GRID_CELL_RENDERER")
+
           static void wxRuby_UnregisterGridCellAttr(wxGridCellAttr* wx_attr)
           {
-          #ifdef __WXRB_DEBUG__
-            if (wxRuby_TraceLevel()>1)
-              std::wcout << "** wxRuby_UnregisterGridCellAttr : " << wx_attr << ":" << (void*)Grid_Cell_Attr_Value_Map[wx_attr] << std::endl;
-          #endif
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellAttr, 2)
+              WXRUBY_TRACE("> wxRuby_UnregisterGridCellAttr : " << wx_attr << " -> " << Grid_Cell_Attr_Value_Map[wx_attr])
+            WXRUBY_TRACE_END
+
             if (Grid_Cell_Attr_Value_Map.count(wx_attr) != 0)
             {
               VALUE object = Grid_Cell_Attr_Value_Map[wx_attr];  
@@ -313,6 +330,10 @@ module WXRuby3
               }
               Grid_Cell_Attr_Value_Map.erase(wx_attr);
             }
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellAttr, 2)
+              WXRUBY_TRACE("< wxRuby_UnregisterGridCellAttr : " << wx_attr)
+            WXRUBY_TRACE_END
           }
 
           extern VALUE wxRuby_GridCellAttrInstance(wxGridCellAttr* wx_attr)
@@ -340,30 +361,52 @@ module WXRuby3
           // and it's associated registration/de-registration functions
           extern void wxRuby_RegisterGridCellAttr(wxGridCellAttr* wx_attr, VALUE rb_attr)
           {
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellAttr, 2)
+              WXRUBY_TRACE("> wxRuby_RegisterGridCellAttr : " << wx_attr << " -> " << rb_attr)
+            WXRUBY_TRACE_END
+
             if (wx_attr && !NIL_P(rb_attr))
             {
               // always (keep) disown(ed); wxWidgets takes over ownership
               RDATA(rb_attr)->dfree = 0;
               if (Grid_Cell_Attr_Value_Map.count(wx_attr) == 0)
               {
-          #ifdef __WXRB_DEBUG__
-                if (wxRuby_TraceLevel()>1)
-                  std::wcout << "** wxRuby_RegisterGridCellAttr : " << wx_attr << ":" << (void*)rb_attr << std::endl;
-          #endif
+                WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellAttr, 2)
+                  WXRUBY_TRACE("| wxRuby_RegisterGridCellAttr : installing monitor")
+                WXRUBY_TRACE_END
+
                 wx_attr->SetClientObject(new WXRBGridCellAttrMonitor(wx_attr, rb_attr));
               }
             }
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellAttr, 2)
+              WXRUBY_TRACE("< wxRuby_RegisterGridCellAttr : " << wx_attr)
+            WXRUBY_TRACE_END
           }
 
           // define the grid cell attribute marker
           static void wxRuby_markGridCellAttr()
           {
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkGridCellAttr, 2)
+              WXRUBY_TRACE("> wxRuby_markGridCellAttr")
+            WXRUBY_TRACE_END
+
             WXRBGridCellAttrValueHash::iterator it;
             for( it = Grid_Cell_Attr_Value_Map.begin(); it != Grid_Cell_Attr_Value_Map.end(); ++it )
             {
               VALUE obj = it->second;
+
+              WXRUBY_TRACE_IF(WxRubyTraceGCMarkGridCellAttr, 2)
+                WXRUBY_TRACE_WITH(void *c_ptr = (TYPE(obj) == T_DATA ? DATA_PTR(obj) : 0))
+                WXRUBY_TRACE("| wxRuby_markGridCellAttr : " << it->first << "|" << (void*)c_ptr)
+              WXRUBY_TRACE_END
+
               rb_gc_mark(obj);
             }
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkGridCellAttr, 2)
+              WXRUBY_TRACE("< wxRuby_markGridCellAttr")
+            WXRUBY_TRACE_END
           }
 
           // declare the global table for grid cell editors
@@ -373,10 +416,10 @@ module WXRuby3
 
           static void wxRuby_UnregisterGridCellEditor(wxGridCellEditor* wx_edt)
           {
-          #ifdef __WXRB_DEBUG__
-            if (wxRuby_TraceLevel()>1)
-              std::wcout << "** wxRuby_UnregisterGridCellEditor : " << wx_edt << ":" << (void*)Grid_Cell_Editor_Value_Map[wx_edt] << std::endl;
-          #endif
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellEditor, 2)
+              WXRUBY_TRACE("> wxRuby_UnregisterGridCellEditor : " << wx_edt << " -> " << Grid_Cell_Editor_Value_Map[wx_edt])
+            WXRUBY_TRACE_END
+
             if (Grid_Cell_Editor_Value_Map.count(wx_edt) != 0)
             {
               VALUE object = Grid_Cell_Editor_Value_Map[wx_edt];  
@@ -386,6 +429,10 @@ module WXRuby3
               }
               Grid_Cell_Editor_Value_Map.erase(wx_edt);
             }
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellEditor, 2)
+              WXRUBY_TRACE("< wxRuby_UnregisterGridCellEditor : " << wx_edt)
+            WXRUBY_TRACE_END
           }
 
           extern VALUE wxRuby_GridCellEditorInstance(wxGridCellEditor* wx_edt)
@@ -413,30 +460,52 @@ module WXRuby3
           // and it's associated registration function
           extern void wxRuby_RegisterGridCellEditor(wxGridCellEditor* wx_edt, VALUE rb_edt)
           {
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellEditor, 2)
+              WXRUBY_TRACE("> wxRuby_RegisterGridCellEditor : " << wx_edt << " -> " << rb_edt)
+            WXRUBY_TRACE_END
+
             if (wx_edt && !NIL_P(rb_edt))
             {
               // always (keep) disown(ed); wxWidgets takes over ownership
               RDATA(rb_edt)->dfree = 0;
               if (Grid_Cell_Editor_Value_Map.count(wx_edt) == 0)
               {
-          #ifdef __WXRB_DEBUG__
-                if (wxRuby_TraceLevel()>1)
-                  std::wcout << "** wxRuby_RegisterGridCellEditor : " << wx_edt << ":" << (void*)rb_edt << std::endl;
-          #endif
+                WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellEditor, 2)
+                  WXRUBY_TRACE("| wxRuby_RegisterGridCellEditor : installing monitor")
+                WXRUBY_TRACE_END
+
                 wx_edt->SetClientObject(new WXRBGridCellEditorMonitor(wx_edt, rb_edt));
               }
             }
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellEditor, 2)
+              WXRUBY_TRACE("< wxRuby_RegisterGridCellEditor : " << wx_edt)
+            WXRUBY_TRACE_END
           }
 
           // define the grid cell editor marker
           static void wxRuby_markGridCellEditor()
           {
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellEditor, 2)
+              WXRUBY_TRACE("> wxRuby_markGridCellEditor")
+            WXRUBY_TRACE_END
+
             WXRBGridCellEditorValueHash::iterator it;
             for( it = Grid_Cell_Editor_Value_Map.begin(); it != Grid_Cell_Editor_Value_Map.end(); ++it )
             {
               VALUE obj = it->second;
+
+              WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellEditor, 2)
+                WXRUBY_TRACE_WITH(void *c_ptr = (TYPE(obj) == T_DATA ? DATA_PTR(obj) : 0))
+                WXRUBY_TRACE("| wxRuby_markGridCellEditor : " << it->first << "|" << (void*)c_ptr)
+              WXRUBY_TRACE_END
+
               rb_gc_mark(obj);
             }
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellEditor, 2)
+              WXRUBY_TRACE("< wxRuby_markGridCellEditor")
+            WXRUBY_TRACE_END
           }
 
           // declare the global table for grid cell renderer
@@ -446,10 +515,10 @@ module WXRuby3
 
           static void wxRuby_UnregisterGridCellRenderer(wxGridCellRenderer* wx_rnd)
           {
-          #ifdef __WXRB_DEBUG__
-            if (wxRuby_TraceLevel()>1)
-              std::wcout << "** wxRuby_UnregisterGridCellRenderer : " << wx_rnd << ":" << (void*)Grid_Cell_Renderer_Value_Map[wx_rnd] << std::endl;
-          #endif
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellRenderer, 2)
+              WXRUBY_TRACE("> wxRuby_UnregisterGridCellRenderer : " << wx_rnd << " -> " << Grid_Cell_Renderer_Value_Map[wx_rnd])
+            WXRUBY_TRACE_END
+
             if (Grid_Cell_Renderer_Value_Map.count(wx_rnd) != 0)
             {
               VALUE object = Grid_Cell_Renderer_Value_Map[wx_rnd];  
@@ -459,6 +528,10 @@ module WXRuby3
               }
               Grid_Cell_Renderer_Value_Map.erase(wx_rnd);
             }
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellRenderer, 2)
+              WXRUBY_TRACE("< wxRuby_UnregisterGridCellRenderer : " << wx_rnd)
+            WXRUBY_TRACE_END
           }
 
           extern VALUE wxRuby_GridCellRendererInstance(wxGridCellRenderer* wx_rnd)
@@ -485,30 +558,52 @@ module WXRuby3
           // and it's associated registration/de-registration functions
           extern void wxRuby_RegisterGridCellRenderer(wxGridCellRenderer* wx_rnd, VALUE rb_rnd)
           {
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellRenderer, 2)
+              WXRUBY_TRACE("> wxRuby_RegisterGridCellRenderer : " << wx_rnd << " -> " << rb_rnd)
+            WXRUBY_TRACE_END
+
             if (wx_rnd && !NIL_P(rb_rnd))
             {
               // always (keep) disowned(ed); wxWidgets takes over ownership
               RDATA(rb_rnd)->dfree = 0;
               if (Grid_Cell_Renderer_Value_Map.count(wx_rnd) == 0)
               {
-          #ifdef __WXRB_DEBUG__
-                if (wxRuby_TraceLevel()>1)
-                  std::wcout << "** wxRuby_RegisterGridCellRenderer : registering " << wx_rnd << ":" << (void*)rb_rnd << std::endl;
-          #endif
+                WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellRenderer, 2)
+                  WXRUBY_TRACE("| wxRuby_RegisterGridCellRenderer : installing monitor")
+                WXRUBY_TRACE_END
+
                 wx_rnd->SetClientObject(new WXRBGridCellRendererMonitor(wx_rnd, rb_rnd));
               }
             }
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellRenderer, 2)
+              WXRUBY_TRACE("< wxRuby_RegisterGridCellRenderer : " << wx_rnd)
+            WXRUBY_TRACE_END
           }
 
           // define the grid cell renderer marker
           static void wxRuby_markGridCellRenderer()
           {
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellRenderer, 2)
+              WXRUBY_TRACE("> wxRuby_markGridCellRenderer")
+            WXRUBY_TRACE_END
+
             WXRBGridCellRendererValueHash::iterator it;
             for( it = Grid_Cell_Renderer_Value_Map.begin(); it != Grid_Cell_Renderer_Value_Map.end(); ++it )
             {
               VALUE obj = it->second;
+
+              WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellRenderer, 2)
+                WXRUBY_TRACE_WITH(void *c_ptr = (TYPE(obj) == T_DATA ? DATA_PTR(obj) : 0))
+                WXRUBY_TRACE("| wxRuby_markGridCellRenderer : " << it->first << "|" << (void*)c_ptr)
+              WXRUBY_TRACE_END
+
               rb_gc_mark(obj);
             }
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCTrackGridCellRenderer, 2)
+              WXRUBY_TRACE("< wxRuby_markGridCellRenderer")
+            WXRUBY_TRACE_END
           }
 
           __HEREDOC

data/rakelib/lib/director/help_provider.rb

@@ -92,7 +92,7 @@ module WXRuby3
             // virtual wxString GetHelp(const wxWindowBase* window);
             void RemoveHelp(wxWindowBase* window); // no virtual as we have fixed director impl above
             virtual bool ShowHelp(wxWindowBase* window);
-            virtual bool ShowHelpAtPoint(wxWindowBase* window, const wxPoint point, 
+            virtual bool ShowHelpAtPoint(wxWindowBase* window, const wxPoint& point, 
                                          wxHelpEvent::Origin origin);
           };
           __HEREDOC

data/rakelib/lib/director/html_listbox.rb

@@ -18,8 +18,11 @@ module WXRuby3
 
       def setup
         spec.items << 'wxSimpleHtmlListBox' << 'wxItemContainer'
+        spec.gc_as_window('wxHtmlListBox', 'wxSimpleHtmlListBox')
         super
-        if Config.instance.wx_version_check('3.3.0') > 0
+        if Config.instance.wx_version_check('3.3.1') > 0
+          spec.override_inheritance_chain('wxHtmlListBox', ['wxVListBox', 'wxVScrolledCanvas', 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        elsif Config.instance.wx_version_check('3.3.0') > 0
           spec.override_inheritance_chain('wxHtmlListBox', ['wxVListBox', 'wxVScrolledWindow', 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
         else
           spec.override_inheritance_chain('wxHtmlListBox', ['wxVListBox', { 'wxVScrolledWindow' => 'wxHScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
@@ -59,6 +62,13 @@ module WXRuby3
                     'wxHtmlListBox::GetSelectedTextColour',
                     'wxHtmlListBox::GetSelectedTextBgColour',
                     'wxHtmlListBox::OnLinkClicked'
+        # missing from the XML docs
+        spec.extend_interface('wxHtmlListBox',
+                              'virtual void OnInternalIdle()',
+                              'virtual void RefreshRow(size_t line)',
+                              'virtual void RefreshRows(size_t from, size_t to)',
+                              'virtual void RefreshAll()',
+                              'virtual void SetItemCount(size_t count)')
         # add missing protected overloads
         spec.extend_interface 'wxHtmlListBox',
                               'virtual void OnDrawItem(wxDC &dc, const wxRect &rect, size_t n) const',
@@ -71,7 +81,9 @@ module WXRuby3
                       'wxHtmlListBox::OnGetRowsHeightHint'
 
         # override inheritance chain
-        if Config.instance.wx_version_check('3.3.0') > 0
+        if Config.instance.wx_version_check('3.3.1') > 0
+          spec.override_inheritance_chain('wxSimpleHtmlListBox', ['wxHtmlListBox', 'wxVListBox', 'wxVScrolledCanvas', 'wxWindow', 'wxEvtHandler', 'wxObject'])
+        elsif Config.instance.wx_version_check('3.3.0') > 0
           spec.override_inheritance_chain('wxSimpleHtmlListBox', ['wxHtmlListBox', 'wxVListBox', 'wxVScrolledWindow', 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
         else
           spec.override_inheritance_chain('wxSimpleHtmlListBox', ['wxHtmlListBox', 'wxVListBox', { 'wxVScrolledWindow' => 'wxHScrolledWindow' }, 'wxPanel', 'wxWindow', 'wxEvtHandler', 'wxObject'])
@@ -84,7 +96,8 @@ module WXRuby3
         # add missing overloads
         spec.extend_interface 'wxSimpleHtmlListBox',
                               'virtual wxString GetString(unsigned int n) const',
-                              'virtual void SetString(unsigned int n, const wxString &string)'
+                              'virtual void SetString(unsigned int n, const wxString &string)',
+                              'wxArrayString GetStrings() const'
         spec.ignore([ 'wxItemContainer::Append(const wxString &, void *)',
                       'wxItemContainer::Append(const std::vector< wxString > &)',
                       'wxItemContainer::Append(const wxArrayString &, void **)',

data/rakelib/lib/director/hvscrolled.rb

@@ -22,50 +22,10 @@ module WXRuby3
           spec.override_inheritance_chain('wxHScrolledWindow', %w[wxPanel wxWindow wxEvtHandler wxObject])
           spec.fold_bases('wxHScrolledWindow' => %w[wxVarHScrollHelper wxVarScrollHelperBase])
           spec.make_abstract 'wxHScrolledWindow'
-          spec.force_proxy 'wxHScrolledWindow'
+          # spec.force_proxy 'wxHScrolledWindow'
           spec.override_inheritance_chain('wxHVScrolledWindow', %w[wxPanel wxWindow wxEvtHandler wxObject])
           spec.fold_bases('wxHVScrolledWindow' => %w[wxVarHVScrollHelper wxVarHScrollHelper wxVarVScrollHelper wxVarScrollHelperBase])
           spec.make_abstract 'wxHVScrolledWindow'
-          spec.force_proxy 'wxHVScrolledWindow'
-          # provide base implementations for pure virtuals
-          spec.add_header_code <<~__HEREDOC
-            // Custom subclass implementation. 
-            class wxRubyHScrolledWindow : public wxHScrolledWindow
-            {
-            public:
-              wxRubyHScrolledWindow() 
-                : wxHScrolledWindow () {}
-              wxRubyHScrolledWindow(wxWindow *parent, wxWindowID id=wxID_ANY, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=0, const wxString &name=wxPanelNameStr)
-                : wxHScrolledWindow(parent, id, pos, size, style, name) {}
-            protected:
-              virtual wxCoord OnGetColumnWidth(size_t) const
-              {
-                return {};
-              }
-            };
-  
-            // Custom subclass implementation. 
-            class wxRubyHVScrolledWindow : public wxHVScrolledWindow
-            {
-            public:
-              wxRubyHVScrolledWindow() 
-                : wxHVScrolledWindow () {}
-              wxRubyHVScrolledWindow(wxWindow *parent, wxWindowID id=wxID_ANY, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=0, const wxString &name=wxPanelNameStr)
-                : wxHVScrolledWindow(parent, id, pos, size, style, name) {}
-            protected:
-              virtual wxCoord OnGetRowHeight(size_t) const
-              {
-                return {};
-              }
-              virtual wxCoord OnGetColumnWidth(size_t) const
-              {
-                return {};
-              }
-            };
-            __HEREDOC
-          # make Ruby director and wrappers use custom implementation
-          spec.use_class_implementation('wxHScrolledWindow', 'wxRubyHScrolledWindow')
-          spec.use_class_implementation('wxHVScrolledWindow', 'wxRubyHVScrolledWindow')
           # regard protected methods
           spec.regard 'wxVarVScrollHelper::OnGetRowHeight',
                       'wxVarVScrollHelper::OnGetRowsHeightHint'
@@ -116,26 +76,6 @@ module WXRuby3
             spec.override_inheritance_chain('wxVScrolledWindow', %w[wxPanel wxWindow wxEvtHandler wxObject])
             spec.fold_bases('wxVScrolledWindow' => %w[wxVarVScrollHelper wxVarScrollHelperBase])
             spec.make_abstract 'wxVScrolledWindow'
-            spec.force_proxy 'wxVScrolledWindow'
-            # provide base implementations for pure virtuals
-            spec.add_header_code <<~__HEREDOC
-              // Custom subclass implementation. 
-              class wxRubyVScrolledWindow : public wxVScrolledWindow
-              {
-              public:
-                wxRubyVScrolledWindow() 
-                  : wxVScrolledWindow () {}
-                wxRubyVScrolledWindow(wxWindow *parent, wxWindowID id=wxID_ANY, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=0, const wxString &name=wxPanelNameStr)
-                  : wxVScrolledWindow(parent, id, pos, size, style, name) {}
-              protected:
-                virtual wxCoord OnGetRowHeight(size_t) const
-                {
-                  return {};
-                }
-              };
-              __HEREDOC
-            # make Ruby director and wrappers use custom implementation
-            spec.use_class_implementation('wxVScrolledWindow', 'wxRubyVScrolledWindow')
           end
           spec.do_not_generate(:typedefs)
         when 'wxVScrolledWindow'
@@ -145,8 +85,8 @@ module WXRuby3
             spec.use_template_as_class('wxVScrolled', 'wxVScrolledWindow')
             spec.override_inheritance_chain('wxVScrolled', %w[wxPanel wxWindow wxEvtHandler wxObject])
             spec.fold_bases('wxVScrolled' => %w[wxVarVScrollHelper wxVarScrollHelperBase])
-            spec.make_abstract 'wxVScrolled'
-            spec.force_proxy 'wxVScrolled'
+            spec.make_abstract 'wxVScrolledWindow'
+            # spec.force_proxy 'wxVScrolled'
             spec.swig_import %w[
             swig/classes/include/wxObject.h
             swig/classes/include/wxEvtHandler.h
@@ -154,25 +94,6 @@ module WXRuby3
             swig/classes/include/wxPanel.h
             swig/classes/include/wxHScrolledWindow.h
             ]
-            # provide base implementations for pure virtuals
-            spec.add_header_code <<~__HEREDOC
-              // Custom subclass implementation. 
-              class wxRubyVScrolledWindow : public wxVScrolledWindow
-              {
-              public:
-                wxRubyVScrolledWindow() 
-                  : wxVScrolledWindow () {}
-                wxRubyVScrolledWindow(wxWindow *parent, wxWindowID id=wxID_ANY, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=0, const wxString &name=wxPanelNameStr)
-                  : wxVScrolledWindow(parent, id, pos, size, style, name) {}
-              protected:
-                virtual wxCoord OnGetRowHeight(size_t) const
-                {
-                  return {};
-                }
-              };
-              __HEREDOC
-            # make Ruby director and wrappers use custom implementation
-            spec.use_class_implementation('wxVScrolled', 'wxRubyVScrolledWindow')
             # regard protected methods
             spec.regard 'wxVarVScrollHelper::OnGetRowHeight',
                         'wxVarVScrollHelper::OnGetRowsHeightHint'
@@ -196,10 +117,10 @@ module WXRuby3
             spec.items.replace %w[wxVScrolled wxVarScrollHelperBase wxVarVScrollHelper]
             spec.gc_as_window
             spec.use_template_as_class('wxVScrolled', 'wxVScrolledCanvas')
-            spec.override_inheritance_chain('wxVScrolled', %w[wxPanel wxWindow wxEvtHandler wxObject])
+            spec.override_inheritance_chain('wxVScrolled', %w[wxWindow wxEvtHandler wxObject])
             spec.fold_bases('wxVScrolled' => %w[wxVarVScrollHelper wxVarScrollHelperBase])
-            spec.make_abstract 'wxVScrolled'
-            spec.force_proxy 'wxVScrolled'
+            spec.make_abstract 'wxVScrolledCanvas'
+            # spec.force_proxy 'wxVScrolled'
             spec.swig_import %w[
             swig/classes/include/wxObject.h
             swig/classes/include/wxEvtHandler.h
@@ -207,25 +128,6 @@ module WXRuby3
             swig/classes/include/wxPanel.h
             swig/classes/include/wxHScrolledWindow.h
             ]
-            # provide base implementations for pure virtuals
-            spec.add_header_code <<~__HEREDOC
-              // Custom subclass implementation. 
-              class wxRubyVScrolledCanvas : public wxVScrolledCanvas
-              {
-              public:
-                wxRubyVScrolledCanvas() 
-                  : wxVScrolledCanvas () {}
-                wxRubyVScrolledCanvas(wxWindow *parent, wxWindowID id=wxID_ANY, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=0, const wxString &name=wxPanelNameStr)
-                  : wxVScrolledCanvas(parent, id, pos, size, style, name) {}
-              protected:
-                virtual wxCoord OnGetRowHeight(size_t) const
-                {
-                  return {};
-                }
-              };
-              __HEREDOC
-            # make Ruby director and wrappers use custom implementation
-            spec.use_class_implementation('wxVScrolled', 'wxRubyVScrolledCanvas')
             # regard protected methods
             spec.regard 'wxVarVScrollHelper::OnGetRowHeight',
                         'wxVarVScrollHelper::OnGetRowsHeightHint'
@@ -238,8 +140,7 @@ module WXRuby3
                         'wxVarScrollHelperBase::CalcUnscrolledPosition',
                         'wxVarScrollHelperBase::GetTargetWindow',
                         'wxVarScrollHelperBase::SetTargetWindow',
-                        'wxVarScrollHelperBase::UpdateScrollbar',
-                        'wxVarScrollHelperBase::RefreshAll'
+                        'wxVarScrollHelperBase::UpdateScrollbar'
             spec.do_not_generate(:typedefs, :functions, :defines, :variables)
           else
             spec.items.clear

data/rakelib/lib/director/image_list.rb

@@ -13,6 +13,7 @@ module WXRuby3
     class ImageList < Director
 
       def setup
+        spec.disable_proxies
         spec.require_app 'wxImageList'
         if Config.instance.windows? || Config.instance.macosx?
           spec.ignore('wxImageList::Add(const wxIcon &)', ignore_doc: false)

data/rakelib/lib/director/mdi_frame.rb

@@ -22,6 +22,10 @@ module WXRuby3
           wxMDIParentFrame::SetWindowMenu
           wxMDIParentFrame::Tile
           wxMDIParentFrame::Cascade]
+        # for SetWindowMenu
+        spec.disown 'wxMenu *'
+        spec.extend_interface('wxMDIChildFrame',
+                              'virtual bool Destroy() override')
         # for GetClientWindow
         spec.map 'wxMDIClientWindowBase *' => 'wxMDIClientWindow *' do
           map_out code: <<~__HEREDOC

data/rakelib/lib/director/menu.rb

@@ -13,7 +13,7 @@ module WXRuby3
     class Menu < Director
 
       def setup
-        spec.gc_never
+        spec.gc_as_object
         spec.ignore 'wxMenu::wxMenu(long)'
         spec.no_proxy 'wxMenu'  # do not support derived wxMenu classes
         spec.add_header_code <<~__HEREDOC
@@ -33,6 +33,16 @@ module WXRuby3
         __HEREDOC
         # make Ruby director and wrappers use custom implementation
         spec.use_class_implementation('wxMenu', 'wxRubyMenu')
+        # GC handling
+        spec.disown 'wxMenu *submenu'
+        # not wanted
+        spec.ignore 'wxMenu::SetParent',
+                    'wxMenu::Attach',
+                    'wxMenu::Detach',
+                    'wxMenu::SetInvokingWindow',
+                    'wxMenu::GetInvokingWindow',
+                    'wxMenu::GetWindow',
+                    'wxMenu::UpdateUI'
         # ignore non-const version as that has no benefits in Ruby
         spec.ignore 'wxMenu::GetMenuItems()'
         # Fix for GetMenuItems - converts list of MenuItems to Array
@@ -60,30 +70,61 @@ module WXRuby3
         # for FindChildItem
         spec.map_apply 'size_t * OUTPUT' => 'size_t * pos'
         spec.add_header_code <<~__HEREDOC
+          WXRUBY_TRACE_GUARD(WxRubyTraceMarkMenu, "GC_MARK_MENU")
+
+          // forward decl
+          SWIGINTERN void free_wxMenu(void *self);
+
           // Mark Function
           // Need to protect MenuItems which are included in the Menu, including
           // their associated sub-menus, recursively.
-          static void mark_wxMenu(void *ptr) 
+          static void GC_mark_wxMenu(void *ptr) 
           {
-            if ( GC_IsWindowDeleted(ptr) )
-              return;
+            WXRUBY_TRACE_IF(WxRubyTraceMarkMenu, 2)
+              WXRUBY_TRACE("> GC_mark_wxMenu : " << ptr)
+            WXRUBY_TRACE_END
         
-            wxMenu* menu = (wxMenu*)ptr;
-            wxMenuItemList menu_items = menu->GetMenuItems();
-            wxMenuItemList::iterator iter;
-            for (iter = menu_items.begin(); iter != menu_items.end(); ++iter)
+            VALUE rb_menu = SWIG_RubyInstanceFor(ptr);
+            if (!RB_NIL_P(rb_menu))
+            {
+              // as long as the dfree function is still the managed free function the menu has not been attached to a menu bar
+              // but it may hay have already had submenus and/or menuitems added which need to be marked
+              if (RDATA(rb_menu)->dfree == free_wxMenu)
               {
-                wxMenuItem *item = *iter;
-                rb_gc_mark( SWIG_RubyInstanceFor(item) ); 
-                wxMenu* sub_menu = item->GetSubMenu();
-                if ( sub_menu)
-                  rb_gc_mark( SWIG_RubyInstanceFor(sub_menu) );
+                wxMenu* wx_menu = static_cast<wxMenu*> (ptr);
+          
+                wxMenuItemList wx_menu_items = wx_menu->GetMenuItems();
+                wxMenuItemList::iterator iter;
+                for (iter = wx_menu_items.begin(); iter != wx_menu_items.end(); ++iter)
+                {
+                  wxMenuItem *wx_item = *iter;
+                  rb_gc_mark( SWIG_RubyInstanceFor(wx_item) ); 
+                  wxMenu* wx_sub_menu = wx_item->GetSubMenu();
+                  if (wx_sub_menu)
+                    GC_mark_attached_wxMenu(wx_sub_menu);
+                }
               }
-            return;
+              else // otherwise the menu has been attached to a menu bar and may already have been deleted (or not)
+              {    // marking in this case will be left to the menu bar
+                WXRUBY_TRACE_IF(WxRubyTraceMarkMenu, 3)
+                  WXRUBY_TRACE("< GC_mark_wxMenu : skipping attached menu")
+                WXRUBY_TRACE_END
+              }
+            }
+            else
+            {
+              WXRUBY_TRACE_IF(WxRubyTraceMarkMenu, 3)
+                WXRUBY_TRACE("< GC_mark_wxMenu : skipping untracked menu (should not have happened)")
+              WXRUBY_TRACE_END
+            } 
+          
+            WXRUBY_TRACE_IF(WxRubyTraceMarkMenu, 2)
+              WXRUBY_TRACE("< GC_mark_wxMenu : " << ptr)
+            WXRUBY_TRACE_END
           }
         __HEREDOC
         spec.add_swig_code <<~__HEREDOC
-          %markfunc wxMenu "mark_wxMenu";
+          %markfunc wxMenu "GC_mark_wxMenu";
         __HEREDOC
         # ignore MSW specific method
         spec.ignore 'wxMenu::MSWCommand'