wxruby3 0.9.0.pre.rc.1-x64-mingw-ucrt → 0.9.0.pre.rc.3-x64-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b0789682f3f41499d529e24441bcff8b0ec200db6b1a84cbac198e445f73f33
-  data.tar.gz: f48166b2c460c774916a7d2b177b73bdc353c0c7f3f35c760de3d6aa9a66dd57
+  metadata.gz: cb68ca47dc52aa1c4ff478322597d44502782a0d58228d94a448d41963614ba6
+  data.tar.gz: 7799517b7e2018421436f41dce8e3f7a5faa9c0cd2b2c4df93b6e2558904a464
 SHA512:
-  metadata.gz: 8f817d5543dcf138ff6c21b161beff6e8e93677db8922d37da6bcebb4a2940a44400c16b9800ee44ccce4b574eecd1eb2c0db909ab464bcbfb0a0cb89870063c
-  data.tar.gz: 113af98388e9253f223fb5176f9722a61b7485f7a4a56dd79080a6eb55aafc3c6929522977d95e0564e7761e4655c8fdc3dde22796a108f8c5ba853329ca4ee0
+  metadata.gz: 87cffdbf4f24e354a0b68337a01923c4f5c04084f5cebd02e5a8f7a065e7d92c8fa413852fd008bce63e841f2e031bd776d43009fdb997dd04cbaf1516b9024f
+  data.tar.gz: 434e080088dd9b85becebeb57c56f48c7465940553c56717a946cddf4e3eed31f81e4cccf22e9a715761007696e012f5a2f441edc8f21b307b405f41dfcf0d96

data/INSTALL.md

@@ -4,32 +4,56 @@
 
 # Installation of wxRuby3
 
+Below are installation instructions for Linux, Windows, and Mac (both AMD64 and ARM64).
+
+## Minimal requirements for installing wxRuby3
+
+The minimal requirements for installing any source based setup (gem, source package or Github clone) of wxRuby3 are:
+
+| Sofware                                       | Notes                                                                                                                                                                                                                                                             |
+|-----------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Ruby                                          | A supported version of the Ruby interpreter needs to be installed.                                                                                                                                                                                                |
+| C++ compiler<br>(incl. dev tools like `make`) | On linux a recent version of the GNU C++ compiler (with c++-14 support) needs to be installed<br>On Windows the RubyInstaller MSYS2-Devkit needs to be installed<br>On MacOS XCode with commandline tools needs to be installed via `sudo xcode-select --install` |
+| Git version control toolkit                   |                                                                                                                                                                                                                                                                   |
+| SWIG >= 3.0.12                                | On MacOS install [Homebrew](https://brew.sh/) and than `brew install swig`                                                                                                                                                                                        |
+| Doxygen (>= 1.9.1, <= 1.9.6)                  | Doxygen > 1.9.6 has changes that cause problems with the wxWidgets doxygen files.<br>On MacOS: `brew tap mcorino/wxruby3` and than `brew install doxygen@1.9.6` (default brew recipe installs 1.9.7)                                                              |
+| wxWidgets (>= 3.2)                            | See [wxWidgets installation](#wxwidgets-installation)                                                                                                                                                                                                             |
+
+The wxRuby3 build process requires `git` to clone a copy of the wxWidgets Github repository to extract the interface 
+specifications from.<br>
+The wxRuby3 build process needs doxygen to generated XML files containing wxWidgets interface specs which are used to 
+generate SWIG interface definitions from which SWIG to generates C++ source code for the wrapper interfaces from
+which the native extension is compiled.
+
 ## Installation of a wxRuby3 Gem
 
 The wxRuby3 project provides gems on [RubyGems](https://rubygems.org) which can be installed with the
 standard `gem install` command line this:
 
-```sh
+```shell
 gem install wxruby3
  ```
 
 On Linux systems this will install the source based gem which will automatically build the native wxruby3 extension
 for the platform on which wxRuby3 is being installed.
 On Windows systems a prebuilt binary gem is available for the latest stable release(s) of [RubyInstaller](https://rubyinstaller.org) 
-installed rubies that will be installed by default if installing for that platform. Alternatively the source gem can be
-installed on Windows by installing with explicit platform specification like this:
+installed rubies that will be installed by default if installing for that platform (including an embedded, latest 
+stable version, wxWidgets installation).<br>
+Alternatively the source gem can be installed on Windows by installing with explicit platform specification like this:
 
-```sh
+```shell
 gem install wxruby3 --platform=ruby
 ```
 
-When installing the source gem the following basic requirements apply:
+When installing the source gem the minimal requirements listed above apply.
 
-- Git version control toolkit
-- Ruby 2.5 or later (including development package)
-- GNU g++ 4.8 or later on Linux, RubyInstaller+DevKit on Windows
-- [SWIG](https://www.swig.org) 3.0.12 or later
-- [Doxygen](https://www.doxygen.nl/)
+On MacOS, if wxWidgets was not available, you can pull in the latest wxWidgets and build it by adding the `WITH_WXWIN=1` option:
+
+```shell
+gem install wxruby3 -- WITH_WXWIN=1
+```
+
+### wxWidgets installation
 
 Also a wxWidgets installation (version 3.2 or later) is required for which there are multiple options.
 
@@ -39,38 +63,65 @@ Also a wxWidgets installation (version 3.2 or later) is required for which there
    The wxRuby build procedure will determine the availability and version of wxWidgets by locating and calling
    the `wx-config` utility script. In case no (compatible) wxWidgets version is found installation ends with an error.<br>
    Please note that even with this method a copy of the wxWidgets project will be checked out from GitHUb as the wxRuby3
-   build procedure requires access to the wxWidgets interface specification sources (see [here](TODO) for more details). 
+   build procedure requires access to the wxWidgets interface specification sources which are not normally part of any of 
+   the standard distribution packages.
    
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;On MacOS, you can install wxWidgets via [Homebrew](https://brew.sh/):
+
+```shell
+   brew install wxwidgets
+```
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Afterwards, you can install the Ruby gem and it will detect wxWidgets in the system automatically:
+
+```shell
+   gem install wxruby3
+```   
 
 2. User installed wxWidgets version<br>
    <br>
-   In case the being system installed on does not provide (a compatible) wxWidgets version or a specific (possibly updated)
+   In case the system being installed on does not provide (a compatible) wxWidgets version or a specific (possibly updated)
    wxWidgets version is required the source gem can be installed using a user installed version like this (where the 
    `WXWIN` path should provide the location where the wxWidgets binaries are installed under `<wxwin path>/bin`):<br>
 
-```sh
+```shell
    gem install wxruby3 -- WXWIN=/path/to/wx/install 
 ```
-   
-3. Automatic installed wxWidgets version<br>
+
+3. Automatic installed, embedded, wxWidgets version<br>
    <br>
-   This is the easiest method when the being system installed on does not provide (a compatible) wxWidgets version (and 
+   This is the easiest method when the system being installed on does not provide (a compatible) wxWidgets version (and 
    no specific user defined version is required) and can be used by installing the source gem like this (which will
-   cause automatic checkout and building of the latest wxWidgets release (>= 3.2) from GitHub:
-
+   cause automatic checkout and building of the latest stable wxWidgets release (>= 3.2) from GitHub:
 
-```sh
+```shell
    gem install wxruby3 -- WITH_WXWIN=1
 ```
 
+In case of option **2** it is also possible to do the doxygen XML generation as part of the wxWidgets user installation
+and use that for the gem installation. In that case the user is required to generate the XML interface specs using the
+`regen` script found in the `docs/doxygen` folder of the wxWidgets installation after which the XML output folder can be 
+provided to the gem installation as follows:
+
+```shell
+   gem install wxruby3 -- WXWIN=/path/to/wx/install WXXML=/path/to/wx/doxygen/xml
+```
+
+Please also not that in case of option two the user is responsible to make sure the wxWidgets shared libraries can be
+found by the system's dynamic loader at runtime.
+
 > **NOTE:** Be patient when installing the source gem. Building wxRuby3 takes a while and when wxWidgets is included event more. 
 
+> **NOTE:** Be aware that for prerelease versions of the gem you should add the `--pre` argument to the `gem install` command. 
+
 ## Building from source
 
-Checkout the wxRuby3 sources from [GitHub](https://github.com/mcorino/wxRuby3).
+Checkout the wxRuby3 sources from [GitHub](https://github.com/mcorino/wxRuby3) or download and unpack a release package.
 
-Basic requirements are the same as for installing the source gem. Gem dependencies are listed in the Gemfile in the root
-of the wxRuby3 tree.
+Requirements are the same as for installing the source gem. Gem dependencies are listed in the Gemfile in the root
+of the wxRuby3 tree and should be installed by executing `bundle install`.<br>
+To be able to generate HTML documentation the optional `:documentation` group should be included.<br>
+To be able to run the Rake memory check task the option `:develop` group should be included.
 
 The wxRuby3 project provides a Rake based build system. Call `rake help` to get an overview of the available commands.
 As mentioned there the `rake configure` command is required as the very first command. Call `rake configure[--help]` to

data/README.md

@@ -1,9 +1,11 @@
 [![Linux wxGTK](https://github.com/mcorino/wxRuby3/actions/workflows/linux.yml/badge.svg)](https://github.com/mcorino/wxRuby3/actions/workflows/linux.yml)
 [![Windows wxMSW](https://github.com/mcorino/wxRuby3/actions/workflows/msw.yml/badge.svg)](https://github.com/mcorino/wxRuby3/actions/workflows/msw.yml)
+[![Mac wxOSX](https://github.com/mcorino/wxRuby3/actions/workflows/mac.yml/badge.svg)](https://github.com/mcorino/wxRuby3/actions/workflows/mac.yml)
+
 [![License](https://img.shields.io/badge/license-MIT-yellowgreen.svg)](LICENSE)
 [![Gem Version](https://badge.fury.io/rb/wxruby3.svg)](https://badge.fury.io/rb/wxruby3)
-
 [![Documentation](https://img.shields.io/badge/docs-pages-blue.svg)](https://mcorino.github.io/wxRuby3)
+[![Chat](https://img.shields.io/gitter/room/mcorino/wxruby)](https://gitter.im/mcorino/wxruby3)
 
 # README for wxRuby3
 
@@ -33,13 +35,13 @@ Wx::App.run do
 end
 ```
 
-![Hello_World](assets/hello_world.png "Hello World sample")
+![Hello_World](assets/hello_world_combi.png "Hello World sample")
 
 ### Hello Button
 
 Anyone who is familiar with wxWidgets should feel right at home since the API may be Ruby-fied, it is still easily 
 recognizable (but being Ruby-fied allowing for elegant and compact coding). And for those that do not have previous 
-experience do not fear, wxRuby3 comes with detailed [documentation](https://mcorino.github.io/wxRuby3/file.00_starting.html) and lots of examples and test.    
+experience, do not fear, wxRuby3 comes with detailed [documentation](https://mcorino.github.io/wxRuby3/file.00_starting.html) and lots of examples and tests.    
 
 ```ruby
 require 'wx'
@@ -56,8 +58,7 @@ end
 Wx::App.run { TheFrame.new('Hello world!').show }
 ```
 
-![Hello_Button](assets/hello_button.png "Hello Button sample")
-![Hello_Button_Clicked](assets/hello_button_clicked.png "Hello Button sample clicked")
+![Hello_Button_Clicked](assets/hello_button_clicked_combi.png "Hello Button sample clicked")
 
 
 ## wxRuby3 licence
@@ -99,12 +100,39 @@ Currently the following are fully supported:
 |----------------------------------------------------------------------------|-----------------| --- |
 | Windows 10 (tested)<br>(most likely also Windows 11)                       | Ruby >= 2.5<br>(RubyInstaller MSYS2-DevKit) | wxWidgets >= 3.2 |
 | Linux (tested; any AMD-64 distribution)<br>(most likely also i686 and ARM) | Ruby >= 2.5 | wxWidgets >= 3.2 |
+| MacOS >= 10.10 using Cocoa (tested on AMD-64 and ARM64 M2 Chip)            | Ruby >= 2.5 | wxWidgets >= 3.2 | 
 
 Support for other platforms is not being actively developed at present,
 but patches are welcome. It is likely to be much simpler to get wxRuby
 working on similar modern systems (eg FreeBSD or Solaris with GTK) than
 on legacy systems (eg Windows 98, Mac OS 9).
 
+### How can I install wxRuby3?
+
+wxRuby3 is distributed as a Ruby gem on [RubyGems](https://rubygems.org).<br>
+Apart from a regular source-only version of the gem there is also a binary gem version for Windows 10 provided (for the 
+latest stable Ruby version at the time of publishing) which includes an embedded wxWidgets installation (also latest 
+stable version). 
+
+Installing the binary gem version on Windows requires no additional software to be installed except for a supported 
+version of the Ruby interpreter.<br>
+To install the source-only gem the following software is required:
+
+| Sofware                                       | Notes                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
+|-----------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Ruby                                          | A supported version of the Ruby interpreter needs to be installed.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| C++ compiler<br>(incl. dev tools like `make`) | On linux a recent version of the GNU C++ compiler (with c++-14 support) needs to be installed<br>On Windows the RubyInstaller MSYS2-Devkit needs to be installed<br>On MacOS XCode with commandline tools needs to be installed                                                                                                                                                                                                                                                                                                                                                                                                              |
+| Git version control toolkit                   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+| SWIG >= 3.0.12                                | On MacOS install [Homebrew](https://brew.sh/) and than `brew install swig`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+| Doxygen (>= 1.9.1, <= 1.9.6)                  | Doxygen > 1.9.6 has changes that cause problems with the wxWidgets doxygen files.<br>On MacOS: `brew tap mcorino/wxruby3` and than `brew install doxygen@1.9.6` (default brew recipe installs 1.9.7)                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+| wxWidgets >= 3.2 (*OPTIONAL*)                 | On Linux most distributions provide system installable (development) packages for wxWidgets providing a supported version. Alternatively you can fairly easily install your own preferred version manually (see the [wxWidgets](https://wxwidgets.org) project for details).<br>On Windows and MacOS the process is less straightforward (also here see the [wxWidgets](https://wxwidgets.org) project for details).<br>The wxRuby3 source-only gem can also be installed using a private local wxWidgets installation or an embedded installation (most likely preferred on Windows and MacOS). See [INSTALL](INSTALL.md) for more details. |    
+
+In case the prerequisites above are met the (source-only or binary) gem can be installed executing the following command:
+
+```shell
+gem install wxruby3
+```
+
 ### Where can I ask a question, or report a bug?
 
 Use GitHUb Issues.
@@ -130,7 +158,7 @@ some use a more modern coding style than others.
 
 Complete (more or less) wxRuby API documentation should be part of any
 complete wxRuby3 build. This tends to focus on providing a reference
-of all available modules, classes ad methods and how to use specific 
+of all available modules, classes and methods and how to use specific 
 classes and methods, rather than on how to construct an application 
 overall.
 This documentation (for the latest release) is also available online
@@ -162,7 +190,7 @@ If you know of a feature in wxWidgets that you would like to see
 supported in wxRuby3 you are free to ask but do not **EXPECT** unconditional 
 agreement or immediate response. 
 
-### How does wxRuby3 relate to the wxRuby 2.0 (and even older 0.6.0 release)?
+### How does wxRuby3 relate to the wxRuby 2.0 (and even older 0.6.0) release?
 
 wxRuby 0.6.0 was the last in a series of releases developed using a
 different approach in the early days of wxRuby. Work on this series
@@ -180,5 +208,9 @@ maintainable solution.
 
 ### I am getting an error trying to install or compile wxRuby3
 
-Please double-check the [INSTALL](INSTALL.md) documents, and search issue archives. If 
+Please double-check the instructions above and in the [INSTALL](INSTALL.md) document and search issue archives. If 
 this doesn't help, please post your question using GitHub Issues.
+
+### Is there another, more declarative way, for writing wxRuby3 desktop GUI applications?
+
+Yes. [Glimmer DSL for WX](https://github.com/AndyObtiva/glimmer-dsl-wx) enables software engineers to build GUI using wxruby3 following the Ruby way with the least amount of code possible. That is by offering a minimalistic declarative high-level DSL that maps visually to the way software engineers think about the GUI hierarchy in addition to adopting Rails' strategy of Convention over Configuration via smart defaults and automation of wxruby3 low-level details. You can check out the [Glimmer DSL for WX README "Coming From wxruby3" section](https://github.com/AndyObtiva/glimmer-dsl-wx#coming-from-wxruby3) for more information on how to translate wxruby3 apps to [Glimmer DSL for WX](https://github.com/AndyObtiva/glimmer-dsl-wx) syntax.

data/lib/wx/core/brush.rb

@@ -0,0 +1,6 @@
+
+module Wx
+
+  TheBrushList = Wx::Brush
+
+end

data/lib/wx/core/event_loop.rb

@@ -0,0 +1,7 @@
+
+module Wx
+
+  # simply an alias
+  EventLoop = GUIEventLoop
+
+end

data/lib/wx/core/events/evt_list.rb

@@ -1002,6 +1002,12 @@ class Wx::EvtHandler
       Wx::EVT_MEDIA_PAUSE,
       Wx::MediaEvent
     ] if Wx.const_defined?(:EVT_MEDIA_PAUSE)
+  # from wxHyperlinkEvent
+  self.register_event_type EventType[
+      'evt_hyperlink', 1,
+      Wx::EVT_HYPERLINK,
+      Wx::HyperlinkEvent
+    ] if Wx.const_defined?(:EVT_HYPERLINK)
   # from wxCommandEvent
   self.register_event_type EventType[
       'evt_button', 1,
@@ -1388,4 +1394,5 @@ class Wx::EvtHandler
       Wx::EVT_DIRCTRL_FILEACTIVATED,
       Wx::GenericDirCtrl
     ] if Wx.const_defined?(:EVT_DIRCTRL_FILEACTIVATED)
+  # from wxHyperlinkCtrl
 end

data/lib/wx/core/evthandler.rb

@@ -22,9 +22,17 @@ class Wx::EvtHandler
   # methods; used internally by disconnect (see EvtHandler.i)
   EVENT_NAME_TYPE_MAP = {}
   private_constant :EVENT_NAME_TYPE_MAP
+  # Hash to look up event handler arity from symbol names of evt handler
+  # methods; internal use
+  EVENT_NAME_EVENT_ARITY_MAP = {}
+  private_constant :EVENT_NAME_EVENT_ARITY_MAP
 
   class << self
 
+    def event_type_arity(name)
+      EVENT_NAME_EVENT_ARITY_MAP[name.to_sym] || 0
+    end
+
     def get_event_type_class_map
       EVENT_TYPE_CLASS_MAP
     end
@@ -79,8 +87,8 @@ class Wx::EvtHandler
 
   # Given the Integer constant Wx::EVT_XXX, returns the convenience
   # handler method name associated with that type of event.
-  def self.event_name_for_type(name)
-    EVENT_NAME_TYPE_MAP.key(name)
+  def self.event_name_for_type(evt_id)
+    EVENT_NAME_TYPE_MAP.key(evt_id)
   end
 
   # Given an integer value +int_val+, returns the name of the EVT_xxx
@@ -121,6 +129,8 @@ class Wx::EvtHandler
       return
     end
 
+    EVENT_NAME_EVENT_ARITY_MAP[ev_type.name.to_sym] = ev_type.arity
+
     # set up the evt_xxx method
     case ev_type.arity
     when 0 # events without an id

data/lib/wx/core/font.rb

@@ -1,22 +1,30 @@
 
 require_relative './font/encoding'
 
-class Wx::Font
-  class << self
-    # Returns the name of the platform's default font encoding 
-    def get_default_encoding_name
-      ENCODING_NAMES[ get_default_encoding ]
-    end
+module Wx
+
+  class Font
+    class << self
+      # Returns the name of the platform's default font encoding
+      def get_default_encoding_name
+        ENCODING_NAMES[ get_default_encoding ]
+      end
 
-    # Sets the default encoding to be +enc+, which may be the string
-    # name of an encoding (eg 'UTF8') or an internal WxWidgets flag 
-    # (eg Wx::FONTENCODING_UTF8).
-    def set_default_encoding_name(enc)
-      if flag_int = ENCODING_NAMES.index(enc.upcase)
-        set_default_encoding(Wx::FontEncoding.new(flag_int))
-      else
-        raise ArgumentError, "Unknown font encoding name '#{enc}'"
+      # Sets the default encoding to be +enc+, which may be the string
+      # name of an encoding (eg 'UTF8') or an internal WxWidgets flag
+      # (eg Wx::FONTENCODING_UTF8).
+      def set_default_encoding_name(enc)
+        if flag_int = ENCODING_NAMES.index(enc.upcase)
+          set_default_encoding(Wx::FontEncoding.new(flag_int))
+        else
+          raise ArgumentError, "Unknown font encoding name '#{enc}'"
+        end
       end
     end
   end
+
+  # make this simply an alias for the Font class so the #find_or_create_font methods
+  # can be accessed through that name too.
+  TheFontList = Font
+
 end

data/lib/wx/core/helpprovider.rb

@@ -6,9 +6,9 @@ class Wx::HelpProvider
     # SWIG Director; it can't be reaped and re-wrapped later. The
     # easiest way is to make the currently set one an instance variable
     # of this class
-    alias :__wx_set :set
+    wx_set = instance_method :set
     define_method(:set) do | help_provider |
-      __wx_set(help_provider)
+      wx_set.bind(self).call(help_provider)
       @__hp__ = help_provider
     end
   end

data/lib/wx/core/image.rb

@@ -66,6 +66,39 @@ 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)

data/lib/wx/core/listctrl.rb

@@ -3,8 +3,23 @@ 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 +34,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/log.rb

@@ -14,7 +14,97 @@ 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 << 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