wxruby3 0.9.2-x64-mingw-ucrt → 0.9.3-x64-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48854a18e516defd6648ebc670fbd1d2a35630c5729822d69fccbf53d0738a39
-  data.tar.gz: 21126e8c1a3c61e291ed9109269ed25ea626ff686cf4f06a4ed889983b4c57c5
+  metadata.gz: a2a8e8e3953aef31ac0b70927370fcd6cfdbc04787dbd5e33371a3dddfe2f0dc
+  data.tar.gz: c35adef75eb90234d21087533e2d376130172689ce6d4a1aa4cd8c1d549a45b6
 SHA512:
-  metadata.gz: 68e8915b663e8754dff9703c5e5d30b34a465aea4f389734a403d75321f8129c7abc6a9ff92dd2b195a5b30e48aea8ac16abc6761d31a501f53345ffa03a39fa
-  data.tar.gz: 9322c2cde67925cc894616177b8858ff584ca5f177125b66f20442b662968985e91776c7cdeb7573e6d0a760970674450dc49b0b68634f890d7457b846af90bc
+  metadata.gz: a2a3ee55cda0961559da5af1b818b148d3f7bebb4ae0bf0096b2e07cdff552e0907ad4bfab5678e7cb2fb8eea3aa1e8c74d54d7817d32f0d6b4b03e9d9f726ac
+  data.tar.gz: 7c0f4533356c17073dfaf2a347ff48aeadd85ff223fca12bf8ed85d3d67ef1b4480a9bc4c87cd01826ce81d928121c993d76a3fefbbfec14e4749210cf7a2abc

data/INSTALL.md

@@ -10,14 +10,14 @@ Below are installation instructions for Linux, Windows, and Mac (both AMD64 and
 
 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)                                                                                                                                                                                                             |
+| 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 <code>sudo xcode-select --install</code> |
+| Git version control toolkit                   |                                                                                                                                                                                                                                                                              |
+| SWIG >= 3.0.12                                | On MacOS install Homebrew (https://brew.sh) and than <code>brew install swig</code>                                                                                                                                                                                          |
+| Doxygen (>= 1.9.1, <= 1.9.6)                  | Doxygen > 1.9.6 has changes that cause problems with the wxWidgets doxygen files.<br>On MacOS: <code>brew tap mcorino/wxruby3</code> and than `brew install doxygen@1.9.6` (default brew recipe installs 1.9.7)                                                              |
+| wxWidgets (>= 3.2)                            | See the <b>wxWidgets installation</b> section below.                                                                                                                                                                                                                         |
 
 The wxRuby3 build process requires `git` to clone a copy of the wxWidgets Github repository to extract the interface 
 specifications from.<br>
@@ -57,46 +57,41 @@ gem install wxruby3 -- WITH_WXWIN=1
 
 Also a wxWidgets installation (version 3.2 or later) is required for which there are multiple options.
 
-1. System installed wxWidgets version (including development package)<br>
-   <br>
+1. System installed wxWidgets version (including development package)<br/>
+   <br/>
    This is the default method used when installing the source gem without any options.<br>
    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 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
+   the standard distribution packages.<br/> 
+   <br/>
+   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
+   ```
+   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 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>
-
-```shell
+   ```shell
    gem install wxruby3 -- WXWIN=/path/to/wx/install 
-```
+   ```
 
 3. Automatic installed, embedded, wxWidgets version<br>
    <br>
    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 stable wxWidgets release (>= 3.2) from GitHub:
-
-```shell
+   ```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
@@ -104,16 +99,27 @@ and use that for the gem installation. In that case the user is required to gene
 provided to the gem installation as follows:
 
 ```shell
-   gem install wxruby3 -- WXWIN=/path/to/wx/install WXXML=/path/to/wx/doxygen/xml
+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
+Please also not that in case of option **2** 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. 
 
+### Bundled CLI
+
+Installing the wxRuby3 gem will also install the bundled `wxruby` CLI binary.
+
+Currently this binary can be used to run the bundled regression tests and access (run or copy) the bundled examples.
+Run the following command to see the options:
+
+```shell
+wxruby --help
+```
+
 ## Building from source
 
 Checkout the wxRuby3 sources from [GitHub](https://github.com/mcorino/wxRuby3) or download and unpack a release package.

data/README.md

@@ -96,11 +96,11 @@ of these products.
 
 Currently the following are fully supported:
 
-| Platform                                                                   | Ruby version(s) | wxWidgets version(s) |
-|----------------------------------------------------------------------------|-----------------| --- |
-| 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 |
+| Platform                                                                   | Ruby version(s)                             | wxWidgets version(s) |
+|----------------------------------------------------------------------------|---------------------------------------------|----------------------|
+| 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
@@ -118,14 +118,16 @@ Installing the binary gem version on Windows requires no additional software to
 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. |    
+| 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 with Homebrew                                                                                                                                                                                                  |
+| Doxygen (>= 1.9.1, <= 1.9.6)                  | Doxygen > 1.9.6 has changes that cause problems with the wxWidgets doxygen files.                                                                                                                                               |
+| wxWidgets >= 3.2 (*OPTIONAL*)                 | On Linux most distributions provide system installable (development) packages for wxWidgets providing a supported version.<br>Alternatively you can fairly easily install your own preferred version manually.                  |    
+
+See the [INSTALL](INSTALL.md) document for more details.
 
 In case the prerequisites above are met the (source-only or binary) gem can be installed executing the following command:
 
@@ -154,7 +156,9 @@ distribution comes with numerous samples which illustrate how to use
 many specific parts of the API. A good one to start with is the
 'minimal' sample, which provides an application skeleton. All the
 bundled samples are expected to work with current wxRuby3, although
-some use a more modern coding style than others.
+some use a more modern coding style than others. Use the bundled `wxruby`
+CLI to access the samples (see the section **Bundled CLI** in 
+the [INSTALL](INSTALL.md) document for more details).
 
 Complete (more or less) wxRuby API documentation should be part of any
 complete wxRuby3 build. This tends to focus on providing a reference
@@ -213,4 +217,9 @@ 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.
+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/bitmap_combobox.rb

@@ -8,32 +8,28 @@
 
 module Wx
 
-  class BitmapCombobox < Wx::ComboBox
-
-    # We need to cache client data in Ruby variables as we cannot access items
-    # during the GC mark phase as for some platforms (WXMSW at least) that would
-    # involve calling methods that would break in that phase.
+  class BitmapComboBox < Wx::ComboBox
 
     wx_append = instance_method :append
-    define_method :append do |item, bitmap=Wx::NULL_BITMAP, data=nil|
-      itm_pos = if data
-                  wx_append.bind(self).call(item, bitmap, data)
-                else
-                  wx_append.bind(self).call(item, bitmap)
-                end
-      client_data_store.insert(itm_pos, data)
-      itm_pos
+    define_method :append do |item, *rest| #bitmap=Wx::NULL_BITMAP, data=nil|
+      if ::Array === item
+        super(item, *rest)
+      elsif rest.empty? || Wx::Bitmap === rest.first
+        wx_append.bind(self).call(item, *rest)
+      else
+        super(item, *rest)
+      end
     end
 
     wx_insert = instance_method :insert
-    define_method :insert do |item, bitmap, pos, data=nil|
-      itm_pos = if data
-                  wx_insert.bind(self).call(item, bitmap, pos, data)
-                else
-                  wx_insert.bind(self).call(item, bitmap, pos)
-                end
-      client_data_store.insert(itm_pos, data)
-      itm_pos
+    define_method :insert do |item, *rest| # bitmap, pos, data=nil|
+      if ::Array === item
+        super(item, *rest)
+      elsif rest.empty? || Wx::Bitmap === rest.first
+        wx_insert.bind(self).call(item, *rest)
+      else
+        super(item, *rest)
+      end
     end
 
   end

data/lib/wx/core/combobox.rb

@@ -8,7 +8,17 @@
 
 require_relative './controlwithitems'
 
-class Wx::ComboBox
-  alias :get_item_data :get_client_data
-  alias :set_item_data :set_client_data
+module Wx
+
+  class ComboBox
+
+    # redefine #clear method to take care of client data and to call the proper #clear_items method
+    # (not the #clear method inherited from the TextEntry mixin)
+    wx_clear = instance_method :clear_items
+    define_method :clear do
+      wx_clear.bind(self).call
+    end
+
+  end
+
 end

data/lib/wx/core/controlwithitems.rb

@@ -9,149 +9,59 @@
 # Superclass of a variety of controls that display lists of items (eg
 # Choice, ListBox, CheckListBox)
 
-class Wx::ControlWithItems
+module Wx
 
-  # Overload to provide Enumerator without block
-  wx_each_string = instance_method :each_string
-  define_method :each_string do |&block|
-    if block
-      wx_each_string.bind(self).call(&block)
-    else
-      ::Enumerator.new { |y| wx_each_string.bind(self).call { |ln| y << ln } }
-    end
-  end
-
-  # We need to cache client data in Ruby variables as we cannot access items
-  # during the GC mark phase as for some platforms (WXMSW at least) that would
-  # involve calling methods that would break in that phase.
-
-  def client_data_store
-    @client_data ||= []
-  end
-  private :client_data_store
-
-  wx_set_client_data = instance_method :set_client_data
-  define_method :set_client_data do |item, data|
-    item = item.to_i
-    wx_set_client_data.bind(self).call(item, data)
-    client_data_store[item] = data
-  end
-
-  def get_client_data(item)
-    client_data_store[item.to_i]
-  end
+  class ControlWithItems
 
-  wx_append = instance_method :append
-  define_method :append do |item, data=nil|
-    itm_pos = -1
-    if data
-      if ::Array === item
-        if !(::Array === data)
-          ::Kernel.raise ::TypeError.new("Expected Array for argument 3")
-        elsif data.size != item.size
-          ::Kernel.raise ::ArgumentError.new("item and data array must be equal size")
-        end
-        if sorted?
-          item.each_with_index do |itm, ix|
-            itm_pos = wx_append.bind(self).call(itm, data[ix])
-            client_data_store.insert(itm_pos, data[ix])
-          end
-        else
-          offs = get_count
-          itm_pos = wx_append.bind(self).call(item)
-          item.size.times { |ix| set_client_data(offs+ix, data[ix]) }
-        end
+    # make sure to honor the inherited common overloads
+    wx_get_client_object = instance_method :get_client_object
+    define_method :get_client_object do |*args|
+      if args.empty?
+        super()
       else
-        itm_pos = wx_append.bind(self).call(item, data)
-        client_data_store.insert(itm_pos, data)
+        wx_get_client_object.bind(self).call(*args)
       end
-    else
-      if ::Array === item
-        if sorted?
-          item.each_with_index do |itm, ix|
-            itm_pos = wx_append.bind(self).call(itm, data[ix])
-            client_data_store.insert(itm_pos, nil)
-          end
-        else
-          itm_pos = wx_append.bind(self).call(item)
-          client_data_store.concat(::Array.new(item.size))
-        end
+    end
+    wx_set_client_object = instance_method :set_client_object
+    define_method :set_client_object do |*args|
+      if args.size < 2
+        super(*args)
       else
-        itm_pos = wx_append.bind(self).call(item)
-        client_data_store.insert(itm_pos, nil)
+        wx_set_client_object.bind(self).call(*args)
       end
     end
-    itm_pos
-  end
+    # redefine aliases
+    alias :client_object :get_client_object
+    alias :client_object= :set_client_object
 
-  wx_insert = instance_method :insert
-  define_method :insert do |item, pos, data=nil|
-    itm_pos = -1
-    if data
-      if ::Array === item
-        if !(::Array === data)
-          ::Kernel.raise ::TypeError.new("Expected Array for argument 3")
-        elsif data.size != item.size
-          ::Kernel.raise ::ArgumentError.new("item and data array must be equal size")
-        end
-        if sorted?
-          item.each_with_index do |itm, ix|
-            itm_pos = wx_insert.bind(self).call(itm, data[ix])
-            client_data_store.insert(itm_pos, data[ix])
-          end
-        else
-          itm_pos = wx_insert.bind(self).call(item, pos)
-          client_data_store.insert(pos, *::Array.new(item.size))
-          item.size.times { |ix| set_client_data(pos+ix, data[ix]) }
-        end
-      else
-        itm_pos = wx_insert.bind(self).call(item, pos, data)
-        client_data_store.insert(itm_pos, data)
-      end
-    else
-      if ::Array === item
-        if sorted?
-          item.each_with_index do |itm, ix|
-            itm_pos = wx_insert.bind(self).call(itm)
-            client_data_store.insert(itm_pos, nil)
-          end
-        else
-          itm_pos = wx_insert.bind(self).call(item, pos)
-          client_data_store.insert(pos, *::Array.new(item.size))
-        end
+    alias :get_client_data :get_client_object
+    alias :set_client_data :set_client_object
+
+    alias :has_client_data :has_client_object_data
+    alias :has_client_data? :has_client_object_data
+
+    alias :get_item_data :get_client_object
+    alias :set_item_data :set_client_object
+
+    # Overload to provide Enumerator without block
+    wx_each_string = instance_method :each_string
+    define_method :each_string do |&block|
+      if block
+        wx_each_string.bind(self).call(&block)
       else
-        itm_pos = wx_insert.bind(self).call(item, pos)
-        client_data_store.insert(pos, nil)
+        ::Enumerator.new { |y| wx_each_string.bind(self).call { |ln| y << ln } }
       end
     end
-    itm_pos
-  end
 
-  wx_set = instance_method :set
-  define_method :set do |items, data=nil|
-    if data
-      if !(::Array === data)
-        ::Kernel.raise ::TypeError.new("Expected Array for argument 2")
-      elsif data.size != items.size
-        ::Kernel.raise ::ArgumentError.new("items and data array must be equal size")
-      end
-    end
-    wx_set.bind(self).call(items)
-    client_data_store.clear
-    if data
-      items.each_with_index { |item, ix| set_client_data(item, data[ix]) }
-    end
-  end
+    # define these aliases so controls like ComboBox and OwnerDrawnComboBox and the like all end up with
+    # similar methods
 
-  wx_clear = instance_method :clear
-  define_method :clear do
-    wx_clear.bind(self).call
-    client_data_store.clear
-  end
+    alias :get_list_selection :get_selection
+    alias :set_list_selection :set_selection
+
+    alias :get_list_string_selection :get_string_selection
+    alias :set_list_string_selection :set_string_selection
 
-  wx_delete = instance_method :delete
-  define_method :delete do |item|
-    wx_delete.bind(self).call(item.to_i)
-    client_data_store.slice!(item.to_i)
   end
+
 end

data/lib/wx/core/enum.rb

@@ -29,11 +29,27 @@ class Wx::Enum
   end
 
   def !
-    self.to_i == 0
+    to_i == 0
+  end
+
+  def allbits?(mask)
+    to_i.allbits?(mask)
+  end
+
+  def anybits?(mask)
+    to_i.anybits?(mask)
+  end
+
+  def nobits?(mask)
+    to_i.nobits?(mask)
   end
 
   def hash
     @value.hash
   end
 
+  def to_s
+    to_i.to_s
+  end
+
 end

data/lib/wx/core/event.rb

@@ -29,7 +29,7 @@ module Wx
     alias :id :get_id
   end
 
-  class Wx::CommandEvent
+  class CommandEvent
 
     # overload the #initialize method to add a check on a
     # correct match between EventType and event class
@@ -43,6 +43,11 @@ module Wx
       end
     end
 
+    alias :set_client_data :set_client_object
+    alias :client_data= :set_client_object
+    alias :get_client_data :get_client_object
+    alias :client_data :get_client_object
+
   end
 
   # reduce mapping warnings for this unpublished event class

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

@@ -1182,12 +1182,12 @@ class Wx::EvtHandler
   self.register_event_type EventType[
       'evt_dialup_connected', 0,
       Wx::EVT_DIALUP_CONNECTED,
-      Wx::App
+      Wx::DialUpEvent
     ] if Wx.const_defined?(:EVT_DIALUP_CONNECTED)
   self.register_event_type EventType[
       'evt_dialup_disconnected', 0,
       Wx::EVT_DIALUP_DISCONNECTED,
-      Wx::App
+      Wx::DialUpEvent
     ] if Wx.const_defined?(:EVT_DIALUP_DISCONNECTED)
   # from wxWindow
   # from wxTopLevelWindow
@@ -1204,6 +1204,7 @@ class Wx::EvtHandler
   # from wxCheckBox
   # from wxButton
   # from wxToggleButton
+  # from wxBitmapToggleButton
   # from wxComboBox
   self.register_event_type EventType[
       'evt_combobox_dropdown', 1,
@@ -1486,12 +1487,12 @@ class Wx::EvtHandler
   self.register_event_type EventType[
       'evt_dirctrl_selectionchanged', 1,
       Wx::EVT_DIRCTRL_SELECTIONCHANGED,
-      Wx::GenericDirCtrl
+      Wx::TreeEvent
     ] if Wx.const_defined?(:EVT_DIRCTRL_SELECTIONCHANGED)
   self.register_event_type EventType[
       'evt_dirctrl_fileactivated', 1,
       Wx::EVT_DIRCTRL_FILEACTIVATED,
-      Wx::GenericDirCtrl
+      Wx::TreeEvent
     ] if Wx.const_defined?(:EVT_DIRCTRL_FILEACTIVATED)
   # from wxHyperlinkCtrl
   # from wxDialUpManager

data/lib/wx/core/evthandler.rb

@@ -10,6 +10,12 @@
 # EvtHandler. This includes all Wx::Window subclasses and Wx::App.
 
 class Wx::EvtHandler
+
+  alias :set_client_data :set_client_object
+  alias :client_data= :set_client_object
+  alias :get_client_data :get_client_object
+  alias :client_data :get_client_object
+
   # EventType is an internal class that's used to set up event handlers
   # and mappings.
   # * 'name' is the name of the event handler method in ruby
@@ -182,7 +188,7 @@ class Wx::EvtHandler
       # check arity <= 1
       if h_meth.arity>1
         Kernel.raise ArgumentError,
-                     "Event handler should not accept more than at most a single argument"
+                     "Event handler should not accept more than at most a single argument",
                      caller
       end
       # wrap method without any argument in anonymous proc to prevent strict argument checking
@@ -193,7 +199,7 @@ class Wx::EvtHandler
       end
     else
       Kernel.raise ArgumentError,
-                  "Specify event handler with a method, name, proc OR block"
+                  "Specify event handler with a method, name, proc OR block",
                   caller
     end
   end