wxruby3 0.9.0.pre.beta.10-x64-mingw-ucrt → 0.9.0.pre.beta.13-x64-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f6e7941faf953aaccbdd3190c6620f078e864099d452047cf549275a288bf89
-  data.tar.gz: ff440fc245055bd4ea02623335c4c00068b808b2c2a1314761f3c8f9a8486cbc
+  metadata.gz: eae5f34dc00087633f430dc388c9c98306ec7df94ea5b7205834f34ca9117b8c
+  data.tar.gz: 67dcfea784794e87c451a90ffe3338b324c3719c3285383de66d49b7a1556d66
 SHA512:
-  metadata.gz: c25bfc9999b42bd5cf1c4e80ac332b1d31c67882a725f6959acbe256d4c64be468fde151149e9d4ee58937e4f27e0d644332d9c8c83d85387b144c63a6ac457d
-  data.tar.gz: 074ee9e7abd96662182e4f86f792c319e49f7e5f108ca63404bba97c7d2b6d938e8520c1a315568ba34e0ace84d34949da5a65bfd457c0a1af1a391a559e238d
+  metadata.gz: 5b725ae687bf826247fde3e8946833b52260081537d4561bd95ac4583b7b33bb529a4704b6e0937d4dc8888dd2a0dd3e0a97d8ca44b6afe7cced6a21debf3a82
+  data.tar.gz: 2ed1d66559f48a8fb4a9b0be5c4c28fe863146b5ec66115804ef1c48c6c21ec1ff7963ddadfa043f0ffb0adaad0095b7c7c530ea4a3b776ba539dad8cc04ed69

data/INSTALL.md

@@ -0,0 +1,85 @@
+<!--
+# @markup markdown
+-->
+
+# Installation of wxRuby3
+
+## 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
+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:
+
+```sh
+gem install wxruby3 --platform=ruby
+```
+
+When installing the source gem the following basic requirements 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/)
+
+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>
+   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 (see [here](TODO) for more details). 
+   
+
+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)
+   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
+   gem install wxruby3 -- WXWIN=/path/to/wx/install 
+```
+   
+3. Automatic installed wxWidgets version<br>
+   <br>
+   This is the easiest method when the being system 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:
+
+
+```sh
+   gem install wxruby3 -- WITH_WXWIN=1
+```
+
+> **NOTE:** Be patient when installing the source gem. Building wxRuby3 takes a while and when wxWidgets is included event more. 
+
+## Building from source
+
+Checkout the wxRuby3 sources from [GitHub](https://github.com/mcorino/wxRuby3).
+
+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.
+
+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
+get a detailed overview of the options for this command.<br>
+As with the source gem 3 options exist for the wxWidgets installation which will have to be specified to `rake configure`.  
+
+When wxRuby3 has been configured the extensions can be build by calling the `rake build` command. The wxRuby3 build 
+commands are executed using parallel task execution by default.
+
+When the build has finished without errors the regression tests can be run by calling `rake test`.
+
+For more details concerning the wxRuby3 development strategy and build options see [here](TODO). 

data/README.md

@@ -7,6 +7,8 @@
 
 # README for wxRuby3
 
+![Logo](assets/logo.svg "wxRuby3")
+
 Reviving wxRuby
 
 ## Introduction

data/assets/logo.svg

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.2" width="120.53mm" height="85.15mm" viewBox="1364 6894 12053 8515" preserveAspectRatio="xMidYMid" fill-rule="evenodd" stroke-width="28.222" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg" xmlns:ooo="http://xml.openoffice.org/svg/export" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:presentation="http://sun.com/xmlns/staroffice/presentation" xmlns:smil="http://www.w3.org/2001/SMIL20/" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xml:space="preserve">
+ <defs class="EmbeddedBulletChars">
+  <g id="bullet-char-template-57356" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"/>
+  </g>
+  <g id="bullet-char-template-57354" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"/>
+  </g>
+  <g id="bullet-char-template-10146" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"/>
+  </g>
+  <g id="bullet-char-template-10132" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"/>
+  </g>
+  <g id="bullet-char-template-10007" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"/>
+  </g>
+  <g id="bullet-char-template-10004" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"/>
+  </g>
+  <g id="bullet-char-template-9679" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"/>
+  </g>
+  <g id="bullet-char-template-8226" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"/>
+  </g>
+  <g id="bullet-char-template-8211" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"/>
+  </g>
+  <g id="bullet-char-template-61548" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 173,740 C 173,903 231,1043 346,1159 462,1274 601,1332 765,1332 928,1332 1067,1274 1183,1159 1299,1043 1357,903 1357,740 1357,577 1299,437 1183,322 1067,206 928,148 765,148 601,148 462,206 346,322 231,437 173,577 173,740 Z"/>
+  </g>
+ </defs>
+ <g class="Page">
+  <g class="Group">
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id3">
+     <rect class="BoundingBox" stroke="none" fill="none" x="1364" y="6894" width="5653" height="1964"/>
+     <path fill="rgb(241,13,12)" stroke="none" d="M 1470,8751 L 6910,8751 6044,7000 2334,7000 1470,8751 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 1470,8751 L 6910,8751 6044,7000 2334,7000 1470,8751 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id4">
+     <rect class="BoundingBox" stroke="none" fill="none" x="2224" y="6894" width="3933" height="1964"/>
+     <path fill="rgb(241,13,12)" stroke="none" d="M 2330,7000 L 6050,7000 5458,8751 2921,8751 2330,7000 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 2330,7000 L 6050,7000 5458,8751 2921,8751 2330,7000 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id5">
+     <rect class="BoundingBox" stroke="none" fill="none" x="2706" y="6894" width="2939" height="1964"/>
+     <path fill="rgb(241,13,12)" stroke="none" d="M 4216,7000 L 5538,8751 2812,8751 4216,7000 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 4216,7000 L 5538,8751 2812,8751 4216,7000 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id6">
+     <rect class="BoundingBox" stroke="none" fill="none" x="1374" y="8642" width="5634" height="3965"/>
+     <path fill="rgb(241,13,12)" stroke="none" d="M 4189,12500 L 6900,8749 1480,8749 4189,12500 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 4189,12500 L 6900,8749 1480,8749 4189,12500 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id7">
+     <rect class="BoundingBox" stroke="none" fill="none" x="2794" y="8644" width="1513" height="3964"/>
+     <path fill="rgb(241,13,12)" stroke="none" d="M 2900,8750 L 4200,12500 2900,8750 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 2900,8750 L 4200,12500 2900,8750 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id8">
+     <rect class="BoundingBox" stroke="none" fill="none" x="4064" y="8645" width="1513" height="3964"/>
+     <path fill="rgb(241,13,12)" stroke="none" d="M 5470,8751 L 4170,12501 5470,8751 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 5470,8751 L 4170,12501 5470,8751 Z"/>
+    </g>
+   </g>
+  </g>
+  <g class="Group">
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id9">
+     <rect class="BoundingBox" stroke="none" fill="none" x="7764" y="6895" width="5653" height="1964"/>
+     <path fill="rgb(255,255,0)" stroke="none" d="M 7870,8752 L 13310,8752 12444,7001 8734,7001 7870,8752 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 7870,8752 L 13310,8752 12444,7001 8734,7001 7870,8752 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id10">
+     <rect class="BoundingBox" stroke="none" fill="none" x="8624" y="6895" width="3933" height="1964"/>
+     <path fill="rgb(255,255,0)" stroke="none" d="M 8730,7001 L 12450,7001 11858,8752 9321,8752 8730,7001 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 8730,7001 L 12450,7001 11858,8752 9321,8752 8730,7001 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id11">
+     <rect class="BoundingBox" stroke="none" fill="none" x="9106" y="6895" width="2939" height="1964"/>
+     <path fill="rgb(255,255,0)" stroke="none" d="M 10616,7001 L 11938,8752 9212,8752 10616,7001 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 10616,7001 L 11938,8752 9212,8752 10616,7001 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id12">
+     <rect class="BoundingBox" stroke="none" fill="none" x="7774" y="8644" width="5634" height="3964"/>
+     <path fill="rgb(255,255,0)" stroke="none" d="M 10589,12501 L 13300,8750 7880,8750 10589,12501 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 10589,12501 L 13300,8750 7880,8750 10589,12501 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id13">
+     <rect class="BoundingBox" stroke="none" fill="none" x="9194" y="8645" width="1513" height="3964"/>
+     <path fill="rgb(255,255,0)" stroke="none" d="M 9300,8751 L 10600,12501 9300,8751 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 9300,8751 L 10600,12501 9300,8751 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id14">
+     <rect class="BoundingBox" stroke="none" fill="none" x="10464" y="8646" width="1513" height="3964"/>
+     <path fill="rgb(255,255,0)" stroke="none" d="M 11870,8752 L 10570,12502 11870,8752 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 11870,8752 L 10570,12502 11870,8752 Z"/>
+    </g>
+   </g>
+  </g>
+  <g class="Group">
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id15">
+     <rect class="BoundingBox" stroke="none" fill="none" x="4564" y="13444" width="5653" height="1965"/>
+     <path fill="rgb(36,83,255)" stroke="none" d="M 4670,13550 L 10110,13550 9244,15301 5534,15301 4670,13550 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 4670,13550 L 10110,13550 9244,15301 5534,15301 4670,13550 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id16">
+     <rect class="BoundingBox" stroke="none" fill="none" x="5424" y="13444" width="3933" height="1965"/>
+     <path fill="rgb(36,83,255)" stroke="none" d="M 5530,15301 L 9250,15301 8658,13550 6121,13550 5530,15301 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 5530,15301 L 9250,15301 8658,13550 6121,13550 5530,15301 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id17">
+     <rect class="BoundingBox" stroke="none" fill="none" x="5906" y="13444" width="2939" height="1965"/>
+     <path fill="rgb(36,83,255)" stroke="none" d="M 7416,15301 L 8738,13550 6012,13550 7416,15301 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 7416,15301 L 8738,13550 6012,13550 7416,15301 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id18">
+     <rect class="BoundingBox" stroke="none" fill="none" x="4574" y="9695" width="5633" height="3964"/>
+     <path fill="rgb(36,83,255)" stroke="none" d="M 7389,9801 L 10100,13552 4680,13552 7389,9801 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 7389,9801 L 10100,13552 4680,13552 7389,9801 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id19">
+     <rect class="BoundingBox" stroke="none" fill="none" x="5994" y="9694" width="1513" height="3964"/>
+     <path fill="rgb(36,83,255)" stroke="none" d="M 6100,13551 L 7400,9801 6100,13551 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 6100,13551 L 7400,9801 6100,13551 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.PolyPolygonShape">
+    <g id="id20">
+     <rect class="BoundingBox" stroke="none" fill="none" x="7264" y="9693" width="1513" height="3964"/>
+     <path fill="rgb(36,83,255)" stroke="none" d="M 8670,13550 L 7370,9800 8670,13550 Z"/>
+     <path fill="none" stroke="rgb(51,51,51)" stroke-width="212" stroke-linejoin="round" d="M 8670,13550 L 7370,9800 8670,13550 Z"/>
+    </g>
+   </g>
+  </g>
+ </g>
+</svg>

data/lib/wx/core/array_ext.rb

@@ -0,0 +1,26 @@
+
+module Wx
+
+  # Mixin module providing Array extensions.
+  module ArrayExt
+
+    def to_size
+      w, h = self
+      Wx::Size.new(w || Wx::DEFAULT_COORD, h  || Wx::DEFAULT_COORD)
+    end
+
+    def to_point
+      x, y = self
+      Wx::Point.new(x || Wx::DEFAULT_COORD, y || Wx::DEFAULT_COORD)
+    end
+
+    def to_real_point
+      x, y = self
+      Wx::RealPoint.new(x || Wx::DEFAULT_COORD, y || Wx::DEFAULT_COORD)
+    end
+
+  end
+
+  # extend standard Array class
+  ::Array.include(Wx::ArrayExt)
+end

data/lib/wx/core/art_locator.rb

@@ -0,0 +1,92 @@
+
+module Wx
+
+  module ArtLocator
+
+    ART_FOLDER = 'art'
+
+    class << self
+
+      # This is not put in a constants as cannot retrieve image handler info
+      # before an app has started
+      def art_extensions(art_type)
+        unless @art_extensions
+          @art_extensions = {
+            icon: if Wx::PLATFORM == 'WXMSW'
+                    %w[ico xpm]
+                  elsif Wx::PLATFORM == 'WXGTK'
+                    (%w[xpm]+Image.extensions).uniq
+                  else
+                    (%w[xbm xpm]+Image.extensions).uniq
+                  end,
+            bitmap: if Wx::PLATFORM == 'WXMSW'
+                      (%w[bmp xpm]+Image.extensions).uniq
+                    elsif Wx::PLATFORM == 'WXGTK'
+                      (%w[xpm]+Image.extensions).uniq
+                    else
+                      (%w[xbm xpm]+Image.extensions).uniq
+                    end,
+            cursor: if Wx::PLATFORM == 'WXMSW'
+                      %w[cur ico bmp]
+                    elsif Wx::PLATFORM == 'WXGTK'
+                      []
+                    else
+                      %w[xbm]
+                    end,
+            image: Image.extensions
+          }
+        end
+        @art_extensions[(art_type || :image).to_sym] || []
+      end
+      private :art_extensions
+
+      def art_folder
+        @art_folder ||= ART_FOLDER
+      end
+
+      def art_folder=(name)
+        @art_folder = name ? name.to_s : ART_FOLDER
+      end
+
+      def search_paths
+        @search_paths ||= []
+      end
+      private :search_paths
+
+      def add_search_path(*paths)
+        paths.flatten.each { |p| paths << s.to_s unless paths.include?(s.to_s) }
+      end
+      alias :add_search_paths :add_search_path
+
+      def _find_art(art_name, art_type, art_path, art_section, bmp_type)
+        art_paths = [art_path, File.join(art_path, art_folder)]
+        art_paths << File.join(art_paths.last, art_section) if art_section
+        art_paths << File.join(art_paths.last, art_type.to_s) if art_type
+        art_paths.reverse_each do |sp|
+          (bmp_type ? (Image.handler_extensions[bmp_type] || []) : art_extensions(art_type)).each do |ext|
+            fp = File.join(sp, "#{art_name}.#{ext}")
+            return fp if File.file?(fp)
+          end
+        end
+        nil
+      end
+      private :_find_art
+
+      def find_art(art_name, art_type: nil, art_path: nil, art_section: nil, bmp_type: nil)
+        unless art_path
+          caller_path = caller_locations(1).first.absolute_path
+          art_path = File.dirname(caller_path)
+          art_section ||= File.basename(caller_path, '.*')
+        end
+        bmp_type = nil if bmp_type == Wx::BitmapType::BITMAP_TYPE_ANY
+        unless fp = _find_art(art_name.to_s, art_type, art_path, art_section, bmp_type)
+          search_paths.find { |sp| fp = _find_art(art_name.to_s, art_type, sp, art_section, bmp_type) }
+        end
+        fp
+      end
+
+    end
+
+  end
+
+end

data/lib/wx/core/artprovider.rb

@@ -24,7 +24,7 @@ class Wx::ArtProvider
 
     wx_delete = instance_method(:delete)
     define_method(:delete) do | art_prov |
-      wx_push.bind(self).call(art_prov)
+      wx_delete.bind(self).call(art_prov)
       @__art_provs.delete(art_prov)
     end
   end

data/lib/wx/core/bitmap.rb

@@ -1,66 +1,103 @@
 # A platform-dependent image that can be drawn on the screen
-class Wx::Bitmap
-  # Allow wxRuby to guess the type of an image file from its extension.
-  BITMAP_TYPE_GUESS = { 
-    'bmp'  => Wx::BitmapType::BITMAP_TYPE_BMP,
-    'gif'  => Wx::BitmapType::BITMAP_TYPE_GIF,
-    'ico'  => Wx::BitmapType::BITMAP_TYPE_ICO,
-    'jpeg' => Wx::BitmapType::BITMAP_TYPE_JPEG,
-    'jpg'  => Wx::BitmapType::BITMAP_TYPE_JPEG,
-    'pbm'  => Wx::BitmapType::BITMAP_TYPE_PNM,
-    'pcx'  => Wx::BitmapType::BITMAP_TYPE_PCX,
-    'pgm'  => Wx::BitmapType::BITMAP_TYPE_PNM,
-    'png'  => Wx::BitmapType::BITMAP_TYPE_PNG,
-    'pnm'  => Wx::BitmapType::BITMAP_TYPE_PNM,
-    'ppm'  => Wx::BitmapType::BITMAP_TYPE_PNM,
-    'tga'  => Wx::BitmapType::BITMAP_TYPE_TGA,
-    'tif'  => Wx::BitmapType::BITMAP_TYPE_TIF,
-    'tiff' => Wx::BitmapType::BITMAP_TYPE_TIF,
-    'xbm'  => Wx::BitmapType::BITMAP_TYPE_XBM,
-    'xpm'  => Wx::BitmapType::BITMAP_TYPE_XPM
-  }
+module Wx
 
-  # Constructor copying data from an image
-  def self.from_image(img, depth = -1)
-    new(img, depth)
+  if Wx::PLATFORM == 'WXMSW'
+    ICON_DEFAULT_TYPE = BitmapType::BITMAP_TYPE_ICO
+  elsif Wx::PLATFORM == 'WXGTK'
+    ICON_DEFAULT_TYPE = BitmapType::BITMAP_TYPE_XPM
+  elsif Wx::PLATFORM == 'WXOSX'
+    ICON_DEFAULT_TYPE = BitmapType::BITMAP_TYPE_ICO
+  else
+    ICON_DEFAULT_TYPE = BitmapType::BITMAP_TYPE_XPM
   end
 
-  # Create a new bitmap from an icon
-  def self.from_icon(icon)
-    bmp = self.new
-    bmp.copy_from_icon(icon)
-    bmp
+  if Wx::PLATFORM == 'WXMSW'
+    BITMAP_DEFAULT_TYPE = BitmapType::BITMAP_TYPE_BMP
+  elsif Wx::PLATFORM == 'WXGTK'
+    BITMAP_DEFAULT_TYPE = BitmapType::BITMAP_TYPE_XPM
+  elsif Wx::PLATFORM == 'WXOSX'
+    BITMAP_DEFAULT_TYPE = BitmapType::BITMAP_TYPE_PICT
+  else
+    BITMAP_DEFAULT_TYPE = BitmapType::BITMAP_TYPE_XPM
   end
 
-  # Ruby methods that switch class are conventionally named to_foo
-  alias :to_image :convert_to_image
+  if Wx::PLATFORM == 'WXMSW'
+    CURSOR_DEFAULT_TYPE = BitmapType::BITMAP_TYPE_CUR
+  else
+    CURSOR_DEFAULT_TYPE = BitmapType::BITMAP_TYPE_INVALID # not supported
+  end
 
-  # Redefine the initialize method so it raises an exception if a
-  # non-existent file is given to the constructor; otherwise, wx Widgets
-  # just carries on with an empty bitmap, which may cause faults
-  # later. Also, be helpful and try to guess the bitmap type from the
-  # filename if it's not specified
-  wx_init = self.instance_method(:initialize)
-  define_method(:initialize) do | *args |
-    # If creating from a file, check it exists
-    if args[0].kind_of? String
-      if not File.exist?( File.expand_path(args[0]) )
-        Kernel.raise(ArgumentError, "Bitmap file does not exist: #{args[0]}")
-      end
-      # If type not specified, try to guess it from the file extension
-      if not args[1] and file_ext = args[0][/\w+$/]
-        args[1] = BITMAP_TYPE_GUESS[file_ext.downcase]
+  class Bitmap
+    # Allow wxRuby to guess the type of an image file from its extension.
+    BITMAP_TYPE_GUESS = {
+      'bmp'  => Wx::BitmapType::BITMAP_TYPE_BMP,
+      'gif'  => Wx::BitmapType::BITMAP_TYPE_GIF,
+      'ico'  => Wx::BitmapType::BITMAP_TYPE_ICO,
+      'jpeg' => Wx::BitmapType::BITMAP_TYPE_JPEG,
+      'jpg'  => Wx::BitmapType::BITMAP_TYPE_JPEG,
+      'pbm'  => Wx::BitmapType::BITMAP_TYPE_PNM,
+      'pcx'  => Wx::BitmapType::BITMAP_TYPE_PCX,
+      'pgm'  => Wx::BitmapType::BITMAP_TYPE_PNM,
+      'png'  => Wx::BitmapType::BITMAP_TYPE_PNG,
+      'pnm'  => Wx::BitmapType::BITMAP_TYPE_PNM,
+      'ppm'  => Wx::BitmapType::BITMAP_TYPE_PNM,
+      'tga'  => Wx::BitmapType::BITMAP_TYPE_TGA,
+      'tif'  => Wx::BitmapType::BITMAP_TYPE_TIF,
+      'tiff' => Wx::BitmapType::BITMAP_TYPE_TIF,
+      'xbm'  => Wx::BitmapType::BITMAP_TYPE_XBM,
+      'xpm'  => Wx::BitmapType::BITMAP_TYPE_XPM
+    }
+
+    # Constructor copying data from an image
+    def self.from_image(img, depth = -1)
+      new(img, depth)
+    end
+
+    # Create a new bitmap from an icon
+    def self.from_icon(icon)
+      bmp = self.new
+      bmp.copy_from_icon(icon)
+      bmp
+    end
+
+    # Ruby methods that switch class are conventionally named to_foo
+    alias :to_image :convert_to_image
+
+    # Redefine the initialize method so it raises an exception if a
+    # non-existent file is given to the constructor; otherwise, wx Widgets
+    # just carries on with an empty bitmap, which may cause faults
+    # later. Also, be helpful and try to guess the bitmap type from the
+    # filename if it's not specified
+    wx_init = self.instance_method(:initialize)
+    define_method(:initialize) do | *args |
+      # If creating from a file, check it exists
+      if args[0].kind_of? String
+        if not File.exist?( File.expand_path(args[0]) )
+          Kernel.raise(ArgumentError, "Bitmap file does not exist: #{args[0]}")
+        end
+        # If type not specified, try to guess it from the file extension
+        if not args[1] and file_ext = args[0][/\w+$/]
+          args[1] = BITMAP_TYPE_GUESS[file_ext.downcase]
+        end
       end
+      wx_init.bind(self).call(*args)
+    end
+
+    # Accepts a block, which will be passed a device context which can be
+    # used to draw upon the Bitmap
+    def draw
+      dc = Wx::MemoryDC.new
+      dc.select_object(self)
+      yield dc
+      dc.select_object( Wx::NULL_BITMAP )
     end
-    wx_init.bind(self).call(*args)
   end
 
-  # Accepts a block, which will be passed a device context which can be
-  # used to draw upon the Bitmap
-  def draw
-    dc = Wx::MemoryDC.new
-    dc.select_object(self)
-    yield dc
-    dc.select_object( Wx::NULL_BITMAP )
+  def self.Bitmap(name, bmp_type = nil)
+    art_path = File.dirname(caller_path = caller_locations(1).first.absolute_path)
+    art_owner = File.basename(caller_path, '.*')
+    art_file = ArtLocator.find_art(name, art_type: :bitmap, art_path: art_path, art_section: art_owner, bmp_type: bmp_type)
+    ::Kernel.raise ArgumentError, "Cannot locate art file for #{name}:Bitmap" unless art_file
+    Bitmap.new(art_file, bmp_type)
   end
 end

data/lib/wx/core/cursor.rb

@@ -0,0 +1,12 @@
+
+module Wx
+
+  def self.Cursor(name, bmp_type = nil, *rest)
+    art_path = File.dirname(caller_path = caller_locations(1).first.absolute_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)
+    ::Kernel.raise ArgumentError, "Cannot locate art file for #{name}:Cursor" unless art_file
+    Cursor.new(art_file, bmp_type || Wx::Bitmap::BITMAP_TYPE_GUESS[File.extname(art_file).sub(/\A\./,'')], *rest)
+  end
+
+end