wxruby3 1.3.0 → 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/font.rb

@@ -1,5 +1,13 @@
+# 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 './font/encoding'
+require_relative './enum'
 
 module Wx
 
@@ -27,4 +35,10 @@ module Wx
   # can be accessed through that name too.
   TheFontList = Font
 
+  class FontFlag < Wx::Enum
+
+    set_non_distinct(%i[FONTFLAG_MASK])
+
+  end
+
 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/hboxsizer.rb

@@ -9,14 +9,34 @@
 # Just a shortcut version for creating a horizontal box sizer
 
 class Wx::HBoxSizer < Wx::BoxSizer
-  def initialize
-    super(Wx::HORIZONTAL)
+  def initialize(&block)
+    super(Wx::HORIZONTAL, &nil)
+    if block
+      if block.arity == -1 or block.arity == 0
+        self.instance_eval(&block)
+      elsif block.arity == 1
+        block.call(self)
+      else
+        Kernel.raise ArgumentError,
+                     "Block to initialize should accept a single argument or none"
+      end
+    end
   end
 end
 
 # Just a shortcut version for creating a horizontal wrap sizer
 class Wx::HWrapSizer < Wx::WrapSizer
-  def initialize(flags=Wx::WRAPSIZER_DEFAULT_FLAGS)
-    super(Wx::HORIZONTAL)
+  def initialize(flags=Wx::WRAPSIZER_DEFAULT_FLAGS, &block)
+    super(Wx::HORIZONTAL, &nil)
+    if block
+      if block.arity == -1 or block.arity == 0
+        self.instance_eval(&block)
+      elsif block.arity == 1
+        block.call(self)
+      else
+        Kernel.raise ArgumentError,
+                     "Block to initialize should accept a single argument or none"
+      end
+    end
   end
 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.rb

@@ -6,8 +6,28 @@
 # Copyright 2004-2007, wxRuby development team
 # released under the MIT-like wxRuby2 license
 
+require_relative './enum'
+
 module Wx
 
   ThePenList = Wx::Pen
 
+  class PenStyle < Wx::Enum
+
+    set_non_distinct(%i[PENSTYLE_INVALID PENSTYLE_FIRST_HATCH PENSTYLE_LAST_HATCH])
+
+  end
+
+  class PenJoin < Wx::Enum
+
+    set_non_distinct(%i[JOIN_INVALID])
+
+  end
+
+  class PenCap < Wx::Enum
+
+    set_non_distinct(%i[CAP_INVALID])
+
+  end
+
 end

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/real_point.rb

@@ -111,6 +111,7 @@ class Wx::RealPoint
   def to_real_point
     self
   end
+  alias :to_real :to_real_point
 
   def dup
     Wx::RealPoint.new(self.x, self.y)

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

@@ -6,57 +6,184 @@
 # Copyright 2004-2007, wxRuby development team
 # released under the MIT-like wxRuby2 license
 
-# Class for automatically managing layouts
+# Classes for automatically managing layouts
 
-class Wx::Sizer
-  # Generic method to add items, supporting positional and named
-  # arguments
-  ADD_ITEM_PARAMS = [ Wx::Parameter[ :index, -1 ], 
-                      Wx::Parameter[ :proportion, 0 ],
-                      Wx::Parameter[ :flag, 0 ],
-                      Wx::Parameter[ :border, 0 ] ]
-  
-  def add_item(item, *mixed_args)
+module Wx
+  class Sizer
+    # Generic method to add items, supporting positional and named
+    # arguments
+    ADD_ITEM_PARAMS = [Wx::Parameter[:index, -1],
+                       Wx::Parameter[:proportion, 0],
+                       Wx::Parameter[:flag, 0],
+                       Wx::Parameter[:border, 0]]
 
-    begin
-      args = Wx::args_as_list(ADD_ITEM_PARAMS, *mixed_args)
-    rescue => err
-      err.set_backtrace(caller)
-      Kernel.raise err
+    def add_item(item, *mixed_args)
+
+      begin
+        args = Wx::args_as_list(ADD_ITEM_PARAMS, *mixed_args)
+      rescue => err
+        err.set_backtrace(caller)
+        Kernel.raise err
+      end
+
+      full_args = []
+
+      # extract the width and the height in the case of a spacer
+      # defined as an array
+      if item.kind_of?(Array)
+        Kernel.raise ArgumentError,
+                     "Invalid Sizer specification : [width, height] expected" if item.size != 2
+        full_args << item[0] << item[1]
+      else
+        full_args << item
+      end
+
+      # update the full arguments list with the optional arguments (except index)
+      idx = args.shift
+      full_args.concat(args)
+
+      # Call add to append if default position
+      if idx == -1
+        add(*full_args)
+      else
+        insert(idx, *full_args)
+      end
+    end
+
+    # Overload to provide Enumerator without block
+    wx_each_child = instance_method :each_child
+    wx_redefine_method :each_child do |&block|
+      if block
+        wx_each_child.bind(self).call(&block)
+      else
+        ::Enumerator.new { |y| wx_each_child.bind(self).call { |c| y << c } }
+      end
+    end
+
+  end
+
+  class BoxSizer < Sizer
+
+    wx_initialize = instance_method :initialize
+    wx_redefine_method :initialize do |*args, &block|
+      wx_initialize.bind(self).call(*args)
+      if block
+        if block.arity == -1 or block.arity == 0
+          self.instance_eval(&block)
+        elsif block.arity == 1
+          block.call(self)
+        else
+          Kernel.raise ArgumentError,
+                       "Block to initialize should accept a single argument or none"
+        end
+      end
+    end
+
+  end
+
+  class WrapSizer < BoxSizer
+
+    wx_initialize = instance_method :initialize
+    wx_redefine_method :initialize do |*args, &block|
+      wx_initialize.bind(self).call(*args)
+      if block
+        if block.arity == -1 or block.arity == 0
+          self.instance_eval(&block)
+        elsif block.arity == 1
+          block.call(self)
+        else
+          Kernel.raise ArgumentError,
+                       "Block to initialize should accept a single argument or none"
+        end
+      end
     end
 
-    full_args = []
+  end
+
+  class StaticBoxSizer < BoxSizer
 
-    # extract the width and the height in the case of a spacer
-    # defined as an array
-    if item.kind_of?(Array)
-      Kernel.raise ArgumentError,
-        "Invalid Sizer specification : [width, height] expected" if item.size != 2
-      full_args << item[0] << item[1]
-    else
-      full_args << item
+    wx_initialize = instance_method :initialize
+    wx_redefine_method :initialize do |*args, &block|
+      wx_initialize.bind(self).call(*args)
+      if block
+        if block.arity == -1 or block.arity == 0
+          self.instance_eval(&block)
+        elsif block.arity == 1
+          block.call(self)
+        else
+          Kernel.raise ArgumentError,
+                       "Block to initialize should accept a single argument or none"
+        end
+      end
     end
 
-    # update the full arguments list with the optional arguments (except index)
-    idx = args.shift
-    full_args.concat(args)
+  end
 
-    # Call add to append if default position
-    if idx == -1
-      add(*full_args)
-    else
-      insert(idx, *full_args)
+  class StdDialogButtonSizer < BoxSizer
+
+    wx_initialize = instance_method :initialize
+    wx_redefine_method :initialize do |*args, &block|
+      wx_initialize.bind(self).call(*args)
+      if block
+        if block.arity == -1 or block.arity == 0
+          self.instance_eval(&block)
+        elsif block.arity == 1
+          block.call(self)
+        else
+          Kernel.raise ArgumentError,
+                       "Block to initialize should accept a single argument or none"
+        end
+      end
     end
+
   end
 
-  # Overload to provide Enumerator without block
-  wx_each_child = instance_method :each_child
-  define_method :each_child do |&block|
-    if block
-      wx_each_child.bind(self).call(&block)
-    else
-      ::Enumerator.new { |y| wx_each_child.bind(self).call { |c| y << c } }
+  class GridSizer < Sizer
+
+    wx_initialize = instance_method :initialize
+    wx_redefine_method :initialize do |*args, &block|
+      wx_initialize.bind(self).call(*args)
+      self.instance_eval(&block) if block
     end
+
+  end
+
+  class FlexGridSizer < GridSizer
+
+    wx_initialize = instance_method :initialize
+    wx_redefine_method :initialize do |*args, &block|
+      wx_initialize.bind(self).call(*args)
+      if block
+        if block.arity == -1 or block.arity == 0
+          self.instance_eval(&block)
+        elsif block.arity == 1
+          block.call(self)
+        else
+          Kernel.raise ArgumentError,
+                       "Block to initialize should accept a single argument or none"
+        end
+      end
+    end
+
+  end
+
+  class GridBagSizer < FlexGridSizer
+
+    wx_initialize = instance_method :initialize
+    wx_redefine_method :initialize do |*args, &block|
+      wx_initialize.bind(self).call(*args)
+      if block
+        if block.arity == -1 or block.arity == 0
+          self.instance_eval(&block)
+        elsif block.arity == 1
+          block.call(self)
+        else
+          Kernel.raise ArgumentError,
+                       "Block to initialize should accept a single argument or none"
+        end
+      end
+    end
+
   end
 
 end