wxruby3 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25ead08d281891ae9ad295a8181908c163677a4b9e0686249185941866118d49
-  data.tar.gz: 552bef0440f00907f30b273411dbfed19b8430bfbf49538efac2cd6104e6021b
+  metadata.gz: 29b2e3949b365c4778d3b537d91f6b227361bcc3f978fa2c92bdea5e2c81390c
+  data.tar.gz: 58e28a379655680b2c7b5ac147436f154102bc551d356b8bd2d4f7a57249fa2f
 SHA512:
-  metadata.gz: 598918c1e5d613797115ede72de7cc8024bf6468ee81a51b567297c153df12da11390740fca827b67c15dae9e2e874b38969088bf27e808b644fc810abb1a6c0
-  data.tar.gz: bf26ee5eebeef682e88831df0a0bb7b260138e4cae2c6f41425a327133c7f60fce0b5897bb722b5eb05acbdbefa92fb6e860235d2942cd0e35ef42919ca2354d
+  metadata.gz: fa954320cb8c4a44872a78fe5c5da098d5b15667b93b3d9b6f24839fb17a04e42b2d4ccd8eed502407a0eed348cba08da19abdeaab99d8121c5e49674b931227
+  data.tar.gz: 7dd47c4496313f52a56ac7387ac195ad4a54ce5758b9015bb92eb5a6a7d8a98b27d8d9b96f06aa12850d613e74e51147fe82a7bdfe5541466c179f73dd7c964d

data/CREDITS.md

@@ -9,6 +9,13 @@ Martin Corino established the wxRuby3 project in 2022.
 
 Martin Corino: mcorino at m2c-software dot nl
 
+### Contributors
+
+Andy Maleh \
+Brandon Zylstra \
+Johnny Willemsen \
+Jacob Miner
+
 ## wxRuby 2
 
 In 2005 Kevin Smith established the wxRuby 2.0 project of which parts are still
@@ -19,31 +26,31 @@ feature requests.
 The alphabetic list shows (some of) those who've contributed code to
 wxRuby 2.0.
 
-Albin Holmgren
-Alex Fenton
-Artur Kuptel
-Cezar Espinola
-Chauk-Mean Proum
-Christophe Bludau
-Curt Hibbs
-Dale Edmons
-Daniel Savarese
-David Whetstone
-Dirk Traulsen
-Hawley Waldman
-Jani Monoses
-Joe Seeley
-Jonathan Maasland
-Kevin Smith
-Mario Steele
-Nic
-Pascal Hurni
-Robert Carlin
-Roy Sutton
-Ryuichi Sakamoto
-Sean Lindsay
-Sean Long
-Tobias Gruetzmacher
+Albin Holmgren \
+Alex Fenton \
+Artur Kuptel \
+Cezar Espinola \
+Chauk-Mean Proum \
+Christophe Bludau \
+Curt Hibbs \
+Dale Edmons \
+Daniel Savarese \
+David Whetstone \
+Dirk Traulsen \
+Hawley Waldman \
+Jani Monoses \
+Joe Seeley \
+Jonathan Maasland \
+Kevin Smith \
+Mario Steele \
+Nic \
+Pascal Hurni \
+Robert Carlin \
+Roy Sutton \
+Ryuichi Sakamoto \
+Sean Lindsay \
+Sean Long \
+Tobias Gruetzmacher \
 Zach Dennis
 
 ## wxWidgets

data/INSTALL.md

@@ -27,7 +27,7 @@ should always result in a successfully installed wxRuby3 version.
 > The user is therefor required to install a Ruby interpreter using either [MacPorts](https://www.macports.org/) (both 
 > privileged and user installations are supported) or [Homebrew](https://brew.sh/) or Ruby installers/version managers 
 > like [ruby-install](https://github.com/postmodern/ruby-install) or [RVM](https://rvm.io) (only user installations 
-> supported) .
+> supported) or [rbenv](https://rbenv.org).
 
 [Below](INSTALL.md#installing-software-requirements) more details regarding the software requirements for wxRuby3, the 
 setup procedure and various options to tweak and customize the installation (including platform specific details for 
@@ -78,8 +78,9 @@ The following tables lists the packages provided by the current wxRuby3 release
 | Linux   | Debian (at least latest stable)        | x86_64 <b>and</b> ARM64 | Distro provided Ruby <b>and</b> Latest stable Ruby |  
 | Linux   | Ubuntu (at least latest stable)        | x86_64 <b>and</b> ARM64 | Distro provided Ruby <b>and</b> Latest stable Ruby |
 | Windows | NA                                     | x86_64                  | Latest stable Ruby                                 |
-| OSX     | MacOSX 13                              | x86_64 <b>and</b> ARM64 | Latest stable Ruby                                 |
-| OSX     | MacOSX 14                              | ARM64                   | Latest stable Ruby                                 |
+| OSX     | MacOS 14                               | ARM64                   | Latest stable Ruby                                 |
+| OSX     | MacOS 15                               | x86_64 <b>and</b> ARM64 | Latest stable Ruby                                 |
+| OSX     | MacOS 26                               | x86_64 <b>and</b> ARM64 | Latest stable Ruby                                 |
 
 ### User created packages
 
@@ -336,7 +337,19 @@ the `--with-wxwin` option like this:
 wxruby setup --with-wxwin
 ```
 
-This will force the setup procedure to build and install an embedded wxWidgets version for wxRuby3.
+This will force the setup procedure to build and install an embedded wxWidgets version for wxRuby3. By default the 
+latest stable wxWidgets release will be embedded. 
+
+#### Specify specific embedded wxWidgets release
+
+When using `--with-wxwin` a specific wxWidgets release version can be specified like this:
+
+```shell
+wxruby setup --with-wxwin --wxversion=3.2.9
+```
+
+Note that both `--with-wxwin` and `--wxversion` are required. Also note that the release version must be specified
+as '<major version nr>.<minor version number>.<release number>' without any 'v' (or other) prefix.
 
 #### Force embedded wxWidgets head installation
 
@@ -347,6 +360,8 @@ be started with the `--with-wxhead` option like this:
 wxruby setup --with-wxhead
 ```
 
+Note that in this case `--with-wxwin` is implied.
+
 > **NOTE**<br>
 > Although wxRuby3 endeavors to keep up to date with the wxWidgets master branch your mileage may vary depending on
 > the development state of the wxWidgets master branch. You can check the latest results of the wxRuby3 CI master build 

data/README.md

@@ -99,11 +99,11 @@ of these products.
 
 Currently the following are fully supported:
 
-| Platform                                                                                                                           | Ruby version(s)                                     | wxWidgets version(s) |
-|------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------|----------------------|
-| Windows >= 10                                                                                                                      | Ruby >= 2.7<br>(RubyInstaller MSYS2-DevKit)         | wxWidgets >= 3.2     |
-| Linux (tested; all major AMD64 and ARM64 distributions: Ubuntu, Debian, Fedora, OpenSuSE and ArchLinux)<br>(most likely also i686) | Ruby >= 2.7                                         | wxWidgets >= 3.2     |
-| MacOS >= 10.10 using Cocoa (tested on AMD64 and ARM64 M1/M2 Chip)                                                                  | Ruby >= 2.7 (MacPorts, Homebrew, ruby-install, RVM) | wxWidgets >= 3.2     |
+| Platform                                                                                                                                               | Ruby version(s)                                            | wxWidgets version(s) |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------|----------------------|
+| Windows >= 10                                                                                                                                          | Ruby >= 2.7<br>(RubyInstaller MSYS2-DevKit)                | wxWidgets >= 3.2     |
+| Linux (tested; all major AMD64 and ARM64 distributions: Ubuntu, Debian, Fedora, OpenSuSE, LinuxMint, Manjaro and ArchLinux)<br>(most likely also i686) | Ruby >= 2.7                                                | wxWidgets >= 3.2     |
+| MacOS >= 14 (MacOS 13 most likely also works) using Cocoa (tested on AMD64 and ARM64 M1/M2 Chip)                                                       | Ruby >= 2.7 (MacPorts, Homebrew, ruby-install, RVM, Rbenv) | wxWidgets >= 3.2     |
 
 Support for other platforms is not being actively developed at present,
 but patches are welcome. It is likely to be much simpler to get wxRuby

data/ext/wxruby3/include/wxRubyApp.h

@@ -2,6 +2,10 @@
 //
 // This software is released under the MIT license.
 
+WXRUBY_TRACE_GUARD(WxRubyTraceWinDestroy, "WINDOW_DESTROY")
+WXRUBY_TRACE_GUARD(WxRubyTraceMarkApp, "GC_MARK_APP")
+WXRUBY_TRACE_GUARD(WxRubyTraceAppRun, "APP_RUN")
+
 #include <memory>
 
 /*
@@ -35,16 +39,17 @@ public:
   void OnWindowDestroy(wxWindowDestroyEvent &event)
   {
     wxObject* wx_obj = event.GetEventObject();
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>0)
-      std::wcout << "<= OnWindowDestroy [" << wx_obj << "]" << std::endl;
-#endif
+
+    WXRUBY_TRACE_IF(WxRubyTraceWinDestroy, 1)
+      WXRUBY_TRACE("< OnWindowDestroy [" << wx_obj << "]")
+    WXRUBY_TRACE_END
+
     GC_SetWindowDeleted((void *)wx_obj);
     event.Skip();
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>0)
-      std::wcout << "=> OnWindowDestroy [" << wx_obj << "]" << std::endl;
-#endif
+
+    WXRUBY_TRACE_IF(WxRubyTraceWinDestroy, 1)
+      WXRUBY_TRACE("> OnWindowDestroy [" << wx_obj << "]")
+    WXRUBY_TRACE_END
   }
 
   bool IsRunning() const { return this->is_running_; }
@@ -83,11 +88,9 @@ public:
   // Wx::THE_APP is a constant so always checked in GC mark phase.
   static void mark_wxRubyApp(void *ptr)
   {
-
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>0)
-      std::wcout << "=== Starting App GC mark phase" << std::endl;
-#endif
+    WXRUBY_TRACE_IF(WxRubyTraceMarkApp, 1)
+      WXRUBY_TRACE(">=== Starting App GC mark phase")
+    WXRUBY_TRACE_END
 
     // If the App has ended, the ruby object will have been unlinked from
     // the C++ one; this implies that all Windows have already been destroyed
@@ -95,10 +98,9 @@ public:
     // errors.
     if ( !wxRubyApp::GetInstance() || !wxRubyApp::GetInstance()->IsRunning() )
     {
-#ifdef __WXRB_DEBUG__
-      if (wxRuby_TraceLevel()>0)
-        std::wcout << "=== App not started yet or has ended, skipping mark phase" << std::endl;
-#endif
+      WXRUBY_TRACE_IF(WxRubyTraceMarkApp, 1)
+        WXRUBY_TRACE("<=== App not started yet or has ended, skipping mark phase")
+      WXRUBY_TRACE_END
       return;
     }
 
@@ -125,10 +127,9 @@ public:
     // list of tracked objects
     wxRuby_IterateTracking(&wxRubyApp::markIterate);
 
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>0)
-      std::wcout << "=== App GC mark phase completed" << std::endl;
-#endif
+    WXRUBY_TRACE_IF(WxRubyTraceMarkApp, 1)
+      WXRUBY_TRACE("<=== App GC mark phase completed")
+    WXRUBY_TRACE_END
   }
 
   // This is the method run when main_loop is called in Ruby
@@ -155,10 +156,9 @@ public:
     this->Connect(wxEVT_DESTROY,
           wxWindowDestroyEventHandler(wxRubyApp::OnWindowDestroy));
 
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>0)
-      std::wcout << "Calling wxEntry, this=" << this << std::endl;
-#endif
+    WXRUBY_TRACE_IF(WxRubyTraceAppRun, 1)
+      WXRUBY_TRACE("> main_loop : Calling wxEntry, this=" << this)
+    WXRUBY_TRACE_END
 
     // collect ruby app name and arguments array
     VALUE rb_args = rb_get_argv();
@@ -184,15 +184,13 @@ public:
       it or any of it's members anymore but only unroll the callstack.
      */
 
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>0)
-      std::wcout << "returned from wxEntry..." << std::endl;
-#endif
+    WXRUBY_TRACE_IF(WxRubyTraceAppRun, 1)
+      WXRUBY_TRACE("| main_loop : returned from wxEntry...")
+    WXRUBY_TRACE_END
     rb_gc_start();
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>0)
-      std::wcout << "survived gc" << std::endl;
-#endif
+    WXRUBY_TRACE_IF(WxRubyTraceAppRun, 1)
+      WXRUBY_TRACE("| main_loop : survived gc")
+    WXRUBY_TRACE_END
 
     rb_const_remove(mWxCore, rb_intern("THE_APP"));
 
@@ -201,6 +199,11 @@ public:
     {
       rb_exc_raise(exc);
     }
+
+    WXRUBY_TRACE_IF(WxRubyTraceAppRun, 1)
+      WXRUBY_TRACE("< main_loop")
+    WXRUBY_TRACE_END
+
     return rc;
   }
 
@@ -210,10 +213,9 @@ public:
   // be initialized any earlier than this without crashing
   bool OnInit() override
   {
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>0)
-      std::wcout << "OnInit..." << std::endl;
-#endif
+    WXRUBY_TRACE_IF(WxRubyTraceAppRun, 1)
+      WXRUBY_TRACE("> OnInit")
+    WXRUBY_TRACE_END
 
     if (!wxApp::OnInit())
       return false;
@@ -236,6 +238,10 @@ public:
       result = Qfalse; // exit app
     }
 
+    WXRUBY_TRACE_IF(WxRubyTraceAppRun, 1)
+      WXRUBY_TRACE("< OnInit -> " << ((result == Qfalse || result == Qnil) ? "false" : "true"))
+    WXRUBY_TRACE_END
+
     // If on_init return any (ruby) true value, signal to wxWidgets to
     // enter the main event loop by returning true, else return false
     // which will make wxWidgets exit.
@@ -252,10 +258,9 @@ public:
 
   int OnExit() override
   {
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>0)
-      std::wcout << "OnExit..." << std::endl;
-#endif
+    WXRUBY_TRACE_IF(WxRubyTraceAppRun, 1)
+      WXRUBY_TRACE("> OnExit")
+    WXRUBY_TRACE_END
 
     // Get the ruby representation of the App object, and call the
     // ruby on_exit method (if any) for application level cleanup
@@ -276,6 +281,10 @@ public:
     // perform wxRuby cleanup
     _wxRuby_Cleanup();
 
+    WXRUBY_TRACE_IF(WxRubyTraceAppRun, 1)
+      WXRUBY_TRACE("< OnExit")
+    WXRUBY_TRACE_END
+
     // execute base wxWidgets functionality
     return this->wxApp::OnExit();
   }
@@ -308,10 +317,10 @@ public:
 
   void _wxRuby_Cleanup()
   {
-#ifdef __WXRB_DEBUG__
-    if (wxRuby_TraceLevel()>0)
-      std::wcout << "wxRuby_Cleanup..." << std::endl;
-#endif
+    WXRUBY_TRACE_IF(WxRubyTraceAppRun, 2)
+      WXRUBY_TRACE("> _wxRuby_Cleanup")
+    WXRUBY_TRACE_END
+
     // Note in a global variable that the App has ended, so that we
     // can skip any GC marking later
     this->is_running_ = false;
@@ -334,5 +343,9 @@ public:
       SWIG_RubyRemoveTracking(oldlog);
       delete oldlog;
     }
+
+    WXRUBY_TRACE_IF(WxRubyTraceAppRun, 2)
+      WXRUBY_TRACE("< _wxRuby_Cleanup")
+    WXRUBY_TRACE_END
   }
 };

data/ext/wxruby3/include/wxruby-runtime.h

@@ -39,8 +39,85 @@ private:
 
 // Exported runtime helper methods
 
+// Debug tracing support
 #ifdef __WXRB_DEBUG__
-WXRUBY_EXPORT int wxRuby_TraceLevel();
+#include <cstdlib>
+#include <string>
+#include <algorithm>
+#include <ctype.h>
+
+class WxRubyTraceGuard
+{
+public:
+  WxRubyTraceGuard(const std::string& trace_id)
+  {
+    std::string trace_env_id = to_uppercase(trace_id);
+    while (!trace_env_id.empty())
+    {
+      // see if we can find a trace setting which starts with 'WXRUBY_TRACE_'
+      // followed by the trace id
+      std::string trace_env_var = std::string("WXRUBY_TRACE_") + trace_env_id;
+      char* env_val = std::getenv(trace_env_var.c_str());
+      if (env_val)
+      {
+        // trace setting found
+        this->_trace_lvl = std::atoi(env_val);
+        break; // done
+      }
+      // see if there is a parent trace category we can check
+      std::string::size_type offs = trace_env_id.find_last_of('_');
+      if (offs != std::string::npos )
+      {
+        // reduce the id to possible parent category
+        trace_env_id = trace_env_id.substr(0, offs);
+      }
+
+      if (offs == std::string::npos || trace_env_id.empty())
+      {
+        // check for global tracing
+        env_val = std::getenv("WXRUBY_TRACE");
+        if (env_val)
+        {
+          // trace setting found
+          this->_trace_lvl = std::atoi(env_val);
+        }
+        break; // done
+      }
+    }
+  }
+
+  int trace_level() { return this->_trace_lvl; }
+
+private:
+  std::string to_uppercase(std::string s)
+  {
+    std::transform(s.begin(), s.end(), s.begin(), [](unsigned char c){ return std::toupper(c); });
+    return s;
+  }
+
+  int _trace_lvl {};
+};
+
+#define WXRUBY_TRACE_GUARD(name, trace_id) static WxRubyTraceGuard name (trace_id);
+
+#define WXRUBY_TRACE_IF(__trace_guard__, __level__) \
+  if (__trace_guard__.trace_level() >= __level__) {
+
+#define WXRUBY_TRACE_WITH(__stmt__) __stmt__ ;
+
+#define WXRUBY_TRACE(__stmt__) \
+  std::wcout << __stmt__ << std::endl;
+
+#define WXRUBY_TRACE_END }
+
+#else
+
+#define WXRUBY_TRACE_GUARD(name, trace_id)
+#define WXRUBY_TRACE_IF(__trace_guard__, __level__)
+#define WXRUBY_TRACE_WITH(__stmt__)
+#define WXRUBY_TRACE(__stmt__)
+#define WXRUBY_TRACE_END
+
 #endif
 
 WXRUBY_EXPORT VALUE wxRuby_Funcall(VALUE rcvr, ID func, int argc, ...);

data/ext/wxruby3/swig/common.i

@@ -134,8 +134,8 @@
 #include <wx/variant.h>
 #endif
 
-#if ! wxCHECK_VERSION(3,1,5)
-#error "This version of wxRuby requires WxWidgets 3.1.5 or greater"
+#if ! wxCHECK_VERSION(3,2,0)
+#error "This version of wxRuby requires WxWidgets 3.2.0 or greater"
 #endif
 
 #include "wxruby-runtime.h"

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

@@ -109,7 +109,7 @@ namespace Swig {
     void setup_error(VALUE error);
 
   public:
-    virtual ~DirectorException() throw();
+    virtual ~DirectorException() SWIG_NOEXCEPT;
 
     VALUE getType() const
     {
@@ -127,7 +127,7 @@ namespace Swig {
       return swig_msg;
     }
 
-    const char *what() const throw()
+    const char *what() const SWIG_NOEXCEPT
     {
       return swig_msg.c_str();
     }

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

@@ -7,6 +7,8 @@
 
 /* auxiliary ruby fail method */
 
+// SWIG < 4.4.0
+#if SWIG_VERSION < 0x040400
 %fragment("SWIG_ruby_failed","header")
 {
 SWIGINTERN VALUE
@@ -15,18 +17,16 @@ SWIG_ruby_failed(void)
   return Qnil;
 } 
 }
-
-%define %ruby_aux_method(Type, Method, Action)
-SWIGINTERN VALUE SWIG_AUX_##Method##(VALUE *args)
+#else
+%fragment("SWIG_ruby_failed","header")
 {
-  VALUE obj = args[0];
-  VALUE type = TYPE(obj);
-  Type *res = (Type *)(args[1]);
-  *res = Action;
-  return obj;
+SWIGINTERN VALUE
+SWIG_ruby_failed(VALUE SWIGUNUSEDPARM(arg1), VALUE SWIGUNUSEDPARM(arg2))
+{
+  return Qnil;
 }
-%enddef
-
+}
+#endif
 
 /* boolean */
 
@@ -68,7 +68,14 @@ SWIG_AsVal_dec(bool)(VALUE obj, bool *val)
 }
 
 %fragment(SWIG_AsVal_frag(long),"header",fragment="SWIG_ruby_failed") {
-%ruby_aux_method(long, NUM2LONG, (type != T_BIGNUM) ? NUM2LONG(obj) : rb_big2long(obj))
+SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE* args)
+{
+  VALUE obj = args[0];
+  VALUE type = TYPE(obj);
+  long *res = (long *)(args[1]);
+  *res = (type != T_BIGNUM) ? NUM2LONG(obj) : rb_big2long(obj);
+  return obj;
+}
 
 SWIGINTERN int
 SWIG_AsVal_dec(long)(VALUE obj, long* val)
@@ -100,7 +107,14 @@ SWIG_From_dec(unsigned long)(unsigned long value)
 }
 
 %fragment(SWIG_AsVal_frag(unsigned long),"header",fragment="SWIG_ruby_failed") {
-%ruby_aux_method(unsigned long, NUM2ULONG, (type != T_BIGNUM) ? NUM2ULONG(obj) : rb_big2ulong(obj))
+SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE* args)
+{
+  VALUE obj = args[0];
+  VALUE type = TYPE(obj);
+  unsigned long *res = (unsigned long *)(args[1]);
+  *res = (type != T_BIGNUM) ? NUM2ULONG(obj) : rb_big2ulong(obj);
+  return obj;
+}
 
 SWIGINTERN int
 SWIG_AsVal_dec(unsigned long)(VALUE obj, unsigned long *val) 
@@ -112,6 +126,10 @@ SWIG_AsVal_dec(unsigned long)(VALUE obj, unsigned long *val)
     a[0] = obj;
     a[1] = (VALUE)(&v);
     if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2ULONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
+#if SWIG_VERSION >= 0x040400
+      if (rb_funcall(obj, swig_lowerthan_id, 1, INT2FIX(0)) != Qfalse)
+        return SWIG_OverflowError;
+#endif
       if (val) *val = v;
       return SWIG_OK;
     }
@@ -138,7 +156,14 @@ SWIG_From_dec(long long)(long long value)
 	  fragment="SWIG_ruby_failed",
 	  fragment="SWIG_LongLongAvailable") {
 %#ifdef SWIG_LONG_LONG_AVAILABLE
-%ruby_aux_method(long long, NUM2LL, (type != T_BIGNUM) ? NUM2LL(obj) : rb_big2ll(obj))
+SWIGINTERN VALUE SWIG_AUX_NUM2LL(VALUE* args)
+{
+  VALUE obj = args[0];
+  VALUE type = TYPE(obj);
+  long long *res = (long long *)(args[1]);
+  *res = (type != T_BIGNUM) ? NUM2LL(obj) : rb_big2ll(obj);
+  return obj;
+}
 
 SWIGINTERN int
 SWIG_AsVal_dec(long long)(VALUE obj, long long *val)
@@ -176,7 +201,14 @@ SWIG_From_dec(unsigned long long)(unsigned long long value)
 	  fragment="SWIG_ruby_failed",
 	  fragment="SWIG_LongLongAvailable") {
 %#ifdef SWIG_LONG_LONG_AVAILABLE
-%ruby_aux_method(long long, NUM2ULL,  (type != T_BIGNUM) ? NUM2ULL(obj) : rb_big2ull(obj))
+SWIGINTERN VALUE SWIG_AUX_NUM2ULL(VALUE* args)
+{
+  VALUE obj = args[0];
+  VALUE type = TYPE(obj);
+  long long *res = (long long *)(args[1]);
+  *res = (type != T_BIGNUM) ? NUM2ULL(obj) : rb_big2ull(obj);
+  return obj;
+}
 
 SWIGINTERN int
 SWIG_AsVal_dec(unsigned long long)(VALUE obj, unsigned long long *val)
@@ -188,6 +220,10 @@ SWIG_AsVal_dec(unsigned long long)(VALUE obj, unsigned long long *val)
     a[0] = obj;
     a[1] = (VALUE)(&v);
     if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2ULL), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
+#if SWIG_VERSION >= 0x040400
+      if (rb_funcall(obj, swig_lowerthan_id, 1, INT2FIX(0)) != Qfalse)
+        return SWIG_OverflowError;
+#endif
       if (val) *val = v;
       return SWIG_OK;
     }
@@ -204,7 +240,15 @@ SWIG_AsVal_dec(unsigned long long)(VALUE obj, unsigned long long *val)
 }
 
 %fragment(SWIG_AsVal_frag(double),"header",fragment="SWIG_ruby_failed") {
-%ruby_aux_method(double, NUM2DBL, NUM2DBL(obj); (void)type)
+SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE* args)
+{
+  //VALUE *args = (VALUE *)arg;
+  VALUE obj = args[0];
+  VALUE type = TYPE(obj);
+  double *res = (double *)(args[1]);
+  *res = NUM2DBL(obj); (void)type;
+  return obj;
+}
 
 SWIGINTERN int
 SWIG_AsVal_dec(double)(VALUE obj, double *val)

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

@@ -77,6 +77,10 @@ typedef struct WXRUBY_EXPORT swig_class {
   int trackObjects;
 } swig_class;
 
+#if SWIG_VERSION >= 0x040400
+extern ID swig_lowerthan_id;
+#endif
+
 /*
   If your swig extension is to be run within an embedded ruby and has
   director callbacks, you should set -DRUBY_EMBEDDED during compilation.  

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

@@ -54,6 +54,10 @@ SWIGRUNTIMEINLINE void SWIG_RubyUnlinkObjects(void* ptr) {
   }
 }
 
+SWIGRUNTIMEINLINE void SWIG_RubyIterateTrackings( void(*meth)(void* ptr, VALUE obj) ) {
+  wxRuby_IterateTracking(meth);
+}
+
 
 #ifdef __cplusplus
 }