wxruby3 0.9.0.pre.rc.2 → 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
 
@@ -66,12 +75,48 @@ module Wx
     def convert_to_bitmap
       Wx::Bitmap.from_image(self)
     end
+
+    module Histogram
+
+      def make_key(r, g, b)
+        (r << 16) | (g << 8) | b
+      end
+
+      def find_first_unused_colour(r=1, g=0, b=0)
+        while self.has_key?(make_key(r,g,b))
+          if r >= 254
+            r = 0
+            if g >= 254
+              return nil if b >= 254
+              g = 0
+              b += 1
+            else
+              g += 1
+            end
+          else
+            r += 1
+          end
+        end
+        [r, g, b]
+      end
+
+    end
+
+    wx_compute_histogram = instance_method :compute_histogram
+    define_method :compute_histogram do
+      hist_hash = wx_compute_histogram.bind(self).call
+      hist_hash.extend Histogram
+      hist_hash
+    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,10 +1,34 @@
+# 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
   # Passes each valid item index into the passed block
-  def each
-    0.upto(item_count - 1) { | i | yield i }
+  def each(&block)
+    if block_given?
+      0.upto(item_count - 1) { | i | block.call(i) }
+    else
+      ::Enumerator.new { |y| each { | i | y << i } }
+    end
+  end
+
+  def each_selected(&block)
+    if block_given?
+      item = -1
+      while (item = get_next_item(item, Wx::LIST_NEXT_ALL, Wx::LIST_STATE_SELECTED)) >= 0
+        block.call(item)
+      end
+    else
+      ::Enumerator.new { |y| each_selected { | i | y << i } }
+    end
   end
 
   # Returns an Array containing the indexes of the currently selected
@@ -19,15 +43,4 @@ class Wx::ListCtrl
     selections
   end
 
-  # # Stub version for LC_VIRTUAL controls that does nothing; may be
-  # # overridden in subclasses.
-  # def on_get_item_attr(i)
-  #   nil
-  # end
-  #
-  # # Stub version for LC_VIRTUAL|LC_REPORT controls that does nothing;
-  # # may be overridden in subclasses.
-  # def on_get_item_column_image(i, col)
-  #   -1
-  # end
 end

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
 
@@ -14,7 +21,114 @@ module Wx
       alias :timestamp= :set_timestamp
       alias :verbose :get_verbose
       alias :verbose= :set_verbose
+
+      def set_component(comp)
+        @component = comp ? comp.to_s : comp
+      end
+      private :set_component
+
+      def component
+        @component
+      end
+
+      def for_component(comp, &block)
+        old_comp = component
+        set_component(comp)
+        begin
+          block.call if block_given?
+        ensure
+          set_component(old_comp)
+        end
+      end
+
+    end
+
+  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)
+      # as wxRuby apps will ever only log from the main thread the only reason why
+      # log info data may be retained beyond the execution scope of the current
+      # log action is because of log repetition counting which will retain the
+      # first log info instance of a repeating message sequence
+
+      # format message
+      msg = fmt % args
+      log_info = {
+        filename: if filename
+                    filename.to_s
+                  else
+                    filename
+                  end,
+        line: line,
+        func: if func
+                func.to_s
+              else
+                func
+              end,
+        component: if component
+                     component.to_s
+                   else
+                     Log.component
+                   end
+      }
+      if Wx::Log.get_repetition_counting && @last_msg != msg
+        # refresh cache
+        @last_msg = msg
+        @last_info = log_info
+      end
+      [msg, log_info]
+    end
+    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_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_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_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_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_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_log_error.bind(self).call(*setup_log_info(fmt, args, filename, line, func, component))
+    end
+
   end
 
 end

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