wxruby3 0.9.0.pre.rc.3 → 0.9.0

data/lib/wx/core/icon.rb

@@ -1,3 +1,11 @@
+# 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
+
 # Specific type of platform-dependent image used for frames on Windows and
 # Linux. Normally Bitmap is used
 
@@ -19,13 +27,13 @@ module Wx
 
     def to_bitmap
       # for WXMSW platform Icon is not derived from Bitmap
-      return self unless Wx::PLATFORM == 'WXMSW' || Wx::PLATFORM == 'WXOSX'
+      return self unless Wx::PLATFORM == 'WXMSW'
       bm = Wx::Bitmap.new
       bm.copy_from_icon(self)
       bm
     end
 
-    if Wx::PLATFORM == 'WXMSW' || Wx::PLATFORM == 'WXOSX'
+    if Wx::PLATFORM == 'WXMSW'
       def convert_to_image
         to_bitmap.convert_to_image
       end
@@ -50,10 +58,13 @@ module Wx
     end
   end
 
-  def self.Icon(name, bmp_type = nil, *rest)
-    art_path = File.dirname(caller_path = caller_locations(1).first.absolute_path || caller_locations(1).first.path)
-    art_owner = File.basename(caller_path, '.*')
-    art_file = ArtLocator.find_art(name, art_type: :icon, art_path: art_path, art_section: art_owner, bmp_type: bmp_type)
+  def self.Icon(name, bmp_type = nil, *rest, art_path: nil, art_section: nil)
+    unless art_path && art_section
+      caller_path = caller_locations(1).first.absolute_path || caller_locations(1).first.path
+      art_path = File.dirname(caller_path) unless art_path
+      art_section = File.basename(caller_path, '.*') unless art_section
+    end
+    art_file = ArtLocator.find_art(name, art_type: :icon, art_path: art_path, art_section: art_section, bmp_type: bmp_type)
     ::Kernel.raise ArgumentError, "Cannot locate art file for #{name}:Icon" unless art_file
     Icon.new(art_file, bmp_type, *rest)
   end

data/lib/wx/core/id_helper.rb

@@ -1,3 +1,10 @@
+# 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
 
 module Wx
 

data/lib/wx/core/image.rb

@@ -1,5 +1,14 @@
+# 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
+
 # A platform-independent image; can be manipulated more extensively than
 # Bitmap, but must be converted to a Bitmap for drawing.
+
 module Wx
   class Image
 
@@ -101,10 +110,13 @@ module Wx
     end
   end
 
-  def self.Image(name, bmp_type = nil, *rest)
-    art_path = File.dirname(caller_path = caller_locations(1).first.absolute_path || caller_locations(1).first.path)
-    art_owner = File.basename(caller_path, '.*')
-    art_file = ArtLocator.find_art(name, art_type: :image, art_path: art_path, art_section: art_owner, bmp_type: bmp_type)
+  def self.Image(name, bmp_type = nil, *rest, art_path: nil, art_section: nil)
+    unless art_path && art_section
+      caller_path = caller_locations(1).first.absolute_path || caller_locations(1).first.path
+      art_path = File.dirname(caller_path) unless art_path
+      art_section = File.basename(caller_path, '.*') unless art_section
+    end
+    art_file = ArtLocator.find_art(name, art_type: :image, art_path: art_path, art_section: art_section, bmp_type: bmp_type)
     ::Kernel.raise ArgumentError, "Cannot locate art file for #{name}:Image" unless art_file
     Image.new(art_file, bmp_type, *rest)
   end

data/lib/wx/core/imagelist.rb

@@ -1,10 +1,17 @@
+# 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
 
 class Wx::ImageList
 
   # provide seamless support for adding icons on all platforms
   wx_add = instance_method :add
   define_method :add do |*args|
-    if Wx::Icon === args.first
+    if Wx::PLATFORM == 'WXMSW' && args.size == 1 && Wx::Icon === args.first
       args[0] = args.first.to_bitmap
     end
     wx_add.bind(self).call(*args)

data/lib/wx/core/listbox.rb

@@ -1,3 +1,10 @@
+# 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 './controlwithitems'
 

data/lib/wx/core/listctrl.rb

@@ -1,4 +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
+
 # Multi-item control with numerous possible view styles
+
 class Wx::ListCtrl
   # Make these ruby enumerables so find, find_all, map are available 
   include Enumerable

data/lib/wx/core/locale.rb

@@ -1,3 +1,11 @@
+# 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
+
 class Wx::Locale
   class << self
     def get_system_language_name

data/lib/wx/core/log.rb

@@ -1,3 +1,10 @@
+# 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
 
 module Wx
 
@@ -38,6 +45,23 @@ module Wx
 
   end
 
+  class LogChain
+
+    wx_initialize = instance_method :initialize
+    define_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_set_log.bind(self).call(new_log)
+      @new_log = new_log # cache to prevent premature GC collection; old_log managed in C++ wrapper
+    end
+    alias :log= :set_log
+
+  end
+
   class << self
 
     def setup_log_info(fmt, args, filename, line, func, component)

data/lib/wx/core/menu.rb

@@ -1,4 +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
+
 # A single labelled list within a drop-down menu, or a popup menu
+
 class Wx::Menu
 
   alias :wx_initialize :initialize

data/lib/wx/core/menu_bar.rb

@@ -1,3 +1,10 @@
+# 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
 
 class Wx::MenuBar
 

data/lib/wx/core/menuitem.rb

@@ -1,4 +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
+
 # An individual item within a frame or popup menu
+
 class Wx::MenuItem
   # Get the Wx id, not Ruby's deprecated Object#id
   alias :id :get_id

data/lib/wx/core/notebook.rb

@@ -1,4 +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
+
 # Displays a set of pages in parallel using tabs
+
 class Wx::Notebook
   # Convenience method for iterating pages
   def each_page

data/lib/wx/core/object.rb

@@ -1,4 +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
+
 # The root class for most (not all) WxRuby classes
+
 class Wx::Object
   # Massage the output of inspect to show the public module name (Wx),
   # instead of the internal name (Wxruby2)

data/lib/wx/core/paintdc.rb

@@ -1,3 +1,10 @@
+# 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
 
 class Wx::PaintDC
 

data/lib/wx/core/pen.rb

@@ -1,3 +1,10 @@
+# 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
 
 module Wx
 

data/lib/wx/core/pen_info.rb

@@ -1,3 +1,10 @@
+# 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
 
 class Wx::PenInfo
 

data/lib/wx/core/platform_info.rb

@@ -1,3 +1,10 @@
+# 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
 
 module Wx
 

data/lib/wx/core/point.rb

@@ -1,3 +1,11 @@
+# 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
+
 class Wx::Point
 
   include Comparable

data/lib/wx/core/real_point.rb

@@ -1,3 +1,11 @@
+# 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
+
 class Wx::RealPoint
 
   include Comparable

data/lib/wx/core/rect.rb

@@ -1,4 +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
+
 # Class representing a rectangular shape
+
 class Wx::Rect
   # Nicely readable inspect output for Rect
   def to_s

data/lib/wx/core/region_iterator.rb

@@ -1,3 +1,10 @@
+# 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
 
 class Wx::RegionIterator
 

data/lib/wx/core/simplehelpprovider.rb

@@ -1,5 +1,14 @@
+# 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
+
 # Pure-ruby implementation of the corresponding Wx class. Simply shows
 # the Window's help text in a tooltip.
+
 class Wx::SimpleHelpProvider < Wx::HelpProvider
   def initialize
     super

data/lib/wx/core/size.rb

@@ -1,3 +1,11 @@
+# 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
+
 class Wx::Size
 
   include Comparable

data/lib/wx/core/sizer.rb

@@ -1,4 +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
+
 # Class for automatically managing layouts
+
 class Wx::Sizer
   # Generic method to add items, supporting positional and named
   # arguments

data/lib/wx/core/splash_screen.rb

@@ -1,3 +1,10 @@
+# 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
 
 class Wx::SplashScreen
 
@@ -11,8 +18,21 @@ class Wx::SplashScreen
   def initialize(bitmap, splashstyle, milliseconds, parent = nil, *mixed_args, &block)
     # no zero-args ctor for use with XRC!
 
+    real_args = begin
+                  [ bitmap, splashstyle, milliseconds, parent ] + self.class.args_as_list(*mixed_args)
+                rescue => err
+                  msg = "Error initializing #{self.inspect}\n"+
+                    " : #{err.message} \n" +
+                    "Provided are #{[ bitmap, splashstyle, milliseconds, parent ] + mixed_args} \n" +
+                    "Correct parameters for #{self.class.name}.new are:\n" +
+                    self.class.describe_constructor(
+                      ":bitmap => (Wx::Bitmap)\n:splashstyle => (Integer)\n:milliseconds => (Integer)\n:parent => (Wx::Window)\n")
+
+                  new_err = err.class.new(msg)
+                  new_err.set_backtrace(caller)
+                  Kernel.raise new_err
+                end
     begin
-      real_args = [ bitmap, splashstyle, milliseconds, parent ] + self.class.args_as_list(*mixed_args)
       pre_wx_kwctor_init(*real_args)
     rescue => err
       msg = "Error initializing #{self.inspect}\n"+
@@ -20,7 +40,7 @@ class Wx::SplashScreen
         "Provided are #{real_args} \n" +
         "Correct parameters for #{self.class.name}.new are:\n" +
         self.class.describe_constructor(
-          ":bitmap => Wx::Bitmap\n:splashstyle => Integer\n:milliseconds => Integer\n:parent => Wx::Window\n")
+          ":bitmap => (Wx::Bitmap)\n:splashstyle => (Integer)\n:milliseconds => (Integer)\n:parent => (Wx::Window)\n")
 
       new_err = err.class.new(msg)
       new_err.set_backtrace(caller)

data/lib/wx/core/text_entry.rb

@@ -1,3 +1,10 @@
+# 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
 
 module Wx
 

data/lib/wx/core/textctrl.rb

@@ -1,8 +1,89 @@
+# 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
 
-class Wx::TextCtrl
-  wx_op_append = instance_method :<<
-  define_method :<< do |o|
-    wx_op_append.bind(self).call(o)
-    self
+module Wx
+
+  if Wx.has_feature?(:USE_SPELLCHECK)
+    class TextProofOptions
+      def initialize(schk=false, gchk=false, lang='')
+        @spellcheck = schk
+        @grammarcheck = gchk
+        @language = lang
+      end
+
+      def spell_check(f = true)
+        @spellcheck = f
+        self
+      end
+
+      def grammar_check(f = true)
+        @grammarcheck = f
+        self
+      end
+
+      def language(lang)
+        @language = lang.to_s
+        self
+      end
+      alias :language= :language
+
+      def is_spell_check_enabled
+        @spellcheck
+      end
+      alias :spell_check_enabled? :is_spell_check_enabled
+
+      def is_grammar_check_enabled
+        @grammarcheck
+      end
+      alias :grammar_check_enabled? :is_grammar_check_enabled
+
+      def get_lang
+        @language
+      end
+
+      def self.default
+        self.new.spell_check
+      end
+
+      def self.disable
+        self.new
+      end
+    end
   end
+
+  class TextCtrl
+    wx_op_append = instance_method :<<
+    define_method :<< do |o|
+      wx_op_append.bind(self).call(o)
+      self
+    end
+
+    if Wx.has_feature?(:USE_SPELLCHECK)
+
+      protected :do_enable_proof_check
+      protected :do_get_proof_check_options
+
+      def enable_proof_check(*opts)
+        if opts.size>1
+          do_enable_proof_check(*opts)
+        elsif opts.empty? || (opts.size == 1 && opts.first.is_a?(Wx::TextProofOptions))
+          opts = opts.shift || Wx::TextProofOptions.default
+          do_enable_proof_check(opts.is_spell_check_enabled, opts.is_grammar_check_enabled, opts.get_lang)
+        else
+          Kernel.raise ArgumentError.new("Expected Wx::TextProofOptions or (bool, bool, string)")
+        end
+      end
+
+      def get_proof_check_options
+        Wx::TextProofOptions.new(*do_get_proof_check_options)
+      end
+
+    end
+  end
+
 end

data/lib/wx/core/timer.rb

@@ -1,4 +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
+
 # Class allowing periodic or timed events to be fired
+
 class Wx::Timer
   # Convenience method to trigger a one-off action after +interval+
   # milliseconds have passed. The action is specified by the passed

data/lib/wx/core/toolbar.rb

@@ -1,4 +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
+
 # A set of buttons and controls attached to one edge of a Wx::Frame
+
 class Wx::ToolBar
   # Generic method to add items, supporting positional and named
   # arguments

data/lib/wx/core/toolbartool.rb

@@ -1,3 +1,11 @@
+# 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
+
 class Wx::ToolBarTool
   alias :id :get_id
   alias :wx_id :get_id

data/lib/wx/core/treectrl.rb

@@ -1,4 +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
+
 # Hierarchical control with items
+
 class Wx::TreeCtrl
   # Make these ruby enumerables so find, find_all, map etc are available
   include Enumerable

data/lib/wx/core/v_list_box.rb

@@ -1,3 +1,10 @@
+# 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
 
 class Wx::VListBox
 

data/lib/wx/core/validator.rb

@@ -1,3 +1,10 @@
+# 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
 
 class Wx::Validator
   # Default implementation of clone, may need to be over-ridden if

data/lib/wx/core/variant.rb

@@ -1,3 +1,10 @@
+# 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 'date'
 

data/lib/wx/core/vboxsizer.rb

@@ -1,6 +1,22 @@
+# 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
+
 # Just a shortcut version for creating a vertical box sizer
+
 class Wx::VBoxSizer < Wx::BoxSizer
   def initialize
     super(Wx::VERTICAL)
   end
 end
+
+# Just a shortcut version for creating a vertical wrap sizer
+class Wx::VWrapSizer < Wx::WrapSizer
+  def initialize(flags=Wx::WRAPSIZER_DEFAULT_FLAGS)
+    super(Wx::VERTICAL)
+  end
+end