wxruby3 1.6.1 → 1.7.0

data/rakelib/lib/director/menu_bar.rb

@@ -16,6 +16,7 @@ module WXRuby3
 
       def setup
         super
+        spec.gc_as_object # not a typical window
         spec.no_proxy('wxMenuBar::FindItem',
                 'wxMenuBar::Remove',
                 'wxMenuBar::Replace')
@@ -23,6 +24,8 @@ module WXRuby3
                 'wxMenuBar::GetLabelTop',
                 'wxMenuBar::SetLabelTop',
                 'wxMenuBar::Refresh')
+        spec.disown 'wxMenu *'
+        spec.new_object 'wxMenuBar::Remove', 'wxMenuBar::Replace'
         # for FindItem
         spec.map 'wxMenu **' => 'Wx::Menu' do
           map_in ignore: true, temp: 'wxMenu *tmp', code: '$1 = &tmp;'
@@ -31,6 +34,65 @@ module WXRuby3
             $result = SWIG_Ruby_AppendOutput($result, SWIG_NewPointerObj(ptr, SWIGTYPE_p_wxMenu, 0));
             __CODE
         end
+        spec.add_header_code <<~__HEREDOC
+          WXRUBY_TRACE_GUARD(WxRubyTraceMarkMenubar, "GC_MARK_MENUBAR")
+
+          // forward decl
+          SWIGINTERN void free_wxMenuBar(void *self);
+
+          // Mark Function for unattached menu bars
+          // Need to protect Menu and MenuItems which are included in the MenuBar
+          static void GC_mark_wxMenuBar(void *ptr) 
+          {
+            WXRUBY_TRACE_IF(WxRubyTraceMarkMenubar, 2)
+              WXRUBY_TRACE("> GC_mark_wxMenuBar : " << ptr)
+            WXRUBY_TRACE_END
+          
+            VALUE rb_menu_bar = SWIG_RubyInstanceFor(ptr);
+            if (!RB_NIL_P(rb_menu_bar))
+            {
+              // as long as the dfree function is still the managed free function the menubar has not been attached to a window
+              // but it may hay have already had menus and/or menuitems added which need to be marked
+              if (RDATA(rb_menu_bar)->dfree == free_wxMenuBar)
+              {
+                // Menu bars are also a subclass of wxWindow, so must do all the marking
+                // of sizers and carets associated with that class
+                GC_mark_wxWindow(ptr);
+
+                wxMenuBar* wx_menu_bar = static_cast<wxMenuBar*> (ptr);
+          
+                WXRUBY_TRACE_IF(WxRubyTraceMarkMenubar, 3)
+                  WXRUBY_TRACE("< GC_mark_wxMenuBar : marking " << wx_menu_bar->GetMenuCount() << " menus")
+                WXRUBY_TRACE_END
+            
+                // Mark each menu in the menubar in turn
+                for ( size_t i = 0; i < wx_menu_bar->GetMenuCount(); i++ )
+                {
+                  GC_mark_attached_wxMenu(wx_menu_bar->GetMenu(i));
+                }
+              }
+              else // otherwise the menu bar has been attached to a frame and may already have been deleted (or not)
+              {    // marking in this case will be left to the frame
+                WXRUBY_TRACE_IF(WxRubyTraceMarkMenubar, 3)
+                  WXRUBY_TRACE("< GC_mark_wxMenuBar : skipping attached menu bar")
+                WXRUBY_TRACE_END
+              }
+            }
+            else
+            {
+              WXRUBY_TRACE_IF(WxRubyTraceMarkMenubar, 3)
+                WXRUBY_TRACE("< GC_mark_wxMenuBar : skipping untracked menu bar (should not have happened)")
+              WXRUBY_TRACE_END
+            } 
+          
+            WXRUBY_TRACE_IF(WxRubyTraceMarkMenubar, 2)
+              WXRUBY_TRACE("< GC_mark_wxMenuBar : " << ptr)
+            WXRUBY_TRACE_END
+          }
+        __HEREDOC
+        spec.add_swig_code <<~__HEREDOC
+          %markfunc wxMenu "GC_mark_wxMenuBar";
+        __HEREDOC
       end
     end # class MenuBar
 

data/rakelib/lib/director/menu_item.rb

@@ -17,12 +17,18 @@ module WXRuby3
         # (which seems acceptable as there is no use for menu items otherwise)
         # if not the C++ item will never be deleted before the process terminates
         # (but this goes for all object marked for GC_NEVER).
+        # this keeps things MUCH simpler while adding a (slight?) risk of minor
+        # (non-destructive) memory leaks
         spec.gc_never
+        spec.disable_proxies # no reason to derive
         spec.ignore(%w[wxMenuItem::GetLabel wxMenuItem::GetName wxMenuItem::GetText wxMenuItem::SetText wxMenuItem::GetLabelFromText])
+        # Replace for more specific param naming
+        spec.ignore 'wxMenuItem::SetSubMenu(wxMenu *)', ignore_doc: false
+        spec.extend_interface 'wxMenuItem', 'void SetSubMenu(wxMenu *sub_menu)'
+        spec.disown 'wxMenu *sub_menu'
         # ignore this as there is no implementation anymore
         spec.ignore 'wxMenuItem::GetAccelFromString'
         spec.ignore_unless('USE_ACCEL', 'wxMenuItem::GetAccel')
-        spec.no_proxy 'wxMenuItem::GetAccel'
         spec.ignore 'wxMenuItem::GetBitmap(bool)' # not portable
         if Config.instance.wx_version_check('3.2.4') > 0
           spec.ignore_unless('WXMSW', 'wxMenuItem::SetBackgroundColour','wxMenuItem::SetFont','wxMenuItem::SetTextColour')

data/rakelib/lib/director/num_validator.rb

@@ -54,7 +54,16 @@ module WXRuby3
             {}
             virtual ~WXIntegerValidator() 
             {
+              // 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
@@ -163,7 +172,16 @@ module WXRuby3
             {}
             virtual ~WXUnsignedValidator() 
             {
+              // 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
@@ -272,7 +290,16 @@ module WXRuby3
             {}
             virtual ~WXFloatValidator() 
             {
+              // 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/numeric_property_validator.rb

@@ -34,7 +34,16 @@ module WXRuby3
             }
             virtual ~WXRubyNumericPropertyValidator() 
             {
+              // 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/popup_window.rb

@@ -35,6 +35,8 @@ module WXRuby3
         # for upcalls
         spec.extend_interface('wxPopupWindow',
                               'virtual bool Show(bool show = true) override')
+        spec.extend_interface('wxPopupTransientWindow',
+                              'virtual bool Destroy() override')
         # For ProcessLeftDown
         spec.map 'wxMouseEvent &' => 'Wx::MouseEvent' do
           map_directorin code: <<~__CODE

data/rakelib/lib/director/preview_frame.rb

@@ -31,7 +31,8 @@ module WXRuby3
                                const wxString& name = wxASCII_STR(wxFrameNameStr))
               : wxPreviewFrame(preview, parent, title, pos, size, style, name)
             {}
-            virtual ~WxRubyPreviewFrame() {}
+            virtual ~WxRubyPreviewFrame() 
+            {}
 
             const wxPrintPreview* get_print_preview() const 
             {
@@ -39,20 +40,42 @@ module WXRuby3
             }
           };
 
+          WXRUBY_TRACE_GUARD(WxRubyTraceGCMarkPreviewFrame, "GC_MARK_PRINT_PREVIEW_FRAME")
+
+          void WxRuby_mark_wxPrintPreview(void* ptr);
+
           static void GC_mark_wxPreviewFrame(void *ptr)
           {
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkPreviewFrame, 2)
+              WXRUBY_TRACE("> GC_mark_wxPreviewFrame : " << ptr)
+            WXRUBY_TRACE_END
+
             if ( GC_IsWindowDeleted(ptr) )
               return;
         
-            // Do standard marking routines as for all wxWindows
-            GC_mark_wxWindow(ptr);
+            // Do standard marking routines as for all wxFrames
+            GC_mark_wxFrame(ptr);
 
             WxRubyPreviewFrame* preview_frame = dynamic_cast<WxRubyPreviewFrame*>((wxPreviewFrame*)ptr);
             if (preview_frame)
             {
-              const void* ptr = (const void*)preview_frame->get_print_preview();
-              rb_gc_mark(SWIG_RubyInstanceFor(const_cast<void*> (ptr)));              
+              const wxPrintPreview* wx_prtprev = preview_frame->get_print_preview();
+              VALUE rb_prtprev = SWIG_RubyInstanceFor(const_cast<void*> ((const void*)wx_prtprev));
+
+              WXRUBY_TRACE_IF(WxRubyTraceGCMarkPreviewFrame, 3)
+                WXRUBY_TRACE("| GC_mark_wxPreviewFrame : marking print preview " << wx_prtprev << " -> " << rb_prtprev);
+              WXRUBY_TRACE_END
+
+              // mark the Ruby wrapper instance
+              // this will skip marking the members as any preview attached to a preview frame is disowned 
+              rb_gc_mark(rb_prtprev); 
+              // so, force marking the preview members 
+              WxRuby_mark_wxPrintPreview(const_cast<void*> ((const void*)wx_prtprev));               
             }
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkPreviewFrame, 2)
+              WXRUBY_TRACE("< GC_mark_wxPreviewFrame : " << ptr)
+            WXRUBY_TRACE_END
           }
         __HEREDOC
         spec.use_class_implementation 'wxPreviewFrame', 'WxRubyPreviewFrame'
@@ -62,7 +85,7 @@ module WXRuby3
         # in all cases will be the actual base being used.
         spec.ignore 'wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *, wxWindow *,const wxString &,const wxPoint &,const wxSize &,long,const wxString &)', ignore_doc: false
         spec.extend_interface('wxPreviewFrame',
-            'wxPreviewFrame(wxPrintPreview *preview, wxWindow *parent, const wxString &title="Print Preview", const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE, const wxString &name=wxFrameNameStr)')
+            'wxPreviewFrame(wxPrintPreview *preview, wxWindow *parent, const wxString &title="Print Preview", const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE | wxFRAME_FLOAT_ON_PARENT, const wxString &name=wxFrameNameStr)')
         # non-functional map for doc gen
         spec.map 'wxPrintPreviewBase *' => 'Wx::PrintPreview', swig: false do
           map_in

data/rakelib/lib/director/printer.rb

@@ -31,16 +31,70 @@ module WXRuby3
         spec.new_object 'wxPrinter::GetPrintDialogData'
         spec.disown 'wxPrintout *' # Printout-s passed to PrintPreview will be managed by wxWidgets
         spec.add_header_code <<~__HEREDOC
-          static void GC_mark_wxPrintPreview(void *ptr)
-          {
+          WXRUBY_TRACE_GUARD(WxRubyTraceGCMarkPrintPreview, "GC_MARK_PRINT_PREVIEW")
+
+          // forward decl
+          SWIGINTERN void free_wxPrintPreview(void *self); 
+
+          // this is the actual print preview marker which is called for Ruby owned instances from the
+          // Ruby standard marker and by the container preview frame for disowned instances 
+          void WxRuby_mark_wxPrintPreview(void* ptr)
+          {   
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkPrintPreview, 2)
+              WXRUBY_TRACE("> WxRuby_mark_wxPrintPreview : " << ptr)
+            WXRUBY_TRACE_END
+
             if (ptr)
             {
               wxPrintPreview* print_preview = (wxPrintPreview*)ptr;
               wxPrintout* printout = print_preview->GetPrintout();
-              rb_gc_mark( SWIG_RubyInstanceFor(printout) );
-              wxPrintout* printout_for_printing = print_preview->GetPrintoutForPrinting();
-              rb_gc_mark( SWIG_RubyInstanceFor(printout_for_printing) );
+              VALUE rb_prtout = SWIG_RubyInstanceFor(printout);
+ 
+              WXRUBY_TRACE_IF(WxRubyTraceGCMarkPrintPreview, 3)
+                WXRUBY_TRACE("| WxRuby_mark_wxPrintPreview : marking preview printout " << printout << " -> " << rb_prtout);
+              WXRUBY_TRACE_END
+
+              rb_gc_mark(rb_prtout);
+
+              printout = print_preview->GetPrintoutForPrinting();
+              rb_prtout = SWIG_RubyInstanceFor(printout); 
+
+              WXRUBY_TRACE_IF(WxRubyTraceGCMarkPrintPreview, 3)
+                WXRUBY_TRACE("| WxRuby_mark_wxPrintPreview : marking printing printout " << printout << " -> " << rb_prtout);
+              WXRUBY_TRACE_END
+
+              rb_gc_mark(rb_prtout);
             }
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkPrintPreview, 2)
+              WXRUBY_TRACE("< WxRuby_mark_wxPrintPreview : " << ptr)
+            WXRUBY_TRACE_END
+          }
+
+          // this is the Ruby standard marker called by the Ruby GC mark phase
+          // for Ruby instances visible to Ruby
+          static void GC_mark_wxPrintPreview(void *ptr)
+          {
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkPrintPreview, 2)
+              WXRUBY_TRACE("> GC_mark_wxPrintPreview : " << ptr)
+            WXRUBY_TRACE_END
+
+            VALUE rb_pp = SWIG_RubyInstanceFor(ptr);
+            // if this is still an instance 'owned' by Ruby
+            if (!RB_NIL_P(rb_pp) && RDATA(rb_pp)->dfree==free_wxPrintPreview)
+            {
+              WxRuby_mark_wxPrintPreview(ptr);
+            } 
+            else
+            {
+              WXRUBY_TRACE_IF(WxRubyTraceGCMarkPrintPreview, 3)
+                WXRUBY_TRACE("| GC_mark_wxPrintPreview : skip marking disowned instance")
+              WXRUBY_TRACE_END
+            } 
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCMarkPrintPreview, 2)
+              WXRUBY_TRACE("< GC_mark_wxPrintPreview : " << ptr)
+            WXRUBY_TRACE_END
           }
           __HEREDOC
         spec.add_swig_code '%markfunc wxPrintPreview "GC_mark_wxPrintPreview";'

data/rakelib/lib/director/property_grid.rb

@@ -74,12 +74,16 @@ module WXRuby3
         spec.include_mixin 'wxPropertyGrid', 'Wx::PG::PropertyGridInterface'
         # customize mark function
         spec.add_header_code <<~__HEREDOC
+          extern bool WXRuby_Is_In_GC_mark_wxPropertyGridManager();
+
+          WXRUBY_TRACE_GUARD(WxRubyTraceMarkPropGrid, "GC_MARK_PROPGRID_GRID")
+
           static void GC_mark_wxPropertyGrid(void* ptr) 
           {
-          #ifdef __WXRB_DEBUG__
-            if (wxRuby_TraceLevel()>1)
-              std::wcout << "> GC_mark_wxPropertyGrid : " << ptr << std::endl;
-          #endif
+            WXRUBY_TRACE_IF(WxRubyTraceMarkPropGrid, 2)
+              WXRUBY_TRACE("> GC_mark_wxPropertyGrid : " << ptr)
+            WXRUBY_TRACE_END
+
             if ( GC_IsWindowDeleted(ptr) )
             {
               return;
@@ -87,38 +91,53 @@ module WXRuby3
             // Do standard marking routines as for all wxWindows
             GC_mark_wxWindow(ptr);
             
+            // no need to mark properties if called from GC_mark_wxPropertyGridManager
+            // as that will mark properties through the property grid pages
+            if (WXRuby_Is_In_GC_mark_wxPropertyGridManager())
+              return;
+
+          #ifdef __WXRB_DEBUG__
+            long l = 0, n = 0;
+          #endif
             wxPropertyGrid* wx_pg = (wxPropertyGrid*) ptr;
 
+            VALUE rb_root_prop = SWIG_RubyInstanceFor(wx_pg->GetRoot());
+            if (!NIL_P(rb_root_prop))
+            {
+              rb_gc_mark(rb_root_prop);
+          #ifdef __WXRB_DEBUG__
+              ++n;
+          #endif
+            }
             // mark all properties
             wxPGVIterator it =
                 wx_pg->GetVIterator(wxPG_ITERATOR_FLAGS_ALL | wxPG_IT_CHILDREN(wxPG_ITERATOR_FLAGS_ALL));
             // iterate all
             for ( ; !it.AtEnd(); it.Next() )
             {
-              wxPGProperty* p = it.GetProperty();
-              VALUE rb_p = SWIG_RubyInstanceFor(p);
-              if (NIL_P(rb_p))
-              {
-                VALUE object = (VALUE) p->GetClientData();
-                if ( object && !NIL_P(object))
-                {
           #ifdef __WXRB_DEBUG__
-                  if (wxRuby_TraceLevel()>2)
-                    std::wcout << "*** marking property data " << p << ":" << p->GetName() << std::endl;
+              ++l;
           #endif
-                  rb_gc_mark(object);
-                }
-              }
-              else
+              wxPGProperty* wx_p = it.GetProperty();
+              VALUE rb_prop = SWIG_RubyInstanceFor(wx_p);
+              if (!RB_NIL_P(rb_prop)) 
               {
-                rb_gc_mark(rb_p);
+                rb_gc_mark(rb_prop);
+          #ifdef __WXRB_DEBUG__
+                ++n;
+          #endif
               }
             }
+
+            WXRUBY_TRACE_IF(WxRubyTraceMarkPropGrid, 2)
+              WXRUBY_TRACE("< GC_mark_wxPropertyGrid : iterated " << l << " properties; marked " << n )
+            WXRUBY_TRACE_END
           }
           __HEREDOC
         spec.add_swig_code '%markfunc wxPropertyGrid "GC_mark_wxPropertyGrid";'
         # missing from XML docs
         spec.extend_interface 'wxPropertyGrid',
+                              'virtual bool Destroy()',
                               'wxPoint GetGoodEditorDialogPosition(wxPGProperty* p, const wxSize& sz)',
                               'wxWindow* GetPrimaryEditor() const',
                               'wxWindow* GetEditorControlSecondary() const',

data/rakelib/lib/director/property_grid_interface.rb

@@ -45,10 +45,12 @@ module WXRuby3
         end
         spec.ignore_unless 'USE_DATETIME', 'wxPropertyGridInterface::GetPropertyValueAsDateTime'
         spec.ignore_unless 'USE_VALIDATORS', 'wxPropertyGridInterface::GetPropertyValidator'
-        # fix incorrect XML documentation
-        spec.ignore 'wxPropertyGridInterface::SetPropertyImage', ignore_doc: false # ignore non-const BitmapBundle arg decl
-        # and add correct decl
-        spec.extend_interface 'wxPropertyGridInterface', 'void SetPropertyImage(wxPGPropArg id, const wxBitmapBundle &bmp)'
+        if Config.instance.wx_version_check('3.3.1') <= 0
+          # fix incorrect XML documentation
+          spec.ignore 'wxPropertyGridInterface::SetPropertyImage', ignore_doc: false # ignore non-const BitmapBundle arg decl
+          # and add correct decl
+          spec.extend_interface 'wxPropertyGridInterface', 'void SetPropertyImage(wxPGPropArg id, const wxBitmapBundle &bmp)'
+        end
         # don't expose property grid iterators; add a more Ruby-like extension
         spec.ignore 'wxPropertyGridInterface::GetIterator', 'wxPropertyGridInterface::GetVIterator'
         # add basic property enumerator; will wrap this in pure Ruby still for improved argument handling
@@ -63,7 +65,7 @@ module WXRuby3
               while (!prop_it.AtEnd())
               {
                 wxPGProperty* pp = prop_it.GetProperty();
-                VALUE rb_prop = SWIG_NewPointerObj(SWIG_as_voidptr(pp), SWIGTYPE_p_wxPGProperty, 0);
+                VALUE rb_prop = wxRuby_WrapWxPGPropertyInRuby(pp);
                 rc = rb_yield(rb_prop);
                 prop_it.Next();
               }
@@ -101,7 +103,7 @@ module WXRuby3
               while (!prop_it.AtEnd())
               {
                 wxPGProperty* pp = prop_it.GetProperty();
-                VALUE rb_prop = SWIG_NewPointerObj(SWIG_as_voidptr(pp), SWIGTYPE_p_wxPGProperty, 0);
+                VALUE rb_prop = wxRuby_WrapWxPGPropertyInRuby(pp);
                 rc = rb_yield(rb_prop);
                 reverse ? prop_it.Prev() : prop_it.Next();
               }
@@ -137,7 +139,7 @@ module WXRuby3
             for (size_t i = 0; i < $1->GetCount(); i++)
             {
               wxPGProperty* pp = $1->Item(i);
-              VALUE rb_pp = SWIG_NewPointerObj(SWIG_as_voidptr(pp), SWIGTYPE_p_wxPGProperty, 0);
+              VALUE rb_pp = wxRuby_WrapWxPGPropertyInRuby(pp);
               rb_ary_push($result, rb_pp);
             }
             __CODE
@@ -149,7 +151,7 @@ module WXRuby3
             for (size_t i = 0; i < $1->GetCount(); i++)
             {
               wxPGProperty* pp = $1->Item(i);
-              VALUE rb_pp = SWIG_NewPointerObj(SWIG_as_voidptr(pp), SWIGTYPE_p_wxPGProperty, 0);
+              VALUE rb_pp = wxRuby_WrapWxPGPropertyInRuby(pp);
               rb_ary_push($result, rb_pp);
             }
             __CODE

data/rakelib/lib/director/property_grid_manager.rb

@@ -19,6 +19,57 @@ module WXRuby3
       def setup
         super
         spec.override_inheritance_chain('wxPropertyGridManager', %w[wxPanel wxWindow wxEvtHandler wxObject])
+        # need a custom implementation to handle cleaning up tracked objects
+        spec.add_header_code <<~__HEREDOC
+          WXRUBY_EXPORT void GC_SetWindowDeleted(void *ptr);
+
+          class WXRubyPropertyGridManager : public wxPropertyGridManager
+          {
+          public:
+            WXRubyPropertyGridManager() : wxPropertyGridManager() {}
+            WXRubyPropertyGridManager( wxWindow *parent, wxWindowID id = wxID_ANY,
+                           const wxPoint& pos = wxDefaultPosition,
+                           const wxSize& size = wxDefaultSize,
+                           long style = wxPGMAN_DEFAULT_STYLE,
+                           const wxString& name = wxASCII_STR(wxPropertyGridManagerNameStr) )
+              : wxPropertyGridManager(parent, id, pos, size, style, name) {}
+
+            virtual ~WXRubyPropertyGridManager() 
+            {
+              // as the grid will not be deleted by calling Destroy() but
+              // rather by deleting directly handle GC cleanup here 
+              GC_SetWindowDeleted(m_pPropGrid);
+              // also cleanup all page and property instances that will
+              // be deleted by wxPropertyGridManager
+              for( wxPropertyGridPage* page : m_arrPages )
+              {
+                // clean up tracking of all tracked properties
+                wxPGProperty* wx_p = page->GetRoot();
+                if (!NIL_P(SWIG_RubyInstanceFor(wx_p)))
+                {
+                  SWIG_RubyUnlinkObjects(wx_p);
+                  SWIG_RubyRemoveTracking(wx_p);
+                }
+                wxPGVIterator it =
+                    page->GetVIterator(wxPG_ITERATOR_FLAGS_ALL | wxPG_IT_CHILDREN(wxPG_ITERATOR_FLAGS_ALL));
+                // iterate all
+                for ( ; !it.AtEnd(); it.Next() )
+                {
+                  wx_p = it.GetProperty();
+                  if (!RB_NIL_P(SWIG_RubyInstanceFor(wx_p))) 
+                  { 
+                    SWIG_RubyUnlinkObjects(wx_p);
+                    SWIG_RubyRemoveTracking(wx_p);
+                  }
+                }
+                // Disassociate the C++ and Ruby pages (if any association)
+                SWIG_RubyUnlinkObjects(page);
+                SWIG_RubyRemoveTracking(page);
+              }
+            }               
+          };
+          __HEREDOC
+        spec.use_class_implementation 'wxPropertyGridManager', 'WXRubyPropertyGridManager'
         spec.add_swig_code 'typedef const wxPGPropArgCls& wxPGPropArg;'
         # mixin PropertyGridInterface
         spec.include_mixin 'wxPropertyGridManager', 'Wx::PG::PropertyGridInterface'
@@ -29,12 +80,28 @@ module WXRuby3
         spec.ignore 'wxPropertyGridManager::GetVIterator'
         # customize mark function
         spec.add_header_code <<~__HEREDOC
+          WXRUBY_TRACE_GUARD(WxRubyTraceMarkPropGridMgr, "GC_MARK_PROPGRID_MGR")
+
+          static bool __wxr_In_GC_mark_wxPropertyGridManager = false;
+
+          extern void WXRuby_Set_In_GC_mark_wxPropertyGridManager(bool f)
+          {
+            __wxr_In_GC_mark_wxPropertyGridManager = f;
+          }
+
+          extern bool WXRuby_Is_In_GC_mark_wxPropertyGridManager()
+          {
+            return __wxr_In_GC_mark_wxPropertyGridManager;
+          }
+
+          extern void WXRuby_GC_mark_wxPropertyGridPage(wxPropertyGridPage* wx_pgp);
+
           static void GC_mark_wxPropertyGridManager(void* ptr) 
           {
-          #ifdef __WXRB_DEBUG__
-            if (wxRuby_TraceLevel()>1)
-              std::wcout << "> GC_mark_wxPropertyGridManager : " << ptr << std::endl;
-          #endif
+            WXRUBY_TRACE_IF(WxRubyTraceMarkPropGridMgr, 2)
+              WXRUBY_TRACE("> GC_mark_wxPropertyGridManager : " << ptr)
+            WXRUBY_TRACE_END
+
             if ( GC_IsWindowDeleted(ptr) )
             {
               return;
@@ -42,46 +109,39 @@ module WXRuby3
             // Do standard marking routines as for all wxWindows
             GC_mark_wxWindow(ptr);
             
-            wxPropertyGridManager* wx_pg = (wxPropertyGridManager*) ptr;
+            WXRuby_Set_In_GC_mark_wxPropertyGridManager(true);
+
+            wxPropertyGridManager* wx_pgm = (wxPropertyGridManager*) ptr;
 
-            // mark all properties of all pages
-          #ifdef __WXRB_DEBUG__
-            long l = 0;
-          #endif
-            for (size_t i=0; i < wx_pg->GetPageCount() ;++i)
+            // mark the property grid
+            wxPropertyGrid* wx_pg = wx_pgm->GetGrid();
+            VALUE rb_pg = SWIG_RubyInstanceFor(wx_pg);
+            if (!NIL_P(rb_pg))
             {
-              wxPGVIterator it =
-                  wx_pg->GetPage(i)->GetVIterator(wxPG_ITERATOR_FLAGS_ALL | wxPG_IT_CHILDREN(wxPG_ITERATOR_FLAGS_ALL));
-              // iterate all
-              for ( ; !it.AtEnd(); it.Next() )
+              rb_gc_mark(rb_pg);   
+            }
+
+            // mark all properties of all pages 
+            for (size_t i=0; i < wx_pgm->GetPageCount() ;++i)
+            {
+              wxPropertyGridPage* wx_pgp = wx_pgm->GetPage(i);
+              // check if this page is wrapped in Ruby
+              VALUE rb_pgp = SWIG_RubyInstanceFor(wx_pgp);
+              if (NIL_P(rb_pgp))    // if not just iterate and mark it's properties
               {
-          #ifdef __WXRB_DEBUG__
-                ++l;
-          #endif
-                wxPGProperty* p = it.GetProperty();
-                VALUE rb_p = SWIG_RubyInstanceFor(p);
-                if (NIL_P(rb_p))
-                {
-                  VALUE object = (VALUE) p->GetClientData();
-                  if ( object && !NIL_P(object))
-                  {
-          #ifdef __WXRB_DEBUG__
-                    if (wxRuby_TraceLevel()>2)
-                      std::wcout << "*** marking property data " << p << ":" << p->GetName() << std::endl;
-          #endif
-                    rb_gc_mark(object);
-                  }
-                }
-                else
-                {
-                  rb_gc_mark(rb_p);
-                }
+                WXRuby_GC_mark_wxPropertyGridPage(wx_pgp);
+              }
+              else  // but a tracked Ruby page instance we can simply mark and it will mark it's properties itself 
+              {
+                rb_gc_mark(rb_pgp);
               }
             }
-          #ifdef __WXRB_DEBUG__
-            if (wxRuby_TraceLevel()>1)
-              std::wcout << "*** iterated " << l << " properties" << std::endl;
-          #endif
+
+            WXRuby_Set_In_GC_mark_wxPropertyGridManager(false);
+
+            WXRUBY_TRACE_IF(WxRubyTraceMarkPropGridMgr, 2)
+              WXRUBY_TRACE(" GC_mark_wxPropertyGridManager : " << ptr)
+            WXRUBY_TRACE_END
           }
         __HEREDOC
         spec.add_swig_code '%markfunc wxPropertyGridManager "GC_mark_wxPropertyGridManager";'