wxruby3 1.3.1 → 1.4.2

data/lib/wx/core/file_dialog.rb

@@ -13,7 +13,7 @@ module Wx
   class FileDialog
 
     wx_set_customize_hook = instance_method :set_customize_hook
-    define_method :set_customize_hook do |hook|
+    wx_redefine_method :set_customize_hook do |hook|
       wx_set_customize_hook.bind(self).call(hook)
       @hook = hook # cache hook to prevent premature GC collection
     end

data/lib/wx/core/find_replace_dialog.rb

@@ -15,13 +15,13 @@ module Wx
     # the data object so we need to keep it alive here
 
     wx_initialize = instance_method :initialize
-    define_method :initialize do |parent, data, *args|
+    wx_redefine_method :initialize do |parent, data, *args|
       wx_initialize.bind(self).call(parent, data, *args)
       @fr_data = data
     end
 
     wx_set_data = instance_method :set_data
-    define_method :set_data do |data|
+    wx_redefine_method :set_data do |data|
       wx_set_data.bind(self).call(data)
       @fr_data = data
     end

data/lib/wx/core/functions.rb

@@ -13,7 +13,7 @@ module Wx
     # Allow this to be called with keyword parameters, and avoid
     # segfaults on OS X with bad params
     wx_about_box = self.instance_method(:about_box)
-    define_method(:about_box) do | info, parent=nil |
+    wx_redefine_method(:about_box) do | info, parent=nil |
       case info
       when Wx::AboutDialogInfo
         ab_info = info

data/lib/wx/core/genericdirctrl.rb

@@ -37,7 +37,7 @@ class Wx::GenericDirCtrl
   end
   
   wx_get_tree_ctrl = instance_method(:get_tree_ctrl)
-  define_method(:get_tree_ctrl) do 
+  wx_redefine_method(:get_tree_ctrl) do 
     tree = wx_get_tree_ctrl.bind(self).call
     tree.extend(DirCtrlTree)
     tree

data/lib/wx/core/geometry.rb

@@ -23,7 +23,7 @@ module Wx
     private :add, :sub, :mul, :div
 
     wx_assign = instance_method :assign
-    define_method :assign do |pt|
+    wx_redefine_method :assign do |pt|
       wx_assign.bind(self).call(pt)
       self
     end
@@ -76,7 +76,7 @@ module Wx
     private :add, :sub, :mul, :div
 
     wx_assign = instance_method :assign
-    define_method :assign do |pt|
+    wx_redefine_method :assign do |pt|
       wx_assign.bind(self).call(pt)
       self
     end

data/lib/wx/core/graphics_pen_info.rb

@@ -10,7 +10,7 @@ class Wx::GraphicsPenInfo
 
   # make Wx::GraphicsPenInfo#dashes return self
   wx_dashes = instance_method :dashes
-  define_method :dashes do |*args|
+  wx_redefine_method :dashes do |*args|
     wx_dashes.bind(self).call(*args)
     self
   end

data/lib/wx/core/helpprovider.rb

@@ -16,7 +16,7 @@ class Wx::HelpProvider
     # easiest way is to make the currently set one an instance variable
     # of this class
     wx_set = instance_method :set
-    define_method(:set) do | help_provider |
+    wx_redefine_method(:set) do | help_provider |
       wx_set.bind(self).call(help_provider)
       @__hp__ = help_provider
     end

data/lib/wx/core/icon.rb

@@ -44,7 +44,7 @@ module Wx
     # just carries on with an empty icon, which may cause faults
     # later. Also guess icon type from filename, if not specified.
     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, "Icon file does not exist: #{args[0]}")

data/lib/wx/core/image.rb

@@ -58,7 +58,7 @@ module Wx
     # later. Also, if loading from a file, and the type is not specified,
     # try to guess it from the filename extension
     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, "Image file does not exist: #{args[0]}")
@@ -103,7 +103,7 @@ module Wx
     end
 
     wx_compute_histogram = instance_method :compute_histogram
-    define_method :compute_histogram do
+    wx_redefine_method :compute_histogram do
       hist_hash = wx_compute_histogram.bind(self).call
       hist_hash.extend Histogram
       hist_hash

data/lib/wx/core/imagelist.rb

@@ -10,7 +10,7 @@ class Wx::ImageList
 
   # provide seamless support for adding icons on all platforms
   wx_add = instance_method :add
-  define_method :add do |*args|
+  wx_redefine_method :add do |*args|
     if Wx::PLATFORM == 'WXMSW' && args.size == 1 && Wx::Icon === args.first
       args[0] = args.first.to_bitmap
     end

data/lib/wx/core/locale.rb

@@ -32,22 +32,22 @@ class Wx::Locale
     # as wxWidgets defines an enum wxLanguage but still uses a mix of enum args and int args
     # to specify languages we need to fix some things here to make that easier
     wx_is_available = Wx::Locale.method(:is_available)
-    define_method :is_available do |lang|
+    wx_redefine_method :is_available do |lang|
       wx_is_available.call(lang.to_i)
     end
 
     wx_get_language_info = Wx::Locale.method(:get_language_info)
-    define_method :get_language_info do |lang|
+    wx_redefine_method :get_language_info do |lang|
       wx_get_language_info.call(lang.to_i)
     end
 
     wx_get_language_name = Wx::Locale.method(:get_language_name)
-    define_method :get_language_name do |lang|
+    wx_redefine_method :get_language_name do |lang|
       wx_get_language_name.call(lang.to_i)
     end
 
     wx_get_language_canonical_name = Wx::Locale.method(:get_language_canonical_name)
-    define_method :get_language_canonical_name do |lang|
+    wx_redefine_method :get_language_canonical_name do |lang|
       wx_get_language_canonical_name.call(lang.to_i)
     end
   end
@@ -66,7 +66,7 @@ class Wx::Locale
   # as wxWidgets defines an enum wxLanguage but still uses a mix of enum args and int args
   # to specify languages we need to fix some things here to make that easier
   wx_init = instance_method(:init)
-  define_method :init do |*args|
+  wx_redefine_method :init do |*args|
     if args.empty? || ::String === args.first
       wx_init.bind(self).call(*args)
     else

data/lib/wx/core/log.rb

@@ -48,13 +48,13 @@ module Wx
   class LogChain
 
     wx_initialize = instance_method :initialize
-    define_method :initialize do |new_log|
+    wx_redefine_method :initialize do |new_log|
       wx_initialize.bind(self).call(new_log)
       @new_log = new_log # cache to prevent premature GC collection; old_log managed in C++ wrapper
     end
 
     wx_set_log = instance_method :set_log
-    define_method :set_log do |new_log|
+    wx_redefine_method :set_log do |new_log|
       wx_set_log.bind(self).call(new_log)
       @new_log = new_log # cache to prevent premature GC collection; old_log managed in C++ wrapper
     end
@@ -100,32 +100,32 @@ module Wx
     private :setup_log_info
 
     wx_log_generic = self.instance_method :log_generic
-    define_method :log_generic do |lvl, fmt, *args, filename: nil, line: 0, func: nil, component: nil|
+    wx_redefine_method :log_generic do |lvl, fmt, *args, filename: nil, line: 0, func: nil, component: nil|
       wx_log_generic.bind(self).call(lvl, *setup_log_info(fmt, args, filename, line, func, component))
     end
 
     wx_log_info = self.instance_method :log_info
-    define_method :log_info do |fmt, *args, filename: nil, line: 0, func: nil, component: nil|
+    wx_redefine_method :log_info do |fmt, *args, filename: nil, line: 0, func: nil, component: nil|
       wx_log_info.bind(self).call(*setup_log_info(fmt, args, filename, line, func, component))
     end
 
     wx_log_verbose = self.instance_method :log_verbose
-    define_method :log_verbose do |fmt, *args, filename: nil, line: 0, func: nil, component: nil|
+    wx_redefine_method :log_verbose do |fmt, *args, filename: nil, line: 0, func: nil, component: nil|
       wx_log_verbose.bind(self).call(*setup_log_info(fmt, args, filename, line, func, component))
     end
 
     wx_log_message = self.instance_method :log_message
-    define_method :log_message do |fmt, *args, filename: nil, line: 0, func: nil, component: nil|
+    wx_redefine_method :log_message do |fmt, *args, filename: nil, line: 0, func: nil, component: nil|
       wx_log_message.bind(self).call(*setup_log_info(fmt, args, filename, line, func, component))
     end
 
     wx_log_warning = self.instance_method :log_warning
-    define_method :log_warning do |fmt, *args, filename: nil, line: 0, func: nil, component: nil|
+    wx_redefine_method :log_warning do |fmt, *args, filename: nil, line: 0, func: nil, component: nil|
       wx_log_warning.bind(self).call(*setup_log_info(fmt, args, filename, line, func, component))
     end
 
     wx_log_error = self.instance_method :log_error
-    define_method :log_error do |fmt, *args, filename: nil, line: 0, func: nil, component: nil|
+    wx_redefine_method :log_error do |fmt, *args, filename: nil, line: 0, func: nil, component: nil|
       wx_log_error.bind(self).call(*setup_log_info(fmt, args, filename, line, func, component))
     end
 

data/lib/wx/core/menu.rb

@@ -28,7 +28,7 @@ class Wx::Menu
 
   # Overload to provide Enumerator without block
   wx_each_item = instance_method :each_item
-  define_method :each_item do |&block|
+  wx_redefine_method :each_item do |&block|
     if block
       wx_each_item.bind(self).call(&block)
     else
@@ -56,7 +56,7 @@ class Wx::Menu
     class_eval do 
       meth_names.each do | meth |
         old_meth = instance_method(meth)
-        define_method(meth) do | *args |
+        wx_redefine_method(meth) do | *args |
           case args.first
             when Integer, Wx::Enum then old_meth.bind(self).call(*args)
             when String then old_meth.bind(self).call(Wx::ID_ANY, *args)
@@ -79,7 +79,7 @@ class Wx::Menu
     class_eval do 
       meth_names.each do | meth |
         old_meth = instance_method(meth)
-        define_method(meth) do | pos, *args |
+        wx_redefine_method(meth) do | pos, *args |
           case args.first
             when Integer, Wx::Enum then old_meth.bind(self).call(pos, *args)
             when String then old_meth.bind(self).call(pos, Wx::ID_ANY, *args)

data/lib/wx/core/module_ext.rb

@@ -0,0 +1,16 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+module Kernel
+
+  def wx_redefine_method(mtd, &block)
+    warn_lvl = $VERBOSE
+    $VERBOSE = nil
+    undef_method(mtd)
+    define_method(mtd, &block)
+  ensure
+    $VERBOSE = warn_lvl
+  end
+
+end

data/lib/wx/core/owner_drawn_combobox.rb

@@ -8,7 +8,7 @@ module Wx
 
     # make sure to honor the inherited common overloads
     wx_get_client_object = instance_method :get_client_object
-    define_method :get_client_object do |*args|
+    wx_redefine_method :get_client_object do |*args|
       if args.empty?
         super()
       else
@@ -16,7 +16,7 @@ module Wx
       end
     end
     wx_set_client_object = instance_method :set_client_object
-    define_method :set_client_object do |*args|
+    wx_redefine_method :set_client_object do |*args|
       if args.size < 2
         super(*args)
       else
@@ -32,7 +32,7 @@ module Wx
 
     # Overload to provide Enumerator without block
     wx_each_string = instance_method :each_string
-    define_method :each_string do |&block|
+    wx_redefine_method :each_string do |&block|
       if block
         wx_each_string.bind(self).call(&block)
       else

data/lib/wx/core/pen_info.rb

@@ -10,7 +10,7 @@ class Wx::PenInfo
 
   # make Wx::PenInfo#dashes return self
   wx_dashes = instance_method :dashes
-  define_method :dashes do |*args|
+  wx_redefine_method :dashes do |*args|
     wx_dashes.bind(self).call(*args)
     self
   end

data/lib/wx/core/persistence_manager.rb

@@ -22,12 +22,12 @@ module Wx
       # Cache the global instance to keep it safe from GC
 
       wx_get = instance_method :get
-      define_method :get do
+      wx_redefine_method :get do
         @the_manager ||= wx_get.bind(self).call
       end
 
       wx_set = instance_method :set
-      define_method :set do |pman|
+      wx_redefine_method :set do |pman|
         wx_set.bind(self).call(pman)
         @the_manager = pman
       end

data/lib/wx/core/rect.rb

@@ -61,7 +61,7 @@ class Wx::Rect
   end
 
   # next provide new constant versions
-  def offset(*args)
+  wx_redefine_method :offset do |*args|
     self.dup.offset!(*args)
   end
 

data/lib/wx/core/secret_store.rb

@@ -19,7 +19,7 @@ module Wx
 
     # Redefine the initialize method to auto-convert UTF-16/-32 strings to UTF-8 if possible.
     wx_init = self.instance_method(:initialize)
-    define_method(:initialize) do | *args |
+    wx_redefine_method(:initialize) do | *args |
       if args.size == 1 && ::String === args.first
         unless args.first.encoding == ::Encoding::UTF_8 || args.first.encoding == ::Encoding::ASCII_8BIT
           # convert in place unless frozen

data/lib/wx/core/simplehelpprovider.rb

@@ -41,7 +41,7 @@ class Wx::SimpleHelpProvider < Wx::HelpProvider
   def show_help(win)
     help_text = get_help(win)
     return false if help_text.empty?
-    tip = Wx::TipWindow.new(win, help_text, 100)
+    Wx::TipWindow.new(win, help_text, 100)
     true
   end
 end

data/lib/wx/core/sizer.rb

@@ -52,7 +52,7 @@ module Wx
 
     # Overload to provide Enumerator without block
     wx_each_child = instance_method :each_child
-    define_method :each_child do |&block|
+    wx_redefine_method :each_child do |&block|
       if block
         wx_each_child.bind(self).call(&block)
       else
@@ -65,7 +65,7 @@ module Wx
   class BoxSizer < Sizer
 
     wx_initialize = instance_method :initialize
-    define_method :initialize do |*args, &block|
+    wx_redefine_method :initialize do |*args, &block|
       wx_initialize.bind(self).call(*args)
       if block
         if block.arity == -1 or block.arity == 0
@@ -84,7 +84,7 @@ module Wx
   class WrapSizer < BoxSizer
 
     wx_initialize = instance_method :initialize
-    define_method :initialize do |*args, &block|
+    wx_redefine_method :initialize do |*args, &block|
       wx_initialize.bind(self).call(*args)
       if block
         if block.arity == -1 or block.arity == 0
@@ -103,7 +103,7 @@ module Wx
   class StaticBoxSizer < BoxSizer
 
     wx_initialize = instance_method :initialize
-    define_method :initialize do |*args, &block|
+    wx_redefine_method :initialize do |*args, &block|
       wx_initialize.bind(self).call(*args)
       if block
         if block.arity == -1 or block.arity == 0
@@ -122,7 +122,7 @@ module Wx
   class StdDialogButtonSizer < BoxSizer
 
     wx_initialize = instance_method :initialize
-    define_method :initialize do |*args, &block|
+    wx_redefine_method :initialize do |*args, &block|
       wx_initialize.bind(self).call(*args)
       if block
         if block.arity == -1 or block.arity == 0
@@ -141,7 +141,7 @@ module Wx
   class GridSizer < Sizer
 
     wx_initialize = instance_method :initialize
-    define_method :initialize do |*args, &block|
+    wx_redefine_method :initialize do |*args, &block|
       wx_initialize.bind(self).call(*args)
       self.instance_eval(&block) if block
     end
@@ -151,7 +151,7 @@ module Wx
   class FlexGridSizer < GridSizer
 
     wx_initialize = instance_method :initialize
-    define_method :initialize do |*args, &block|
+    wx_redefine_method :initialize do |*args, &block|
       wx_initialize.bind(self).call(*args)
       if block
         if block.arity == -1 or block.arity == 0
@@ -170,7 +170,7 @@ module Wx
   class GridBagSizer < FlexGridSizer
 
     wx_initialize = instance_method :initialize
-    define_method :initialize do |*args, &block|
+    wx_redefine_method :initialize do |*args, &block|
       wx_initialize.bind(self).call(*args)
       if block
         if block.arity == -1 or block.arity == 0

data/lib/wx/core/splash_screen.rb

@@ -15,7 +15,7 @@ class Wx::SplashScreen
   end
 
   # now redefine the overridden ctor to account for deviating arglist
-  def initialize(bitmap, splashstyle, milliseconds, parent = nil, *mixed_args, &block)
+  wx_redefine_method :initialize do |bitmap, splashstyle, milliseconds, parent = nil, *mixed_args, &block|
     # no zero-args ctor for use with XRC!
 
     real_args = begin

data/lib/wx/core/standard_paths.rb

@@ -10,7 +10,7 @@ module Wx
     class << self
 
       wx_get = instance_method :get
-      define_method :get do
+      wx_redefine_method :get do
         # cache the global singleton
         @instance ||= wx_get.bind(self).call
       end

data/lib/wx/core/task_bar_button.rb

@@ -9,7 +9,7 @@ module Wx
     class TaskBarButton
 
       wx_remove_thumb_bar_button = instance_method :remove_thumb_bar_button
-      define_method :remove_thumb_bar_button do |button|
+      wx_redefine_method :remove_thumb_bar_button do |button|
         button = button.get_id if button.is_a?(Wx::ThumbBarButton)
         wx_remove_thumb_bar_button.bind(self).call(button)
       end

data/lib/wx/core/text_entry.rb

@@ -11,7 +11,7 @@ module Wx
   module TextEntry
 
     wx_auto_complete = instance_method :auto_complete
-    define_method :auto_complete do |completer|
+    wx_redefine_method :auto_complete do |completer|
       if wx_auto_complete.bind(self).call(completer)
         @completer = completer.is_a?(Wx::TextCompleter) ? completer : nil # keep the Ruby object alive or cleanup
         true

data/lib/wx/core/textctrl.rb

@@ -58,14 +58,14 @@ module Wx
 
   class TextCtrl
     wx_op_append = instance_method :<<
-    define_method :<< do |o|
+    wx_redefine_method :<< do |o|
       wx_op_append.bind(self).call(o.to_s)
       self
     end
 
     # Overload to provide Enumerator without block
     wx_each_line = instance_method :each_line
-    define_method :each_line do |&block|
+    wx_redefine_method :each_line do |&block|
       if block
         wx_each_line.bind(self).call(&block)
       else

data/lib/wx/core/timer.rb

@@ -47,14 +47,14 @@ class Wx::Timer
 
   # Redefine initialize
   wx_init = self.instance_method(:initialize)
-  define_method(:initialize) do | *args |
+  wx_redefine_method(:initialize) do | *args |
     setup_owner_destruction_hook(args[0])
     wx_init.bind(self).call(*args)
   end
 
   # Redefine set_owner
   wx_set_owner = self.instance_method(:set_owner)
-  define_method(:set_owner) do | *args |
+  wx_redefine_method(:set_owner) do | *args |
     setup_owner_destruction_hook(args[0])
     wx_set_owner.bind(self).call(*args)
   end

data/lib/wx/core/tree_ctrl.rb

@@ -12,7 +12,7 @@ class Wx::TreeCtrl
 
   # Overload to provide Enumerator without block
   wx_traverse = instance_method :traverse
-  define_method :traverse do |start_id=nil, &block|
+  wx_redefine_method :traverse do |start_id=nil, &block|
     if block
       wx_traverse.bind(self).call(start_id, &block)
     else

data/lib/wx/core/v_list_box.rb

@@ -9,7 +9,7 @@
 class Wx::VListBox
 
   wx_each_selected = instance_method :each_selected
-  define_method :each_selected do |&block|
+  wx_redefine_method :each_selected do |&block|
     if block
       wx_each_selected.bind(self).call(&block)
     else

data/lib/wx/core/validator.rb

@@ -34,7 +34,7 @@ class Wx::Validator
   module Binding
     def self.included(base)
       wx_on_transfer_from_window = base.instance_method :on_transfer_from_window
-      base.define_method :on_transfer_from_window do |meth = nil, &block|
+      base.wx_redefine_method :on_transfer_from_window do |meth = nil, &block|
         proc = if block and not meth
                  block
                elsif meth and not block
@@ -54,7 +54,7 @@ class Wx::Validator
       end
 
       wx_on_transfer_to_window = base.instance_method :on_transfer_to_window
-      base.define_method :on_transfer_to_window do |meth = nil, &block|
+      base.wx_redefine_method :on_transfer_to_window do |meth = nil, &block|
         proc = if block and not meth
                  block
                elsif meth and not block

data/lib/wx/core/variant.rb

@@ -24,7 +24,7 @@ module Wx
 
     # make assign return self and add it's handy alias
     wx_assign = instance_method :assign
-    define_method :assign do |v|
+    wx_redefine_method :assign do |v|
       wx_assign.bind(self).call(v)
       self
     end
@@ -33,7 +33,7 @@ module Wx
     # extend to_s to arraylist and list (easier in pure Ruby)
 
     wx_to_s = instance_method :to_s
-    define_method :to_s do
+    wx_redefine_method :to_s do
       unless null?
         case type
         when 'list'

data/lib/wx/core/window.rb

@@ -30,6 +30,52 @@ class Wx::Window
   alias :bring_to_front :raise_window
   alias :send_to_back :lower_window
 
+  # Event handling overrides
+  class << self
+    def process_event(evh, event)
+      (@m_process_event ||= Wx::EvtHandler.instance_method(:process_event)).bind(evh).call(event)
+    end
+    def process_event_locally(evh, event)
+      (@m_process_event_locally ||= Wx::EvtHandler.instance_method(:process_event_locally)).bind(evh).call(event)
+    end
+    def safely_process_event(evh, event)
+      (@m_safely_process_event ||= Wx::EvtHandler.instance_method(:safely_process_event)).bind(evh).call(event)
+    end
+    def process_pending_events(evh)
+      (@m_process_pending_events ||= Wx::EvtHandler.instance_method(:process_pending_events)).bind(evh).call
+    end
+    def queue_event(evh, event)
+      (@m_queue_event ||= Wx::EvtHandler.instance_method(:queue_event)).bind(evh).call(event)
+    end
+    def add_pending_event(evh, event)
+      (@m_add_pending_event ||= Wx::EvtHandler.instance_method(:add_pending_event)).bind(evh).call(event)
+    end
+  end
+
+  def process_event(event)
+    Wx::Window.process_event(get_event_handler, event)
+  end
+
+  def process_event_locally(event)
+    Wx::Window.process_event_locally(get_event_handler, event)
+  end
+
+  def safely_process_event(event)
+    Wx::Window.safely_process_event(get_event_handler, event)
+  end
+
+  def process_pending_events
+    Wx::Window.process_pending_events(get_event_handler)
+  end
+
+  def queue_event(event)
+    Wx::Window.queue_event(get_event_handler, event)
+  end
+
+  def add_pending_event(event)
+    Wx::Window.add_pending_event(get_event_handler, event)
+  end
+
   # Recursively searches all windows below +self+ and returns the first
   # window which has the id +an_id+. This corresponds to the find_window
   # method method in WxWidgets when called with an integer.
@@ -67,7 +113,7 @@ class Wx::Window
 
   # Overload the wrapper method to check for @__painting__
   wx_paint_buffered = instance_method :paint_buffered
-  define_method :paint_buffered do |&block|
+  wx_redefine_method :paint_buffered do |&block|
     if instance_variable_defined?('@__painting__')
       wx_paint_buffered.bind(self).call(&block)
     else
@@ -77,7 +123,7 @@ class Wx::Window
 
   # Overload to provide Enumerator without block
   wx_each_child = instance_method :each_child
-  define_method :each_child do |&block|
+  wx_redefine_method :each_child do |&block|
     if block
       wx_each_child.bind(self).call(&block)
     else

data/lib/wx/core/xmlresource.rb

@@ -9,14 +9,14 @@
 class Wx::XmlResource
   class << self
     wx_get = self.instance_method(:get)
-    define_method(:get) do 
+    wx_redefine_method(:get) do 
       result = wx_get.bind(self).call
       result.init_all_handlers
       result
     end
 
     wx_add_subclass_factory = self.instance_method(:add_subclass_factory)
-    define_method(:add_subclass_factory) do |factory|
+    wx_redefine_method(:add_subclass_factory) do |factory|
       @factories ||= []
       @factories << factory # keep Ruby factories alive through GC
       wx_add_subclass_factory.bind(self).call(factory)
@@ -25,7 +25,7 @@ class Wx::XmlResource
 
   # Again, if created via new, switch subclassing off and init_all_handlers
   wx_init = self.instance_method(:initialize)
-  define_method(:initialize) do | *args |
+  wx_redefine_method(:initialize) do | *args |
     result = wx_init.bind(self).call(*args)
     result.init_all_handlers
   end
@@ -35,7 +35,7 @@ class Wx::XmlResource
   # file. In ruby, in these circumstances, it's more natural to raise an
   # Exception than expect the user to test the return value.
   wx_load = self.instance_method(:load)
-  define_method(:load) do | fname |
+  wx_redefine_method(:load) do | fname |
     result = wx_load.bind(self).call(fname)
     if not result
       Kernel.raise( RuntimeError,