wxruby3 1.3.0 → 1.4.2

data/lib/wx/core/config.rb

@@ -42,7 +42,7 @@ module Wx
 
     # add protection against exceptions raised in blocks
     wx_for_path = instance_method :for_path
-    define_method :for_path do |path, &block|
+    wx_redefine_method :for_path do |path, &block|
       if block
         ex = nil
         rc = wx_for_path.bind(self).call(path) do |cfg, key|
@@ -64,7 +64,7 @@ module Wx
     # add Enumerator support
 
     wx_each_entry = instance_method :each_entry
-    define_method :each_entry do |&block|
+    wx_redefine_method :each_entry do |&block|
       if block_given?
         wx_each_entry.bind(self).call { |k| block.call(k, read(k)) }
       else
@@ -73,7 +73,7 @@ module Wx
     end
 
     wx_each_group = instance_method :each_group
-    define_method :each_group do |&block|
+    wx_redefine_method :each_group do |&block|
       if block_given?
         wx_each_group.bind(self).call { |k| block.call(k, Group.new(self, self.path.dup.push(k))) }
       else
@@ -83,20 +83,20 @@ module Wx
 
     # make this return a path array
     wx_path = instance_method :path
-    define_method :path do
+    wx_redefine_method :path do
       wx_path.bind(self).call.split(ConfigBase::SEPARATOR)
     end
 
     # protect against attempts to rename complete paths
     wx_rename = instance_method :rename
-    define_method :rename do |old_key, new_key|
+    wx_redefine_method :rename do |old_key, new_key|
       raise ArgumentError, 'No paths allowed' if old_key.index(ConfigBase::SEPARATOR) || new_key.index(ConfigBase::SEPARATOR)
       wx_rename.bind(self).call(old_key, new_key)
     end
 
     # fix recursive number_of_xxx methods as wxRegConfig does not support this currently
     wx_number_of_entries = instance_method :number_of_entries
-    define_method :number_of_entries do |recurse=false|
+    wx_redefine_method :number_of_entries do |recurse=false|
       if recurse
         each_group.inject(wx_number_of_entries.bind(self).call) { |c, (_, g)| c + g.number_of_entries(true) }
       else
@@ -105,7 +105,7 @@ module Wx
     end
 
     wx_number_of_groups = instance_method :number_of_groups
-    define_method :number_of_groups do |recurse=false|
+    wx_redefine_method :number_of_groups do |recurse=false|
       if recurse
         each_group.inject(wx_number_of_groups.bind(self).call) { |c, (_, g)| c + g.number_of_groups(true) }
       else

data/lib/wx/core/controlwithitems.rb

@@ -15,7 +15,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
@@ -23,7 +23,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
@@ -45,7 +45,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/data_object.rb

@@ -25,17 +25,17 @@ module Wx
     # using pure Ruby
 
     wx_get_data_size = instance_method :get_data_size
-    define_method :get_data_size do |format = nil|
+    wx_redefine_method :get_data_size do |format = nil|
       wx_get_data_size.bind(self).call(format || self.get_format)
     end
 
     wx_get_data_here = instance_method :get_data_here
-    define_method :get_data_here do |format = nil|
+    wx_redefine_method :get_data_here do |format = nil|
       wx_get_data_here.bind(self).call(format || self.get_format)
     end
 
     wx_set_data = instance_method :set_data
-    define_method :set_data do |*args|
+    wx_redefine_method :set_data do |*args|
       if args.size>1
         format, buf = args
       else
@@ -66,7 +66,7 @@ module Wx
       self._set_data(buf)
     end
 
-    def _get_data_size
+    wx_redefine_method :_get_data_size do
       (_get_data || '').bytesize
     end
     protected :_get_data_size

data/lib/wx/core/dataformat.rb

@@ -11,10 +11,16 @@
 
 class Wx::DataFormat
   def ==(other)
-    if self.get_type > Wx::DataFormatId::DF_INVALID
-      self.get_type == other.get_type
+    if other.is_a?(Wx::DataFormatId)
+      self.get_type == other
+    elsif other.is_a?(self.class)
+      if self.get_type > Wx::DataFormatId::DF_INVALID
+        self.get_type == other.get_type
+      else
+        self.id == other.id
+      end
     else
-      self.id == other.id
+      false
     end
   end
 end

data/lib/wx/core/defs.rb

@@ -0,0 +1,49 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+#
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
+require_relative './enum'
+
+module Wx
+
+  class Orientation < Wx::Enum
+
+    set_non_distinct(%i[ORIENTATION_MASK])
+
+  end
+
+  class Direction < Wx::Enum
+
+    set_non_distinct(%i[TOP BOTTOM NORTH SOUTH WEST EAST ALL DIRECTION_MASK])
+
+  end
+
+  class Alignment < Wx::Enum
+
+    set_non_distinct(%i[ALIGN_INVALID ALIGN_CENTRE_HORIZONTAL ALIGN_LEFT ALIGN_TOP ALIGN_CENTRE_VERTICAL ALIGN_CENTER ALIGN_MASK])
+
+  end
+
+  class SizerFlagBits < Wx::Enum
+
+    set_non_distinct(%i[SIZER_FLAG_BITS_MASK])
+
+  end
+
+  class Stretch < Wx::Enum
+
+    set_non_distinct(%i[GROW STRETCH_MASK])
+
+  end
+
+  class Border < Wx::Enum
+
+    set_non_distinct(%i[BORDER_THEME BORDER_MASK])
+
+  end
+
+end

data/lib/wx/core/dialog.rb

@@ -13,9 +13,10 @@ class Wx::Dialog
   class << self
 
     wx_set_layout_adapter = instance_method :set_layout_adapter
-    define_method :set_layout_adapter do |adapter|
+    wx_redefine_method :set_layout_adapter do |adapter|
       prev_adapter = wx_set_layout_adapter.bind(self).call(adapter)
       @adapter = adapter # cache here to prevent premature GC collection
+      prev_adapter
     end
 
   end
@@ -50,7 +51,7 @@ class Wx::Dialog
         def self.inherited(sub)
           sub.include Wx::Dialog::Functor
         end
-      end
+      end unless klass.singleton_class.method_defined?(:inherited)
     end
   end
 

data/lib/wx/core/enum.rb

@@ -10,10 +10,23 @@ class Wx::Enum
 
   class << self
 
-    def enumerators
+    def set_non_distinct(lst)
+      raise TypeError, 'Expected Array of Symbols' unless lst.is_a?(Array) && lst.all? { |e| e.is_a?(Symbol) }
+      @non_distinct = lst
+    end
+    alias :non_distinct= :set_non_distinct
+
+    def non_distinct
+      @non_distinct || []
+    end
+
+    def enumerators(excludes = nil)
+      excludes ||= self.non_distinct
       self.constants(false).inject({}) do |tbl, cn|
-        cv = self.const_get(cn)
-        tbl[cv.to_i] = cn if self === cv
+        unless excludes&.include?(cn)
+          cv = self.const_get(cn)
+          tbl[cv.to_i] = cn if self === cv
+        end
         tbl
       end
     end

data/lib/wx/core/event.rb

@@ -16,7 +16,7 @@ module Wx
     # overload the #initialize method to add a check on a
     # correct match between EventType and event class
     wx_init = self.instance_method(:initialize)
-    define_method :initialize do |evt_type = Wx::EVT_NULL, *rest|
+    wx_redefine_method :initialize do |evt_type = Wx::EVT_NULL, *rest|
       evt_klass = Wx::EvtHandler.event_class_for_type(evt_type)
       if evt_klass >= self.class
         wx_init.bind(self).call(evt_type, *rest)
@@ -34,7 +34,7 @@ module Wx
     # overload the #initialize method to add a check on a
     # correct match between EventType and event class
     wx_init = self.instance_method(:initialize)
-    define_method :initialize do |evt_type = Wx::EVT_NULL, *rest|
+    wx_redefine_method :initialize do |evt_type = Wx::EVT_NULL, *rest|
       evt_klass = Wx::EvtHandler.event_class_for_type(evt_type)
       if evt_klass >= self.class
         wx_init.bind(self).call(evt_type, *rest)
@@ -58,7 +58,7 @@ module Wx
     Wx::EVT_NC_PAINT,
     Wx::NcPaintEvent
   ]
-  if Wx.const_defined?(:EVT_HOTKEY)
+  if Wx.has_feature?(:USE_HOTKEY) && Wx.const_defined?(:EVT_HOTKEY)
     EvtHandler.register_event_type EvtHandler::EventType[
                                      'evt_hotkey', 1,
                                      Wx::EVT_HOTKEY,