wxruby3 1.6.0 → 1.7.0

data/rakelib/lib/core/include/swigrubyrun.inc

@@ -156,6 +156,9 @@ static VALUE swig_runtime_data_type_pointer = Qnil;
 /* Global IDs used to keep some internal SWIG stuff */
 static ID swig_arity_id = 0;
 static ID swig_call_id  = 0;
+#if SWIG_VERSION >= 0x040400
+WXRB_EXPORT_FLAG ID swig_lowerthan_id = 0;
+#endif
 
 /*
   If your swig extension is to be run within an embedded ruby and has
@@ -190,11 +193,9 @@ static ID swig_call_id  = 0;
 SWIGRUNTIME VALUE
 getExceptionClass(void)
 {
-  static int init = 0;
-  static VALUE rubyExceptionClass ;
-  if (!init)
+  static VALUE rubyExceptionClass = Qnil;
+  if (rubyExceptionClass == Qnil)
   {
-    init = 1;
     rubyExceptionClass = rb_const_get(_mSWIG, rb_intern("Exception"));
   }
   return rubyExceptionClass;
@@ -227,6 +228,9 @@ SWIG_Ruby_InitRuntime(void)
     _mSWIG = rb_define_module("SWIG");
     swig_call_id  = rb_intern("call");
     swig_arity_id = rb_intern("arity");
+#if SWIG_VERSION >= 0x040400
+    swig_lowerthan_id = rb_intern("<");
+#endif
   }
 }
 
@@ -234,8 +238,14 @@ SWIG_Ruby_InitRuntime(void)
 WXRB_EXPORT_FLAG void
 SWIG_Ruby_define_class(swig_type_info *type)
 {
+#if SWIG_VERSION < 0x040400
   char *klass_name = (char *) malloc(4 + strlen(type->name) + 1);
   sprintf(klass_name, "TYPE%s", type->name);
+#else
+  size_t klass_len = 4 + strlen(type->name) + 1;
+  char *klass_name = (char *) malloc(klass_len);
+  SWIG_snprintf(klass_name, klass_len, "TYPE%s", type->name);
+#endif
   if (NIL_P(_cSWIG_Pointer))
   {
     _cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject);
@@ -412,6 +422,12 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
     }
   }
 
+#if SWIG_VERSION >= 0x040400
+  if (flags & SWIG_POINTER_CLEAR) {
+    DATA_PTR(obj) = 0;
+  }
+#endif
+
   /* Do type-checking if type info was provided */
   if (ty)
   {

data/rakelib/lib/core/include/swigrun.inc

@@ -2,8 +2,32 @@
 //
 // This software is released under the MIT license.
 
+#if defined(__cplusplus) && __cplusplus >=201103L
+# define SWIG_NOEXCEPT noexcept
+#else
+# define SWIG_NOEXCEPT throw()
+#endif
+
 // SWIG runtime
 
+/* C99 and C++11 should provide snprintf, but define SWIG_NO_SNPRINTF
+ * if you're missing it.
+ */
+#if ((defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) || \
+     (defined __cplusplus && __cplusplus >= 201103L) || \
+     defined SWIG_HAVE_SNPRINTF) && \
+    !defined SWIG_NO_SNPRINTF
+# define SWIG_snprintf(O,S,F,A) snprintf(O,S,F,A)
+# define SWIG_snprintf2(O,S,F,A,B) snprintf(O,S,F,A,B)
+#else
+/* Fallback versions ignore the buffer size, but most of our uses either have a
+ * fixed maximum possible size or dynamically allocate a buffer that's large
+ * enough.
+ */
+# define SWIG_snprintf(O,S,F,A) sprintf(O,F,A)
+# define SWIG_snprintf2(O,S,F,A,B) sprintf(O,F,A,B)
+#endif
+
 /* inline attribute */
 #ifndef SWIGINLINE
 # if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
@@ -49,7 +73,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
@@ -248,7 +276,11 @@ typedef struct WXRB_EXPORT_FLAG 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
@@ -314,12 +346,55 @@ 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)
+ */
+WXRB_EXPORT_FLAG unsigned int SWIG_Hash(const char *str, unsigned int len) {
+  const unsigned char *data = (const unsigned char *)str;
+  unsigned int hash = len, i = 0, k;
+  int rem = (int)len;
+
+  while (rem >= (int)sizeof(unsigned int)) {
+    k = *(unsigned int *)data;
+    k += i++;
+    hash ^= k;
+    hash *= 171717;
+    data += sizeof(unsigned int);
+    rem -= sizeof(unsigned int);
+  }
+
+  switch (rem) {
+    case 3: k = (unsigned int)(data[2]) << 16;
+            k |= (unsigned int)(data[1]) << 8;
+            k |= (unsigned int)(data[0]);
+            k += i++;
+            hash ^= k;
+            hash *= 171717;
+            break;
+    case 2: k = (unsigned int)(data[1]) << 8;
+            k |= (unsigned int)(data[0]);
+            k += i++;
+            hash ^= k;
+            hash *= 171717;
+            break;
+    case 1: k = (unsigned int)(data[0]);
+            k += i++;
+            hash ^= k;
+            hash *= 171717;
+            break;
+  }
+  return hash;
+}
+#endif
+
 /*
   Check the typename
 */
 WXRB_EXPORT_FLAG swig_cast_info *
 SWIG_TypeCheck(const char *c, swig_type_info *ty)
 {
+#if SWIG_VERSION < 0x040400
   if (ty)
   {
     swig_cast_info *iter = ty->cast;
@@ -342,6 +417,72 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty)
       iter = iter->next;
     }
   }
+#else
+  static const unsigned int scan_threshold = 4;
+  if (ty) {
+    swig_cast_info *head = ty->cast;
+    unsigned int hash_value = 0;
+    int hashed = 0;
+
+    while (head) {
+
+      if (strcmp(head->type->name, c) == 0) {
+        return head;
+      }
+
+      if (head->value) {
+        swig_cast_info *iter;
+        swig_cast_info *last = head + head->value;
+        swig_cast_info *first = head + 1;
+        int search = 1;
+
+        if (!hashed) {
+          if (head->value < scan_threshold) {
+            for (iter = first; iter <= last; iter++) {
+              if (strcmp(iter->type->name, c) == 0) {
+                return iter;
+              }
+            }
+            search = 0;
+          } else {
+            hashed = 1;
+            hash_value = SWIG_Hash(c, (unsigned int)strlen(c));
+          }
+        }
+
+        if (search) {
+          /* Binary search over sorted <'next'|'value'> pairs */
+          do {
+            iter = first + ((last - first) >> 1);
+            if (iter->value < hash_value) {
+              first = iter + 1;
+            } else if (iter->value == hash_value) {
+
+              if (strcmp(iter->next->type->name, c) == 0) {
+                return iter->next;
+              }
+
+              /* Hash collision check */
+              for (last = iter + 1; last->next && last->value == hash_value; last++) {
+                if (strcmp(last->next->type->name, c) == 0) {
+                  return last->next;
+                }
+              }
+              for (first = iter - 1; first != head && first->value == hash_value; first--) {
+                if (strcmp(first->next->type->name, c) == 0) {
+                  return first->next;
+                }
+              }
+              break;
+            } else
+              last = iter - 1;
+          } while (first <= last);
+        }
+      }
+      head = head->next;
+    }
+  }
+#endif
   return 0;
 }
 
@@ -351,6 +492,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty)
 WXRB_EXPORT_FLAG swig_cast_info *
 SWIG_TypeCheckStruct(const swig_type_info *from, swig_type_info *ty)
 {
+#if SWIG_VERSION < 0x040400
   if (ty)
   {
     swig_cast_info *iter = ty->cast;
@@ -373,6 +515,34 @@ SWIG_TypeCheckStruct(const swig_type_info *from, swig_type_info *ty)
       iter = iter->next;
     }
   }
+#else
+  if (ty) {
+    swig_cast_info *head = ty->cast;
+    while (head) {
+      if (head->type == from) {
+        return head;
+      }
+
+      if (head->value) {
+        swig_cast_info *iter;
+        swig_cast_info *last = head + head->value;
+        swig_cast_info *first = head + 1;
+
+        /* Binary search over sorted array of casts */
+        do {
+          iter = first + ((last - first) >> 1);
+          if (iter->type < from) {
+            first = iter + 1;
+          } else if (iter->type == from) {
+            return iter;
+          } else
+            last = iter - 1;
+        } while (first <= last);
+      }
+      head = head->next;
+    }
+  }
+#endif
   return 0;
 }
 
@@ -438,6 +608,7 @@ SWIG_TypePrettyName(const swig_type_info *type)
 WXRB_EXPORT_FLAG void
 SWIG_TypeClientData(swig_type_info *ti, void *clientdata)
 {
+#if SWIG_VERSION < 0x040400
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
@@ -454,6 +625,24 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata)
     }
     cast = cast->next;
   }
+#else
+  swig_cast_info *head = ti->cast;
+  /* if (ti->clientdata == clientdata) return; */
+  ti->clientdata = clientdata;
+
+  while (head) {
+    swig_cast_info *cast;
+    for (cast = head; (cast - head) <= head->value; cast++) {
+      if (!cast->converter) {
+        swig_type_info *tc = cast->type;
+        if (!tc->clientdata) {
+          SWIG_TypeClientData(tc, clientdata);
+        }
+      }
+    }
+    head = head->next;
+  }
+#endif
 }
 WXRB_EXPORT_FLAG void
 SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata)

data/rakelib/lib/core/package.rb

@@ -203,7 +203,7 @@ module WXRuby3
       end
 
       def cpp_flags
-        is_core? ? '-DBUILD_WXRUBY_CORE' : ''
+        @cpp_flags ||= "#{is_core? ? '-DBUILD_WXRUBY_CORE' : ''}"
       end
 
       def initializer_src
@@ -364,6 +364,8 @@ module WXRuby3
             #   endif
             # endif
             #endif
+
+            #define SWIG_VERSION 0x#{'%.2X%.2X%.2X' % SwigRunner.swig_version}
           __HEREDOC
           fsrc.puts
           fsrc.puts "VALUE #{module_variable} = 0;"

data/rakelib/lib/core/spec.rb

@@ -102,7 +102,7 @@ module WXRuby3
       end
 
       def class_implementation(cls)
-        @class_implementations[cls] || cls
+        @class_implementations[classdef_name(cls)] || cls
       end
 
       def use_template_as_class(tpl, cls)

data/rakelib/lib/director/accelerator.rb

@@ -16,7 +16,7 @@ module WXRuby3
         spec.items.replace(%w[wxAcceleratorEntry wxAcceleratorTable])
         spec.disable_proxies
 
-        spec.gc_as_object('wxAcceleratorEntry')
+        spec.gc_as_untracked('wxAcceleratorTable', 'wxAcceleratorEntry')
         spec.ignore 'wxAcceleratorEntry::operator!='
         spec.add_header_code <<~__HEREDOC
           // Allow integer keycodes to be specified with a single-ASCII-character

data/rakelib/lib/director/animation.rb

@@ -17,6 +17,7 @@ module WXRuby3
       def setup
         super
         spec.items << 'wxAnimationDecoder'
+        spec.gc_as_untracked('wxAnimation')
         spec.ignore 'wxAnimation::IsCompatibleWith' # no wxClassInfo in wxRuby
         spec.gc_as_refcounted 'wxAnimationDecoder'
         # make Ruby director and wrappers use custom implementation

data/rakelib/lib/director/app_traits.rb

@@ -15,7 +15,7 @@ module WXRuby3
       def setup
         super
         spec.items << 'wxStandardPaths'
-        spec.gc_as_object 'wxAppTraits'
+        spec.gc_as_untracked 'wxAppTraits'
         # stack based global; tracking unwanted
         spec.gc_as_untracked 'wxStandardPaths'
         spec.no_proxy 'wxAppTraits', 'wxStandardPaths'

data/rakelib/lib/director/aui_manager.rb

@@ -14,6 +14,8 @@ module WXRuby3
 
     class AuiManager < EvtHandler
 
+      include Typemap::AuiTabCtrl
+
       def setup
         super
         spec.gc_as_object 'wxAuiManager'
@@ -123,10 +125,6 @@ module WXRuby3
           # or false if the orphaned page should be removed.
           spec.map 'int page, wxAuiTabCtrl **tabCtrl, int * tabIndex' do
 
-            add_header_code <<~__CODE
-              static WxRuby_ID s_AuiTabCtrl_id("AuiTabCtrl");
-              __CODE
-
             map_in from: {type: 'Integer', index: 0}, temp: 'wxAuiTabCtrl *tab_ctrl, int tab_ix', code: <<~__CODE
               $1 = NUM2INT($input);
               tab_ctrl = nullptr; tab_ix = 0;
@@ -142,10 +140,8 @@ module WXRuby3
               {
                 if (tab_ctrl$argnum)
                 {
-                  VALUE rb_klass = rb_const_get(mWxAuiManager, s_AuiTabCtrl_id());
-                  swig_type_info* swig_type = wxRuby_GetSwigTypeForClass(rb_klass);
                   $result = rb_ary_new();
-                  rb_ary_push($result, SWIG_NewPointerObj(SWIG_as_voidptr(tab_ctrl$argnum), swig_type,  0));
+                  rb_ary_push($result, _wxRuby_Wrap_wxAuiTabCtrl(tab_ctrl$argnum));
                   rb_ary_push($result, INT2NUM(tab_ix$argnum));
                 }
                 else
@@ -169,16 +165,14 @@ module WXRuby3
                 }
                 else if (TYPE(result) == T_ARRAY && RARRAY_LEN(result) == 2)
                 {
-                  VALUE rb_klass = rb_const_get(mWxAuiManager, s_AuiTabCtrl_id());
-                  swig_type_info* swig_type = wxRuby_GetSwigTypeForClass(rb_klass);
-                  void *tab_ctrl;
-                  int res = SWIG_ConvertPtr(rb_ary_entry(result, 0), &tab_ctrl, swig_type, 0);
-                  if (!SWIG_IsOK(res)) 
+                  VALUE rbATC = rb_ary_entry(result, 0);
+                  VALUE rbIx = rb_ary_entry(result, 1);
+                  if (!_wxRuby_Is_wxAuiTabCtrl(rbATC) || TYPE(rbIx) != T_FIXNUM)
                   {
                     Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, 
                                                                "HandleOrphanedPage should return false, true or Array(Wx::AUI::AuiTabCtrl, Integer)");
                   }
-                  *tabCtrl = reinterpret_cast<wxAuiTabCtrl*>(tab_ctrl);
+                  *tabCtrl = _wxRuby_Unwrap_wxAuiTabCtrl(rbATC);
                   *tabIndex = NUM2INT(rb_ary_entry(result, 1));
                   c_result = true;
                 }
@@ -210,6 +204,9 @@ module WXRuby3
             virtual ~WXRubyAuiManager() 
             {
               wxRuby_ReleaseEvtHandlerProcs(this);
+              wxAuiDockArt* art_prov = GetArtProvider();
+              SWIG_RubyUnlinkObjects(art_prov);
+              SWIG_RubyRemoveTracking(art_prov);
             }
 
             void OnManagedWindowClose(wxCloseEvent& event)
@@ -263,7 +260,7 @@ module WXRuby3
         spec.add_swig_code '%markfunc wxAuiManager "GC_mark_wxAuiManager";'
         # provide pure Ruby implementation based on use custom alternative provided below
         spec.ignore('wxAuiManager::GetAllPanes')
-        spec.ignore('wxAuiManager::SetManagedWindow', ignore_doc: false)
+        spec.ignore('wxAuiManager::SetManagedWindow', 'wxAuiManager::SetArtProvider', ignore_doc: false)
         spec.add_extend_code 'wxAuiManager', <<~__HEREDOC
           VALUE each_pane() 
           {
@@ -289,6 +286,16 @@ module WXRuby3
             WXRubyAuiManager* aui_mng = dynamic_cast<WXRubyAuiManager*> (self);
             managedWnd->Bind(wxEVT_CLOSE_WINDOW, &WXRubyAuiManager::OnManagedWindowClose, aui_mng);
           }
+
+          void 	SetArtProvider (wxAuiDockArt *art_provider)
+          {
+              // AUI manager will delete current art provider
+              // so cleanup any existing tracking
+              wxAuiDockArt* art_prov = self->GetArtProvider();
+              SWIG_RubyUnlinkObjects(art_prov);
+              SWIG_RubyRemoveTracking(art_prov);
+              self->SetArtProvider(art_provider);
+          } 
         __HEREDOC
         spec.suppress_warning(473, 'wxAuiManager::CreateFloatingFrame')
         spec.do_not_generate(:variables, :defines, :enums, :functions) # with AuiPaneInfo

data/rakelib/lib/director/aui_mdi_child_frame.rb

@@ -45,6 +45,8 @@ module WXRuby3
         spec.suppress_warning(473,
                               'wxAuiMDIChildFrame::CreateStatusBar',
                               'wxAuiMDIChildFrame::CreateToolBar')
+        # for SetMenuBar
+        spec.disown 'wxMenuBar *'
         # for SetStatusWidths
         spec.map 'int n, int widths_field[]' do
           map_in from: {type: 'Array<Integer>', index: 1},

data/rakelib/lib/director/aui_mdi_parent_frame.rb

@@ -21,6 +21,10 @@ module WXRuby3
           wxAuiMDIParentFrame::Cascade
           wxAuiMDIParentFrame::ArrangeIcons]
         spec.suppress_warning(473, 'wxAuiMDIParentFrame::OnCreateClient')
+        # for SetWindowMenu
+        spec.disown 'wxMenu *'
+        # for SetMenuBar
+        spec.disown 'wxMenuBar *'
       end
     end # class AuiParentMDIFrame
 

data/rakelib/lib/director/aui_notebook.rb

@@ -14,6 +14,8 @@ module WXRuby3
 
     class AuiNotebook < BookCtrls
 
+      include Typemap::AuiTabCtrl
+
       def setup
         super
         spec.override_inheritance_chain(spec.module_name, %w[wxBookCtrlBase wxControl wxWindow wxEvtHandler wxObject])
@@ -31,13 +33,13 @@ module WXRuby3
             spec.make_readonly 'wxAuiNotebookPosition::tabCtrl',
                                'wxAuiNotebookPosition::tabIdx'
 
-            spec.map 'std::vector<wxAuiTabCtrl*>' => 'Array<Wx::AuiTabCtrl>' do
+            spec.map 'std::vector<wxAuiTabCtrl*>' => 'Array<Wx::AUI::AuiTabCtrl>' do
               map_out code: <<~__CODE
                 $result = rb_ary_new();
                 std::vector<wxAuiTabCtrl*>* tabctrls = (std::vector<wxAuiTabCtrl*>*)&$1;
                 for (wxAuiTabCtrl* tabctrl : *tabctrls)
                 {
-                  VALUE r_tabctrl = SWIG_NewPointerObj(SWIG_as_voidptr(tabctrl), SWIGTYPE_p_wxAuiTabCtrl, 0);
+                  VALUE r_tabctrl = _wxRuby_Wrap_wxAuiTabCtrl(tabctrl);
                   rb_ary_push($result, r_tabctrl);
                 }
                 __CODE
@@ -51,8 +53,14 @@ module WXRuby3
           # Any set AuiTabArt ruby object must be protected from GC once set,
           # even if it is no longer referenced anywhere else.
           spec.add_header_code <<~__HEREDOC
+            WXRUBY_TRACE_GUARD(WxRubyTraceGCMarkAuiNotebook, "GC_MARK_AUI_NOTEBOOK")
+
             extern void GC_mark_wxAuiNotebook(void *ptr)
             {
+              WXRUBY_TRACE_IF(WxRubyTraceGCMarkAuiNotebook, 2)
+                WXRUBY_TRACE("> GC_mark_wxAuiNotebook : " << ptr)
+              WXRUBY_TRACE_END
+
               if ( GC_IsWindowDeleted(ptr) )
               {
                 return;
@@ -63,7 +71,16 @@ module WXRuby3
               wxAuiNotebook* nbk = (wxAuiNotebook*)ptr;
               wxAuiTabArt* art_prov = nbk->GetArtProvider();
               VALUE rb_art_prov = SWIG_RubyInstanceFor( (void *)art_prov );
+
+              WXRUBY_TRACE_IF(WxRubyTraceGCMarkAuiNotebook, 2)
+                WXRUBY_TRACE("| GC_mark_wxAuiNotebook : marking AUI TabArt provider " << art_prov << " -> " << rb_art_prov);
+              WXRUBY_TRACE_END
+
               rb_gc_mark( rb_art_prov );
+
+              WXRUBY_TRACE_IF(WxRubyTraceGCMarkAuiNotebook, 2)
+                WXRUBY_TRACE("< GC_mark_wxAuiNotebook : " << ptr)
+              WXRUBY_TRACE_END
             }
           __HEREDOC
           # add some convenience methods
@@ -85,7 +102,7 @@ module WXRuby3
               if ($self->FindTab(page, &ctrl, &idx))
               {
                 rc = rb_ary_new();
-                rb_ary_push(rc, SWIG_NewPointerObj(SWIG_as_voidptr(ctrl), SWIGTYPE_p_wxAuiTabCtrl, 0));
+                rb_ary_push(rc, _wxRuby_Wrap_wxAuiTabCtrl(ctrl));
                 rb_ary_push(rc, INT2NUM(idx));
               }
               return rc;