wxruby3 1.3.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed10da8feaf6d3e77a775f3386dd9970314810239e7e4ce1c2c447658f6f4106
-  data.tar.gz: 125e2ddedb7148987456508b887dacae1262753a408cd39503faff80fe6435cc
+  metadata.gz: db9a443c40a2d1cd6ea3d993fe894ad61d1ce737c2a871877ef88ca06d39a629
+  data.tar.gz: 43cd46e0283fb6c6706362caa9c6c098bc2cff55216e1d98509c04912afdcf6b
 SHA512:
-  metadata.gz: dbe29edc61e3c139efec7d90d5f80b17b3671c141f3f6f3421905320de87b2900e90785bd83550e6b9d502bb184bef4a58c5061c7271629dc5f83d4c2f55ac94
-  data.tar.gz: 2b420414ee1c4b8eefa3fa797c5452e8490048876bfe2172fa14f8ffdd4937c907a4714c6af1650768e91cab08f4746881b5c19989bf66778f4ed4a1d2506020
+  metadata.gz: 67d5f62560609aa87f68563a8a51304e87242ca9a084d74ce7f4b2bb65e8765a0d349530c04716d5e34a22e0d62a61e1a2f127fc4a6ebc05f0b4b1591357fd66
+  data.tar.gz: bafef4ef1d2f06912ccb0c0dad7d86ed236b6c81862c0309e05fad54de634448d18d78f78bef43d70d1952abaeb38fafb86c7624f015597e6ed5aa46e3dbc602

data/INSTALL.md

@@ -14,13 +14,13 @@ The default gem installation command
 gem install wxruby3
 ``` 
 
-and the setup command  
+and the setup command  (only needed for installations without matching prebuilt binary package) 
 
 ```shell
 wxruby setup
 ```
 
-for installations without prebuilt binary packages should always result in a successfully installed wxRuby3 version.
+should always result in a successfully installed wxRuby3 version.
 
 > **NOTE**<br>
 > Currently installing the wxRuby3 gem for the system supplied Ruby on MacOSX systems does not work.<br>
@@ -71,16 +71,15 @@ The standard release artifacts at [Github](https://github.com/mcorino/wxRuby3/re
 packages for all supported OS platforms which are automatically built and uploaded for every release.<br>
 The following tables lists the packages provided by the current wxRuby3 release process:
 
-| OS      | Distributions                 | Architectures           | Rubies                                             |
-|---------|-------------------------------|-------------------------|----------------------------------------------------|
-| Linux   | OpenSuSE Leap (latest stable) | x86_64 <b>and</b> ARM64 | Distro provided Ruby <b>and</b> Latest stable Ruby |  
-| Linux   | Fedora (latest stable)        | x86_64 <b>and</b> ARM64 | Distro provided Ruby <b>and</b> Latest stable Ruby |  
-| Linux   | Debian (latest stable)        | x86_64 <b>and</b> ARM64 | Distro provided Ruby <b>and</b> Latest stable Ruby |  
-| Linux   | Ubuntu (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 12                     | x86_64 <b>and</b> ARM64 | Latest stable Ruby                                 |
-| OSX     | MacOSX 13                     | x86_64 <b>and</b> ARM64 | Latest stable Ruby                                 |
-| OSX     | MacOSX 14                     | ARM64                   | Latest stable Ruby                                 |
+| OS      | Distributions                          | Architectures           | Rubies                                             |
+|---------|----------------------------------------|-------------------------|----------------------------------------------------|
+| Linux   | OpenSuSE Leap (at least latest stable) | x86_64 <b>and</b> ARM64 | Distro provided Ruby <b>and</b> Latest stable Ruby |  
+| Linux   | Fedora (at least latest stable)        | x86_64 <b>and</b> ARM64 | Distro provided Ruby <b>and</b> Latest stable Ruby |  
+| 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                                 |
 
 ### User created packages
 
@@ -300,6 +299,11 @@ The initial message shown (between lines starting with '---' ) is indicative of
 on options passed to the setup command.<br>
 Building the wxRuby3 native extensions and generating reference documentation will always happen.
 
+Depending on your configuration the `setup` command will take quite a while. On a recent, modern PC with multicore 
+high-end CPU and plenty of memory doing a full source build (both wxWidgets and wxRuby3 libraries) typically takes 
+10-15 minutes. For PC's with older CPU's this could however take up to a full hour (of which the larger part is take 
+up by building the wxWidgets libraries). 
+
 #### Disable prompting for automatic install 
 
 To prevent having the setup procedure asking consent the setup procedure can be started with the `--autoinstall` option 

data/README.md

@@ -17,8 +17,8 @@ Reviving wxRuby
 
 wxRuby3 is a cross-platform GUI library for Ruby, based on the mature [wxWidgets](https://wxwidgets.org)
 GUI toolkit for C++. It uses native widgets wherever possible, providing
-the correct look, feel and behaviour to GUI applications on Windows, OS
-X and Linux/GTK. wxRuby aims to provide a comprehensive solution to
+the correct look, feel and behaviour to GUI applications on Windows, macOS
+and Linux/GTK. wxRuby aims to provide a comprehensive solution to
 developing professional-standard desktop applications in Ruby. 
 
 ## Usage examples
@@ -136,7 +136,8 @@ wxruby setup
 This last command is a fully automated setup procedure provided by the wxRuby3 **CLI** installed with the gem. This 
 procedure (by default) will analyze your system and install (after asking your consent) any missing software 
 requirements and build the wxRuby3 extension libraries (including a embedded copy of wxWidgets if necessary). It may 
-take quite a while depending on your system but you can mostly sit back and relax.
+take quite a while depending on your system (around 10-15 minutes on a modern PC but could be significantly longer
+on 'older' PC's) but you can mostly sit back and relax.
 
 > **NOTE**<br>
 > A source based installation requires the availability of the Ruby development headers. User installed Rubies in most cases

data/ext/wxruby3/include/wxRubyApp.h

@@ -68,15 +68,15 @@ public:
       else if (rb_obj_is_kind_of(rb_obj, wxRuby_GetDefaultEventClass()) )
         rb_gc_mark(rb_obj);
     }
-    else if (TYPE(rb_obj) == T_ARRAY )
-    {
-      VALUE proc = rb_ary_entry(rb_obj, 0);
-      if (rb_obj_is_kind_of(proc, rb_cProc) || rb_obj_is_kind_of(proc, rb_cMethod))
-      {
-        // keep the async call alive
-        rb_gc_mark(rb_obj);
-      }
-    }
+//    else if (TYPE(rb_obj) == T_ARRAY )
+//    {
+//      VALUE proc = rb_ary_entry(rb_obj, 0);
+//      if (rb_obj_is_kind_of(proc, rb_cProc) || rb_obj_is_kind_of(proc, rb_cMethod))
+//      {
+//        // keep the async call alive
+//        rb_gc_mark(rb_obj);
+//      }
+//    }
   }
 
   // Implements GC protection across wxRuby. Always called because

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

@@ -189,6 +189,9 @@ namespace Swig {
     }
   };
 
+// SWIG < 4.3.0
+#if SWIG_VERSION < 0x040300
+
   /* Simple thread abstraction for pthreads on win32 */
 #ifdef __THREAD__
 # define __PTHREAD__
@@ -219,8 +222,14 @@ namespace Swig {
     }
   };
 # define SWIG_GUARD(mutex) Guard _guard(mutex)
+# define SWIG_GUARD_DEFINITION(_cls, _mutex) pthread_mutex_t _cls::_mutex
+# define SWIG_GUARD_DECLARATION(_mutex) static pthread_mutex_t _mutex
 #else
 # define SWIG_GUARD(mutex)
+# define SWIG_GUARD_DEFINITION(_cls, _mutex)
+# define SWIG_GUARD_DECLARATION(_mutex)
+#endif
+
 #endif
 
   /* director base class */
@@ -258,9 +267,7 @@ namespace Swig {
   private:
     typedef std::map<void *, GCItem_var> swig_ownership_map;
     mutable swig_ownership_map swig_owner;
-#ifdef __PTHREAD__
-    static pthread_mutex_t swig_mutex_own;
-#endif
+    SWIG_GUARD_DECLARATION(swig_mutex_own);
 
   public:
     template <typename Type>
@@ -287,4 +294,5 @@ namespace Swig {
 
     swig_ruby_owntype swig_release_ownership(void *vptr) const;
   };
+  SWIG_GUARD_DEFINITION(Director, swig_mutex_own);
 }

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

@@ -12,8 +12,22 @@ extern "C" {
 #endif
 
 WXRUBY_EXPORT VALUE
-SWIG_Ruby_AppendOutput(VALUE target, VALUE o);
+SWIG_wxRuby_AppendOutput(VALUE target, VALUE o, int is_void);
 
 #ifdef __cplusplus
 }
 #endif
+
+/* SWIG >= 4.3.0 version */
+inline VALUE
+SWIG_Ruby_AppendOutput(VALUE target, VALUE o, int is_void)
+{
+  return SWIG_wxRuby_AppendOutput(target, o, is_void);
+}
+
+/* SWIG < 4.3.0 version */
+inline VALUE
+SWIG_Ruby_AppendOutput(VALUE target, VALUE o)
+{
+  return SWIG_wxRuby_AppendOutput(target, o, -1);
+}

data/ext/wxruby3/swig/mark_free_impl.i

@@ -50,6 +50,21 @@ WXRUBY_EXPORT void GC_SetWindowDeleted(void *ptr)
   // garbage collected at next phase
   wxRuby_ReleaseEvtHandlerProcs(ptr);
 
+  // wxWidgets requires any pushed event handlers to be popped before
+  // the window gets destroyed. Handle this automatically in wxRuby3.
+  wxWindowBase* wxwin = (wxWindowBase*)ptr;
+  wxEvtHandler* wxevh = wxwin->GetEventHandler();
+  while (wxevh && wxevh != wxwin)
+  {
+    wxEvtHandler* wxevh_next = wxevh->GetNextHandler();
+    VALUE rb_evh = SWIG_RubyInstanceFor(wxevh);
+    // only remove tracked Ruby instantiated handlers since others are
+    // handlers internally set by wxWidgets C++ code and will be removed there
+    if (!NIL_P(rb_evh))
+      wxwin->RemoveEventHandler(wxevh); // remove and forget
+    wxevh = wxevh_next;
+  }
+
   // Wx calls this by standard after the window destroy event is
   // handled, but we need to call it before while the object link is
   // still around
@@ -219,10 +234,27 @@ WXRUBY_EXPORT void GC_mark_wxWindow(void *ptr)
       std::wcout << "* GC_mark_wxWindow - found sizer" << std::endl;
 #endif
     VALUE rb_sizer = SWIG_RubyInstanceFor(wx_sizer);
-	if ( rb_sizer != Qnil )
+	  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
+  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
+    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;
@@ -235,22 +267,26 @@ WXRUBY_EXPORT void GC_mark_wxWindow(void *ptr)
       std::wcout << "* GC_mark_wxWindow - found caret" << std::endl;
 #endif
     VALUE rb_caret = SWIG_RubyInstanceFor(wx_caret);
-	rb_gc_mark(rb_caret);
+	  rb_gc_mark(rb_caret);
   }
 
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>2)
-    std::wcout << "* GC_mark_wxWindow - getting droptarget" << std::endl;
-#endif
-  wxDropTarget* wx_droptarget = wx_win->GetDropTarget();
-  if ( wx_droptarget )
+  // 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 - found droptarget" << std::endl;
+      std::wcout << "* GC_mark_wxWindow - getting droptarget" << std::endl;
 #endif
-    VALUE rb_droptarget = SWIG_RubyInstanceFor(wx_droptarget);
-	rb_gc_mark(rb_droptarget);
+    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
+      VALUE rb_droptarget = SWIG_RubyInstanceFor(wx_droptarget);
+      rb_gc_mark(rb_droptarget);
+    }
   }
 
 #ifdef __WXRB_DEBUG__

data/ext/wxruby3/swig/wx.i

@@ -222,6 +222,7 @@ WXRUBY_EXPORT VALUE wxRuby_WrapWxObjectInRuby(wxObject *wx_obj)
 // generated on the C++ side.
 // Cached reference to EvtHandler evt_type_id -> ruby_event_class map
 static VALUE Evt_Type_Map = NULL;
+static VALUE WxRuby_cAsyncProcCallEvent = Qnil;
 
 #ifdef __WXRB_DEBUG__
 WXRUBY_EXPORT VALUE wxRuby_WrapWxEventInRuby(void* rcvr, wxEvent *wx_event)
@@ -240,17 +241,31 @@ WXRUBY_EXPORT VALUE wxRuby_WrapWxEventInRuby(wxEvent *wx_event)
     std::wcout << "* wxRuby_WrapWxEventInRuby(rcvr=" << rcvr << ", " << wx_event << ":{" << wx_event->GetEventType() << "@" << wx_event->GetEventObject() << "})" << std::endl;
 #endif
 
-  // Then, look up the event type in this hash (MUCH faster than calling
-  // EvtHandler.evt_class_for_type method)
-  VALUE rb_event_type_id =  INT2NUM( wx_event->GetEventType() );
-  VALUE rb_event_class = rb_hash_aref(Evt_Type_Map, rb_event_type_id);
-
-  // Check we have a valid class; warn and map to default Wx::Event if not
-  if ( NIL_P(rb_event_class) )
+  VALUE rb_event_type_id = INT2NUM(wx_event->GetEventType());
+  VALUE rb_event_class = Qnil;
+  // wxEVT_ASYNC_METHOD_CALL is a special case which has no Ruby class mapping registered
+  if (wx_event->GetEventType() == wxEVT_ASYNC_METHOD_CALL)
   {
-    rb_event_class = wxRuby_GetDefaultEventClass ();
-    wxString class_name( wx_event->GetClassInfo()->GetClassName() );
-    rb_warning("Unmapped event type %i (%s)", wx_event->GetEventType(), (const char *)class_name.mb_str());
+    if (WxRuby_cAsyncProcCallEvent == Qnil)
+    {
+      WxRuby_cAsyncProcCallEvent = rb_eval_string("Wx::AsyncProcCallEvent");
+    }
+    rb_event_class = WxRuby_cAsyncProcCallEvent;
+  }
+  else
+  {
+    // Then, look up the event type in this hash (MUCH faster than calling
+    // EvtHandler.evt_class_for_type method)
+    rb_event_type_id =  INT2NUM( wx_event->GetEventType());
+    rb_event_class = rb_hash_aref(Evt_Type_Map, rb_event_type_id);
+
+    // Check we have a valid class; warn and map to default Wx::Event if not
+    if (NIL_P(rb_event_class))
+    {
+      rb_event_class = wxRuby_GetDefaultEventClass ();
+      wxString class_name( wx_event->GetClassInfo()->GetClassName() );
+      rb_warning("Unmapped event type %i (%s)", wx_event->GetEventType(), (const char *)class_name.mb_str());
+    }
   }
 
   // Now, see if we have a tracked instance of this object already
@@ -264,7 +279,7 @@ WXRUBY_EXPORT VALUE wxRuby_WrapWxEventInRuby(wxEvent *wx_event)
   // really the right thing, and not some stale reference.
   if ( rb_event != Qnil )
   {
-    if ( rb_obj_is_kind_of(rb_event, rb_event_class )  )
+    if (rb_obj_is_kind_of(rb_event, rb_event_class))
       return rb_event; // OK
     else
       SWIG_RubyRemoveTracking((void *)wx_event); // Remove stale ref
@@ -275,7 +290,10 @@ WXRUBY_EXPORT VALUE wxRuby_WrapWxEventInRuby(wxEvent *wx_event)
   rb_event = Data_Wrap_Struct(rb_event_class, 0, 0, 0);
   DATA_PTR(rb_event) = wx_event;
   // do not forget to mark the instance with the mangled swig type name
-  swig_type_info*  type = wxRuby_GetSwigTypeForClass(rb_event_class);
+  // (as there is no swig_type for the Wx::AsyncProcCallEvent class use it's base Wx::Event)
+  swig_type_info*  type = wx_event->GetEventType() == wxEVT_ASYNC_METHOD_CALL ?
+                            wxRuby_GetSwigTypeForClass(wxRuby_GetDefaultEventClass()) :
+                            wxRuby_GetSwigTypeForClass(rb_event_class);
   rb_iv_set(rb_event, "@__swigtype__", rb_str_new2(type->name));
 
 #if __WXRB_DEBUG__

data/lib/wx/aui/auifloatframe.rb

@@ -11,7 +11,7 @@ class Wx::AUI::AuiFloatingFrame
   # that designates the event skipped.
   if Wx::WXWIDGETS_VERSION < '3.3'
     wx_initialize = instance_method :initialize
-    define_method :initialize do |*args|
+    wx_redefine_method :initialize do |*args|
       wx_initialize.bind(self).call(*args)
       evt_window_destroy { |evt| evt.skip }
     end

data/lib/wx/aui/auimanager.rb

@@ -2,19 +2,55 @@
 #
 # This software is released under the MIT license.
 
-class Wx::AUI::AuiManager
-  def get_all_panes
-    ::Enumerator.new { |y| each_pane { |p| y << p } }
-  end
-  alias :all_panes :get_all_panes
-
-  unless Wx::EvtHandler.event_type_for_name(:evt_aui_find_manager)
-    # missing from XML API refs
-    Wx::EvtHandler.register_event_type Wx::EvtHandler::EventType[
-      'evt_aui_find_manager', 0,
-      Wx::AUI::EVT_AUI_FIND_MANAGER,
-      Wx::AUI::AuiManagerEvent
-    ] if Wx::AUI.const_defined?(:EVT_AUI_FIND_MANAGER)
-  end
+module Wx
+  module AUI
+
+    class AuiManager
+
+      wx_each_pane = instance_method(:each_pane)
+      wx_redefine_method(:each_pane) do |&block|
+        if block
+          wx_each_pane.bind(self).call(&block)
+        else
+          ::Enumerator.new { |y| wx_each_pane.bind(self).call { |p| y << p } }
+        end
+      end
+
+      def get_all_panes
+        each_pane.to_a
+      end
+      alias :all_panes :get_all_panes
+
+      unless Wx::EvtHandler.event_type_for_name(:evt_aui_find_manager)
+        # missing from XML API refs
+        Wx::EvtHandler.register_event_type Wx::EvtHandler::EventType[
+                                             'evt_aui_find_manager', 0,
+                                             Wx::AUI::EVT_AUI_FIND_MANAGER,
+                                             Wx::AUI::AuiManagerEvent
+                                           ] if Wx::AUI.const_defined?(:EVT_AUI_FIND_MANAGER)
+      end
+    end
+
+    if WXWIDGETS_VERSION >= '3.3.0'
+
+      class AuiTabLayoutInfo < AuiDockLayoutInfo
 
+        alias :pages :get_pages
+        alias :pages= :set_pages
+
+      end
+
+      class AuiDeserializer
+
+        wx_initialize = instance_method(:initialize)
+        wx_redefine_method(:initialize) do |manager|
+          wx_initialize.bind(self).call(manager)
+          @manager = manager # prevent GC for lifetime of deserializer
+        end
+
+      end
+
+    end
+
+  end
 end

data/lib/wx/aui/auinotebook.rb

@@ -11,7 +11,7 @@ class Wx::AUI::AuiNotebook
   # that designates the event skipped.
   if Wx::WXWIDGETS_VERSION < '3.3'
     wx_initialize = instance_method :initialize
-    define_method :initialize do |*args|
+    wx_redefine_method :initialize do |*args|
       wx_initialize.bind(self).call(*args)
       evt_window_destroy { |evt| evt.skip }
     end

data/lib/wx/aui/require.rb

@@ -10,5 +10,3 @@ require_relative './auimanager'
 require_relative './auinotebook'
 require_relative './auifloatframe'
 require_relative './aui_tab_ctrl'
-
-Wx::Dialog.setup_dialog_functors(Wx::AUI)

data/lib/wx/core/acceleratortable.rb

@@ -16,7 +16,7 @@ class Wx::AcceleratorTable
   # and allow entries to be specified in terser form [mod, key, id]
   # rather than full AcceleratorEntry.new call.
   wx_init = self.instance_method(:initialize)
-  define_method(:initialize) do | *args |
+  wx_redefine_method(:initialize) do | *args |
     # Test for old-style arg passing in a single array
     if args.length == 1 and args.first.kind_of?(Array) and
        args.first.all? { | e | e.kind_of?(Wx::AcceleratorEntry) }

data/lib/wx/core/animation.rb

@@ -13,7 +13,7 @@ module Wx
     # non-existent file is given to the constructor; otherwise, wx Widgets
     # just carries on with an empty bitmap, which may cause faults later
     wx_init = self.instance_method(:initialize)
-    define_method(:initialize) do | *args |
+    wx_redefine_method(:initialize) do | *args |
       if args[0].kind_of? String
         if not File.exist?( File.expand_path(args[0]) )
           Kernel.raise( ArgumentError,
@@ -33,7 +33,7 @@ module Wx
 
       # Redefine this method to accept either a single animation or an animation bundle
       wx_set_animation = self.instance_method(:set_animation)
-      define_method(:set_animation) do | arg |
+      wx_redefine_method(:set_animation) do | arg |
         if Wx::Animation === arg
           arg = Wx::AnimationBundle.new(arg)
         end

data/lib/wx/core/app.rb

@@ -95,7 +95,7 @@ class Wx::App
   # WxRuby. Such messages usually indicate that the API is being used
   # incorrectly; the file/line reference points to the place in the
   # WxWidgets source code where the assertion was made.
-  def on_assert_failure(file, line, func, condition, message)
+  wx_redefine_method :on_assert_failure do |file, line, func, condition, message|
     warn %Q{Wx WARNING: ASSERT #{condition} fired with "#{message}" at (#{func}@#{file}:#{line})}
   end
 

data/lib/wx/core/array_ext.rb

@@ -25,6 +25,7 @@ module Wx
       x, y = self
       Wx::RealPoint.new(x || Wx::DEFAULT_COORD, y || Wx::DEFAULT_COORD)
     end
+    alias :to_real :to_real_point
 
   end
 

data/lib/wx/core/artprovider.rb

@@ -14,25 +14,25 @@ class Wx::ArtProvider
 
   class << self 
     wx_push_back = instance_method(:push_back)
-    define_method(:push_back) do | art_prov |
+    wx_redefine_method(:push_back) do | art_prov |
       wx_push_back.bind(self).call(art_prov)
       @__art_provs.push(art_prov)
     end
 
     wx_pop = instance_method(:pop)
-    define_method(:pop) do
+    wx_redefine_method(:pop) do
       wx_pop.bind(self).call
       @__art_provs.pop
     end
 
     wx_push = instance_method(:push)
-    define_method(:push) do | art_prov |
+    wx_redefine_method(:push) do | art_prov |
       wx_push.bind(self).call(art_prov)
       @__art_provs.unshift(art_prov)
     end
 
     wx_delete = instance_method(:delete)
-    define_method(:delete) do | art_prov |
+    wx_redefine_method(:delete) do | art_prov |
       wx_delete.bind(self).call(art_prov)
       @__art_provs.delete(art_prov)
     end

data/lib/wx/core/bitmap.rb

@@ -78,7 +78,7 @@ module Wx
     # later. Also, be helpful and try to guess the bitmap type from the
     # filename if it's not specified
     wx_init = self.instance_method(:initialize)
-    define_method(:initialize) do | *args |
+    wx_redefine_method(:initialize) do | *args |
       # If creating from a file, check it exists
       if args[0].kind_of? String
         if not File.exist?( File.expand_path(args[0]) )

data/lib/wx/core/bitmap_combobox.rb

@@ -11,7 +11,7 @@ module Wx
   class BitmapComboBox < Wx::ComboBox
 
     wx_append = instance_method :append
-    define_method :append do |item, *rest| #bitmap=Wx::NULL_BITMAP, data=nil|
+    wx_redefine_method :append do |item, *rest| #bitmap=Wx::NULL_BITMAP, data=nil|
       if ::Array === item
         super(item, *rest)
       elsif rest.empty? || Wx::Bitmap === rest.first
@@ -22,7 +22,7 @@ module Wx
     end
 
     wx_insert = instance_method :insert
-    define_method :insert do |item, *rest| # bitmap, pos, data=nil|
+    wx_redefine_method :insert do |item, *rest| # bitmap, pos, data=nil|
       if ::Array === item
         super(item, *rest)
       elsif rest.empty? || Wx::Bitmap === rest.first

data/lib/wx/core/brush.rb

@@ -6,8 +6,16 @@
 # Copyright 2004-2007, wxRuby development team
 # released under the MIT-like wxRuby2 license
 
+require_relative './enum'
+
 module Wx
 
   TheBrushList = Wx::Brush
 
+  class BrushStyle < Wx::Enum
+
+    set_non_distinct(%i[BRUSHSTYLE_INVALID BRUSHSTYLE_FIRST_HATCH BRUSHSTYLE_LAST_HATCH])
+
+  end
+
 end

data/lib/wx/core/clientdc.rb

@@ -14,7 +14,7 @@ class Wx::ClientDC
   # always be used via Window#paint, which takes a block receiving the
   # DC. This ensures that the DC is cleaned up at the correct time,
   # avoiding errors and segfaults on exit.
-  define_method(:initialize) do | *args |
+  wx_redefine_method(:initialize) do | *args |
     Kernel.raise RuntimeError,
                  "Do not instantiate ClientDC directly; use Window#paint",
                  caller[1..-1]

data/lib/wx/core/clipboard.rb

@@ -29,7 +29,7 @@ class Wx::Clipboard
         Kernel.raise "Could not open clipboard"
       end
       yield clip
-     ensure
+    ensure
        clip.close if clip
     end
   end
@@ -41,19 +41,19 @@ class Wx::Clipboard
   # These methods affect the clipboard contents; each time, update the
   # record with the changed data contents
   wx_add_data = instance_method(:add_data)
-  define_method(:add_data) do | the_data |
+  wx_redefine_method(:add_data) do | the_data |
     @@__clip_data << the_data
     wx_add_data.bind(self).call(the_data)
   end
 
   wx_clear = instance_method(:clear)
-  define_method(:clear) do 
+  wx_redefine_method(:clear) do 
     wx_clear.bind(self).call
     @@__clip_data.clear
   end
 
   wx_set_data = instance_method(:set_data)
-  define_method(:set_data) do | the_data |
+  wx_redefine_method(:set_data) do | the_data |
     @@__clip_data = [ the_data ]
     wx_set_data.bind(self).call(the_data)
   end

data/lib/wx/core/colour.rb

@@ -17,7 +17,7 @@ module Wx
     # invalid colour value is given. This might be an unknown colour
     # string (eg 'dark blue') or out-of-bounds integer values (<0 or >255)
     wx_init = self.instance_method(:initialize)
-    define_method(:initialize) do | *args |
+    wx_redefine_method(:initialize) do | *args |
       begin
         wx_init.bind(self).call(*args)
       # Invalid integer values raise SWIG 'no matching func'

data/lib/wx/core/combobox.rb

@@ -15,7 +15,7 @@ module Wx
     # redefine #clear method to take care of client data and to call the proper #clear_items method
     # (not the #clear method inherited from the TextEntry mixin)
     wx_clear = instance_method :clear_items
-    define_method :clear do
+    wx_redefine_method :clear do
       wx_clear.bind(self).call
     end