wxruby3 1.6.1 → 1.7.0

data/ext/wxruby3/swig/custom/swiglabels.swg

@@ -0,0 +1,129 @@
+/* -----------------------------------------------------------------------------
+ *  This section contains generic SWIG labels for method/variable
+ *  declarations/attributes, and other compiler dependent labels.
+ * ----------------------------------------------------------------------------- */
+
+/* template workaround for compilers that cannot correctly implement the C++ standard */
+#ifndef SWIGTEMPLATEDISAMBIGUATOR
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# else
+#  define SWIGTEMPLATEDISAMBIGUATOR
+# endif
+#endif
+
+/* inline attribute */
+#ifndef SWIGINLINE
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+#   define SWIGINLINE inline
+# else
+#   define SWIGINLINE
+# endif
+#endif
+
+/* attribute recognised by some compilers to avoid 'unused' warnings */
+#ifndef SWIGUNUSED
+# if defined(__GNUC__)
+#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#     define SWIGUNUSED __attribute__ ((__unused__))
+#   else
+#     define SWIGUNUSED
+#   endif
+# elif defined(__ICC)
+#   define SWIGUNUSED __attribute__ ((__unused__))
+# else
+#   define SWIGUNUSED
+# endif
+#endif
+
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif
+#endif
+
+#ifndef SWIGUNUSEDPARM
+# ifdef __cplusplus
+#   define SWIGUNUSEDPARM(p)
+# else
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
+# endif
+#endif
+
+/* internal SWIG method */
+#ifndef SWIGINTERN
+# define SWIGINTERN static SWIGUNUSED
+#endif
+
+/* internal inline SWIG method */
+#ifndef SWIGINTERNINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+#endif
+
+/* exporting methods */
+#if defined(__GNUC__)
+#  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#    ifndef GCC_HASCLASSVISIBILITY
+#      define GCC_HASCLASSVISIBILITY
+#    endif
+#  endif
+#endif
+
+#ifndef SWIGEXPORT
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   if defined(STATIC_LINKED)
+#     define SWIGEXPORT
+#   else
+#     define SWIGEXPORT __declspec(dllexport)
+#   endif
+# else
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#   else
+#     define SWIGEXPORT
+#   endif
+# endif
+#endif
+
+/* calling conventions for Windows */
+#ifndef SWIGSTDCALL
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   define SWIGSTDCALL __stdcall
+# else
+#   define SWIGSTDCALL
+# endif
+#endif
+
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
+#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
+# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#endif
+
+/* Intel's compiler complains if a variable which was never initialised is
+ * cast to void, which is a common idiom which we use to indicate that we
+ * are aware a variable isn't used.  So we just silence that warning.
+ * See: https://github.com/swig/swig/issues/192 for more discussion.
+ */
+#ifdef __INTEL_COMPILER
+# pragma warning disable 592
+#endif
+
+#if defined(__cplusplus) && __cplusplus >=201103L
+# define SWIG_NOEXCEPT noexcept
+#else
+# define SWIG_NOEXCEPT throw()
+#endif 

data/ext/wxruby3/swig/custom/swigrun.swg

@@ -12,7 +12,11 @@
 
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
+#if SWIG_VERSION < 0x040400
 #define SWIG_RUNTIME_VERSION "4"
+#else
+#define SWIG_RUNTIME_VERSION "5"
+#endif
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -213,7 +217,11 @@ typedef struct WXRUBY_EXPORT swig_cast_info
   swig_type_info         *type;			/* pointer to type that is equivalent to this type */
   swig_converter_func     converter;		/* function to cast the void pointers */
   struct swig_cast_info  *next;			/* pointer to next cast in linked list */
+#if SWIG_VERSION < 0x040400
   struct swig_cast_info  *prev;			/* pointer to the previous cast */
+#else
+  unsigned int            value;		/* index of the last valid element in the array | typename hash value */
+#endif
 } swig_cast_info;
 
 /* Structure used to store module information
@@ -256,6 +264,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
   return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
+#if SWIG_VERSION >= 0x040400
+/*
+ * Hash function for type name strings, based on maRushPrime1Hash (http://amsoftware.narod.ru/algo2.html)
+ */
+WXRUBY_EXPORT unsigned int SWIG_Hash(const char *str, unsigned int len);
+#endif
+
 /*
   Check the typename
 */

data/ext/wxruby3/swig/custom/typemaps/swigtypemaps.swg

@@ -126,6 +126,14 @@
 #endif
 #endif
 
+#if SWIG_VERSION >= 0x040400
+/*==== clear errors ====*/
+
+#ifndef %error_clear
+#define %error_clear
+#endif
+#endif
+
 /*==== director output exception ====*/
 
 /* wxRuby : make sure to pass the object and method that caused the failure */
@@ -143,15 +151,27 @@
 #define %error_block(Block...)                 %block(Block)
 #define %default_code(code)                    SWIG_ArgError(code)  
 #define %argument_fail(code, type, name, argn) SWIG_exception_fail(%default_code(code), %argfail_fmt(type, name, argn))
+#if SWIG_VERSION < 0x040400
 #define %argument_nullref(type, name, argn)    SWIG_exception_fail(SWIG_ValueError, %argnullref_fmt(type, name, argn))
+#else
+#define %argument_nullref(type, name, argn)    SWIG_exception_fail(SWIG_NullReferenceError, %argnullref_fmt(type, name, argn))
+#endif
 #define %variable_fail(code, type, name)       SWIG_exception_fail(%default_code(code), %varfail_fmt(type, name))
+#if SWIG_VERSION < 0x040400
 #define %variable_nullref(type, name)          SWIG_exception_fail(SWIG_ValueError, %varnullref_fmt(type, name))
+#else
+#define %variable_nullref(type, name)          SWIG_exception_fail(SWIG_NullReferenceError, %varnullref_fmt(type, name))
+#endif
 #define %releasenotowned_fail(code, type, name, argn) SWIG_exception_fail(%default_code(code), %releasenotownedfail_fmt(type, name, argn))
 
 /* wxRuby : make sure to pass the object and method that caused the failure */
 #if defined(SWIG_DIRECTOR_TYPEMAPS)
 #define %dirout_fail(code, type)          SWIG_DirOutFail(swig_get_self(), "$symname", %default_code(code), %outfail_fmt(type))
+#if SWIG_VERSION < 0x040400
 #define %dirout_nullref(type)             SWIG_DirOutFail(swig_get_self(), "$symname", SWIG_ValueError, %outnullref_fmt(type))
+#else
+#define %dirout_nullref(type)             SWIG_DirOutFail(swig_get_self(), "$symname", SWIG_NullReferenceError, %outnullref_fmt(type))
+#endif
 #endif
 
 /* -----------------------------------------------------------------------------

data/ext/wxruby3/swig/mark_free_impl.i

@@ -16,12 +16,31 @@
 %}
 
 %{
+WXRUBY_TRACE_GUARD(WxRubyTraceMarkSizer, "GC_MARK_SIZER")
+WXRUBY_TRACE_GUARD(WxRubyTraceFreeSizer, "GC_FREE_SIZER")
+WXRUBY_TRACE_GUARD(WxRubyTraceMarkMenubar, "GC_MARK_MENUBAR")
+WXRUBY_TRACE_GUARD(WxRubyTraceMarkMenu, "GC_MARK_MENU")
+WXRUBY_TRACE_GUARD(WxRubyTraceMarkWindow, "GC_MARK_WINDOW")
+WXRUBY_TRACE_GUARD(WxRubyTraceFreeWindow, "GC_FREE_WINDOW")
+WXRUBY_TRACE_GUARD(WxRubyTraceMarkFrame, "GC_MARK_FRAME")
+WXRUBY_TRACE_GUARD(WxRubyTraceFreeNull, "GC_FREE_NULL")
+WXRUBY_TRACE_GUARD(WxRubyTraceFreeRefcounted, "GC_FREE_REFCOUNT")
+
+
 // Code to be run when the ruby object is swept by GC - this only
 // unlinks the C++ object from the ruby VALUE but doesn't delete
 // it because it is still needed and will be managed by WxWidgets.
 WXRUBY_EXPORT void GcNullFreeFunc(void *ptr)
 {
+  WXRUBY_TRACE_IF(WxRubyTraceFreeNull, 2)
+    WXRUBY_TRACE("> GcNullFreeFunc : " << ptr)
+  WXRUBY_TRACE_END
+
   SWIG_RubyRemoveTracking(ptr);
+
+  WXRUBY_TRACE_IF(WxRubyTraceFreeNull, 2)
+    WXRUBY_TRACE("< GcNullFreeFunc")
+  WXRUBY_TRACE_END
 }
 
 // Tests if the window has been signalled as destroyed by a
@@ -41,6 +60,10 @@ WXRUBY_EXPORT bool GC_IsWindowDeleted(void *ptr)
 // WindowDestroyEvent, handled by wxRubyApp (see swig/classes/App.i).
 WXRUBY_EXPORT void GC_SetWindowDeleted(void *ptr)
 {
+  WXRUBY_TRACE_IF(WxRubyTraceFreeWindow, 2)
+    WXRUBY_TRACE("> GC_SetWindowDeleted : " << ptr)
+  WXRUBY_TRACE_END
+
   // All Windows are EvtHandlers, so prevent any pending events being
   // sent after destruction (otherwise ObjectPreviouslyDeleted errors result)
   wxEvtHandler* evt_handler = (wxEvtHandler*)ptr;
@@ -77,6 +100,10 @@ WXRUBY_EXPORT void GC_SetWindowDeleted(void *ptr)
   // Disassociate the C++ and Ruby objects
   SWIG_RubyUnlinkObjects(ptr);
   SWIG_RubyRemoveTracking(ptr);
+
+  WXRUBY_TRACE_IF(WxRubyTraceFreeWindow, 2)
+    WXRUBY_TRACE("< GC_SetWindowDeleted : " << ptr)
+  WXRUBY_TRACE_END
 }
 
 // Code to be run when the ruby object is swept by GC - this only
@@ -84,9 +111,17 @@ WXRUBY_EXPORT void GC_SetWindowDeleted(void *ptr)
 // reference counter.
 WXRUBY_EXPORT void GcRefCountedFreeFunc(void *ptr)
 {
+  WXRUBY_TRACE_IF(WxRubyTraceFreeRefcounted, 2)
+    WXRUBY_TRACE("> GcRefCountedFreeFunc : " << ptr)
+  WXRUBY_TRACE_END
+
   SWIG_RubyRemoveTracking(ptr);
   if (ptr)
     ((wxRefCounter*)ptr)->DecRef();
+
+  WXRUBY_TRACE_IF(WxRubyTraceFreeRefcounted, 2)
+    WXRUBY_TRACE("< GcRefCountedFreeFunc")
+  WXRUBY_TRACE_END
 }
 
 // Code to be run when the ruby object is swept by GC - this checks
@@ -94,26 +129,38 @@ WXRUBY_EXPORT void GcRefCountedFreeFunc(void *ptr)
 // as these will be managed by WxWidgets.
 WXRUBY_EXPORT void GcSizerFreeFunc(void *ptr)
 {
+  WXRUBY_TRACE_IF(WxRubyTraceFreeSizer, 2)
+    WXRUBY_TRACE("> GcSizerFreeFunc : " << ptr)
+  WXRUBY_TRACE_END
+
   wxSizer* wx_szr = (wxSizer*)ptr;
   // unlink in all cases
   SWIG_RubyRemoveTracking(ptr);
   delete wx_szr; // delete unattached sizers
+
+  WXRUBY_TRACE_IF(WxRubyTraceFreeSizer, 2)
+    WXRUBY_TRACE("< GcSizerFreeFunc")
+  WXRUBY_TRACE_END
 }
 
 void GC_mark_SizerBelongingToWindow(wxSizer *wx_sizer, VALUE rb_sizer);
 
 WXRUBY_EXPORT void GC_mark_wxSizer(void* ptr)
 {
+  WXRUBY_TRACE_IF(WxRubyTraceMarkSizer, 2)
+    WXRUBY_TRACE("> GC_mark_wxSizer : " << ptr)
+  WXRUBY_TRACE_END
+
   VALUE rb_szr = SWIG_RubyInstanceFor(ptr);
-  if (rb_szr && rb_szr != Qnil)
+  if (!RB_NIL_P(rb_szr))
   {
-    wxSizer* wx_szr = (wxSizer*)ptr;
-
     // as long as the dfree function is still the GCSizeFreeFunc the sizer has not been attached to a window
     // or added to a parent sizer (as that would 'disown' and replace the free function by the tracking removal function)
     // but it may hay have already had child sizers added which need to be marked
     if (RDATA(rb_szr)->dfree == (void (*)(void *))GcSizerFreeFunc)
     {
+      wxSizer* wx_szr = (wxSizer*)ptr;
+
       // Then loop over the sizer's content and mark each sub-sizer
       wxSizerItemList& children = wx_szr->GetChildren();
       for ( wxSizerItemList::compatibility_iterator node = children.GetFirst();
@@ -134,6 +181,10 @@ WXRUBY_EXPORT void GC_mark_wxSizer(void* ptr)
       }
     }
   }
+
+  WXRUBY_TRACE_IF(WxRubyTraceMarkSizer, 2)
+    WXRUBY_TRACE("< GC_mark_wxSizer : " << ptr)
+  WXRUBY_TRACE_END
 }
 
 // Carries out marking of Sizer objects belonging to a Wx::Window. Note
@@ -144,10 +195,9 @@ WXRUBY_EXPORT void GC_mark_wxSizer(void* ptr)
 // directors, they must be preserved from GC.
 void GC_mark_SizerBelongingToWindow(wxSizer *wx_sizer, VALUE rb_sizer)
 {
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>1)
-    std::wcout << "> GC_mark_SizerBelongingToWindow : " << wx_sizer << std::endl;
-#endif
+  WXRUBY_TRACE_IF(WxRubyTraceMarkSizer, 2)
+    WXRUBY_TRACE("> GC_mark_SizerBelongingToWindow : " << wx_sizer)
+  WXRUBY_TRACE_END
 
   // First, mark this sizer
   rb_gc_mark( rb_sizer );
@@ -170,10 +220,35 @@ void GC_mark_SizerBelongingToWindow(wxSizer *wx_sizer, VALUE rb_sizer)
     }
   }
 
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>1)
-    std::wcout << "< GC_mark_SizerBelongingToWindow : " << wx_sizer << std::endl;
-#endif
+  WXRUBY_TRACE_IF(WxRubyTraceMarkSizer, 2)
+    WXRUBY_TRACE("< GC_mark_SizerBelongingToWindow : " << wx_sizer)
+  WXRUBY_TRACE_END
+}
+
+WXRUBY_EXPORT void GC_mark_attached_wxMenu(void *ptr)
+{
+  WXRUBY_TRACE_IF(WxRubyTraceMarkMenu, 2)
+    WXRUBY_TRACE("> GC_mark_attached_wxMenu : " << ptr)
+  WXRUBY_TRACE_END
+
+  rb_gc_mark(SWIG_RubyInstanceFor(ptr));
+
+  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);
+  }
+
+  WXRUBY_TRACE_IF(WxRubyTraceMarkMenu, 2)
+    WXRUBY_TRACE("< GC_mark_attached_wxMenu : " << ptr)
+  WXRUBY_TRACE_END
 }
 
 // Similar to Sizers, MenuBar requires a special mark routine. This is
@@ -184,90 +259,84 @@ void GC_mark_SizerBelongingToWindow(wxSizer *wx_sizer, VALUE rb_sizer)
 // which can catch destroyed MenuBars linked to an in-scope ruby
 // variable and cause segfaults, MenuBars are always marked via the
 // containing Frame.
-void GC_mark_MenuBarBelongingToFrame(wxMenuBar *menu_bar)
+void GC_mark_MenuBarBelongingToFrame(wxMenuBar *wx_menu_bar)
 {
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>1)
-    std::wcout << "> GC_mark_MenuBarBelongingToFrame : " << menu_bar << std::endl;
-#endif
+  WXRUBY_TRACE_IF(WxRubyTraceMarkMenubar, 2)
+    WXRUBY_TRACE("> GC_mark_MenuBarBelongingToFrame : " << wx_menu_bar)
+  WXRUBY_TRACE_END
+
+  rb_gc_mark( SWIG_RubyInstanceFor(wx_menu_bar) );
+
+  WXRUBY_TRACE_IF(WxRubyTraceMarkMenubar, 3)
+    WXRUBY_TRACE("< GC_mark_MenuBarBelongingToFrame : marking " << wx_menu_bar->GetMenuCount() << " menus")
+  WXRUBY_TRACE_END
 
-  rb_gc_mark( SWIG_RubyInstanceFor(menu_bar) );
   // Mark each menu in the menubar in turn
-  for ( size_t i = 0; i < menu_bar->GetMenuCount(); i++ )
+  for ( size_t i = 0; i < wx_menu_bar->GetMenuCount(); i++ )
 	{
-	  wxMenu* menu  = menu_bar->GetMenu(i);
-	  rb_gc_mark( SWIG_RubyInstanceFor(menu) );
+	  GC_mark_attached_wxMenu(wx_menu_bar->GetMenu(i));
 	}
 
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>1)
-    std::wcout << "< GC_mark_MenuBarBelongingToFrame : " << menu_bar << std::endl;
-#endif
+  WXRUBY_TRACE_IF(WxRubyTraceMarkMenubar, 2)
+    WXRUBY_TRACE("< GC_mark_MenuBarBelongingToFrame : " << wx_menu_bar)
+  WXRUBY_TRACE_END
 }
 
 // Default mark routine for Windows - preserve the main sizer and caret
 // belong to this window
 WXRUBY_EXPORT void GC_mark_wxWindow(void *ptr)
 {
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>1)
-    std::wcout << "> GC_mark_wxWindow : " << ptr << std::endl;
-#endif
+  WXRUBY_TRACE_IF(WxRubyTraceMarkWindow, 2)
+    WXRUBY_TRACE("> GC_mark_wxWindow : " << ptr)
+  WXRUBY_TRACE_END
 
   if ( GC_IsWindowDeleted(ptr) )
   {
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>1)
-      std::wcout << "< GC_mark_wxWindow : deleted" << std::endl;
-#endif
+    WXRUBY_TRACE_IF(WxRubyTraceMarkWindow, 2)
+      WXRUBY_TRACE("< GC_mark_wxWindow : deleted")
+    WXRUBY_TRACE_END
     return;
   }
 
   wxWindow* wx_win = (wxWindow*)ptr;
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>2)
-    std::wcout << "* GC_mark_wxWindow - getting sizer" << std::endl;
-#endif
+  WXRUBY_TRACE_IF(WxRubyTraceMarkWindow, 3)
+    WXRUBY_TRACE("| GC_mark_wxWindow : getting sizer")
+  WXRUBY_TRACE_END
   wxSizer* wx_sizer = wx_win->GetSizer();
   if ( wx_sizer )
   {
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>2)
-      std::wcout << "* GC_mark_wxWindow - found sizer" << std::endl;
-#endif
+    WXRUBY_TRACE_IF(WxRubyTraceMarkWindow, 3)
+      WXRUBY_TRACE("| GC_mark_wxWindow : found sizer " << wx_sizer)
+    WXRUBY_TRACE_END
     VALUE rb_sizer = SWIG_RubyInstanceFor(wx_sizer);
 	  if ( rb_sizer != Qnil )
       GC_mark_SizerBelongingToWindow(wx_sizer, rb_sizer);
   }
 
   // mark any pushed event handlers
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>2)
-    std::wcout << "* GC_mark_wxWindow - getting event handler" << std::endl;
-#endif
+  WXRUBY_TRACE_IF(WxRubyTraceMarkWindow, 3)
+    WXRUBY_TRACE("| GC_mark_wxWindow : getting event handler")
+  WXRUBY_TRACE_END
   wxEvtHandler* evh = wx_win->GetEventHandler();
   while (evh && evh != wx_win)
   {
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>2)
-      std::wcout << "* GC_mark_wxWindow - marking event handler" << std::endl;
-#endif
+    WXRUBY_TRACE_IF(WxRubyTraceMarkWindow, 3)
+      WXRUBY_TRACE("| GC_mark_wxWindow : found event handler " << evh)
+    WXRUBY_TRACE_END
     VALUE rb_evh = SWIG_RubyInstanceFor(evh);
 	  rb_gc_mark(rb_evh);
 	  evh = evh->GetNextHandler();
   }
 
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>2)
-    std::wcout << "* GC_mark_wxWindow - getting caret" << std::endl;
-#endif
+  WXRUBY_TRACE_IF(WxRubyTraceMarkWindow, 3)
+    WXRUBY_TRACE("| GC_mark_wxWindow : getting caret")
+  WXRUBY_TRACE_END
   wxCaret* wx_caret = wx_win->GetCaret();
   if ( wx_caret )
   {
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>2)
-      std::wcout << "* GC_mark_wxWindow - found caret" << std::endl;
-#endif
+    WXRUBY_TRACE_IF(WxRubyTraceMarkWindow, 3)
+      WXRUBY_TRACE("| GC_mark_wxWindow : found caret " << wx_caret)
+    WXRUBY_TRACE_END
     VALUE rb_caret = SWIG_RubyInstanceFor(wx_caret);
 	  rb_gc_mark(rb_caret);
   }
@@ -275,57 +344,50 @@ WXRUBY_EXPORT void GC_mark_wxWindow(void *ptr)
   // be careful; getting drop target may require fully created window (default ctors do  not call Create())
   if (wx_win->GetId() != wxID_ANY)  // any fully created window has an Id != wxID_ANY
   {
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>2)
-      std::wcout << "* GC_mark_wxWindow - getting droptarget" << std::endl;
-#endif
+    WXRUBY_TRACE_IF(WxRubyTraceMarkWindow, 3)
+      WXRUBY_TRACE("| GC_mark_wxWindow : getting droptarget")
+    WXRUBY_TRACE_END
     wxDropTarget* wx_droptarget = wx_win->GetDropTarget();
     if ( wx_droptarget )
     {
-#ifdef __WXRB_DEBUG__
-      if (wxRuby_TraceLevel()>2)
-        std::wcout << "* GC_mark_wxWindow - found droptarget" << std::endl;
-#endif
+      WXRUBY_TRACE_IF(WxRubyTraceMarkWindow, 3)
+        WXRUBY_TRACE("| GC_mark_wxWindow : found drop target " << wx_droptarget)
+      WXRUBY_TRACE_END
       VALUE rb_droptarget = SWIG_RubyInstanceFor(wx_droptarget);
       rb_gc_mark(rb_droptarget);
     }
   }
 
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>2)
-    std::wcout << "* GC_mark_wxWindow - getting validator" << std::endl;
-#endif
+  WXRUBY_TRACE_IF(WxRubyTraceMarkWindow, 3)
+    WXRUBY_TRACE("| GC_mark_wxWindow : getting validator")
+  WXRUBY_TRACE_END
   wxValidator* wx_validator = wx_win->GetValidator();
   if ( wx_validator )
   {
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>2)
-      std::wcout << "* GC_mark_wxWindow - found validator" << std::endl;
-#endif
+    WXRUBY_TRACE_IF(WxRubyTraceMarkWindow, 3)
+      WXRUBY_TRACE("| GC_mark_wxWindow : found validator " << wx_validator)
+    WXRUBY_TRACE_END
 	  VALUE rb_validator = SWIG_RubyInstanceFor(wx_validator);
 	  rb_gc_mark(rb_validator);
   }
 
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>1)
-    std::wcout << "< GC_mark_wxWindow : " << ptr << std::endl;
-#endif
+  WXRUBY_TRACE_IF(WxRubyTraceMarkWindow, 2)
+    WXRUBY_TRACE("< GC_mark_wxWindow : " << ptr)
+  WXRUBY_TRACE_END
 }
 
 
 WXRUBY_EXPORT void GC_mark_wxFrame(void *ptr)
 {
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>1)
-  std::wcout << "> GC_mark_wxFrame : " << ptr << std::endl;
-#endif
+  WXRUBY_TRACE_IF(WxRubyTraceMarkFrame, 2)
+    WXRUBY_TRACE("> GC_mark_wxFrame : " << ptr)
+  WXRUBY_TRACE_END
 
   if ( GC_IsWindowDeleted(ptr) )
   {
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>1)
-    std::wcout << "> GC_mark_wxFrame : deleted" << std::endl;
-#endif
+    WXRUBY_TRACE_IF(WxRubyTraceMarkFrame, 2)
+      WXRUBY_TRACE("< GC_mark_wxFrame : deleted")
+    WXRUBY_TRACE_END
     return;
   }
 
@@ -339,12 +401,14 @@ WXRUBY_EXPORT void GC_mark_wxFrame(void *ptr)
   wxMenuBar* menu_bar = wx_frame->GetMenuBar();
   if ( menu_bar )
   {
+    // as this is an attached menu bar the regular marker will not mark
+    // any menu content as it can't tell if the c++ object has been deleted or not
+    // so we do that here now we know it is still alive
     GC_mark_MenuBarBelongingToFrame(menu_bar);
   }
 
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>1)
-    std::wcout << "> GC_mark_wxFrame : " << ptr << std::endl;
-#endif
+  WXRUBY_TRACE_IF(WxRubyTraceMarkFrame, 2)
+    WXRUBY_TRACE("< GC_mark_wxFrame : " << ptr)
+  WXRUBY_TRACE_END
 }
 %}

data/ext/wxruby3/swig/memory_management.i

@@ -31,6 +31,7 @@ WXRUBY_EXPORT void GcSizerFreeFunc(void *);
 WXRUBY_EXPORT void GcDialogFreeFunc(void *);
 WXRUBY_EXPORT void GcRefCountedFreeFunc(void *);
 WXRUBY_EXPORT void GC_mark_wxSizer(void *);
+WXRUBY_EXPORT void GC_mark_attached_wxMenu(void *);
 WXRUBY_EXPORT void GC_mark_wxWindow(void *);
 WXRUBY_EXPORT void GC_mark_wxFrame(void *);
 WXRUBY_EXPORT void GC_mark_wxEvent(void *);