wxruby3 0.9.0.pre.beta.10 → 0.9.0.pre.beta.13

data/tests/test_dc.rb

@@ -0,0 +1,70 @@
+
+require_relative './lib/wxapp_runner'
+
+class TestDC < Test::Unit::TestCase
+
+  def test_memory_dc
+    bmp = Wx::Bitmap.new(100, 100)
+    assert_nothing_raised do
+      Wx::MemoryDC.draw_on(bmp) do |mdc|
+        mdc.set_background(Wx::WHITE_BRUSH)
+        mdc.clear
+        mdc.set_pen(Wx::BLACK_PEN)
+        mdc.set_brush(Wx::WHITE_BRUSH)
+        mdc.draw_rectangle(0, 0, 60, 15)
+        mdc.draw_line(0, 0, 59, 14)
+        mdc.set_text_foreground(Wx::BLACK)
+        mdc.draw_text("x1", 0, 0)
+      end
+    end
+  end
+
+  def test_gc_dc
+    bmp = Wx::Bitmap.new(100, 100)
+    assert_nothing_raised do
+      Wx::MemoryDC.draw_on(bmp) do |mdc|
+        Wx::GCDC.draw_on(mdc) do |gdc|
+          gdc.set_background(Wx::WHITE_BRUSH)
+          gdc.clear
+          gdc.set_pen(Wx::BLACK_PEN)
+          gdc.set_brush(Wx::WHITE_BRUSH)
+          GC.start
+          gdc.draw_rectangle(0, 0, 60, 15)
+          gdc.draw_line(0, 0, 59, 14)
+          gdc.set_text_foreground(Wx::BLACK)
+          gdc.draw_text("x1", 0, 0)
+          GC.start
+        end
+      end
+    end
+  end
+
+  def test_gc_dc_stress
+    10.times do
+      bmp = Wx::Bitmap.new(100, 100)
+      assert_nothing_raised do
+        Wx::MemoryDC.draw_on(bmp) do |mdc|
+          Wx::GCDC.draw_on(mdc) do |gdc|
+
+            gc = gdc.get_graphics_context
+            gc.scale(0.9, 0.9)
+
+            10.times do |i|
+              gdc.set_background(Wx::WHITE_BRUSH)
+              gdc.clear
+              gdc.set_pen(Wx::BLACK_PEN)
+              gdc.set_brush(Wx::WHITE_BRUSH)
+              GC.start
+              gdc.draw_rectangle(0, 0, 60, 15)
+              gdc.draw_line(0, 0, 59, 14)
+              gdc.set_text_foreground(Wx::BLACK)
+              gdc.draw_text("x1", 0, 0)
+              GC.start
+            end
+          end
+        end
+      end
+    end
+  end
+
+end

data/tests/test_dialog.rb

@@ -1,6 +1,5 @@
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
-require 'wx'
+
+require_relative './lib/wxapp_runner'
 
 class DialogTests < Test::Unit::TestCase
 
@@ -16,13 +15,3 @@ class DialogTests < Test::Unit::TestCase
     assert_kind_of(Wx::Window, dlg)
   end
 end
-
-class TestApp < Wx::App
-  def on_init
-    Test::Unit::UI::Console::TestRunner.run(DialogTests)
-    false
-  end
-end
-
-app = TestApp.new
-app.run

data/tests/test_event_handling.rb

@@ -1,6 +1,5 @@
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
-require 'wx'
+
+require_relative './lib/wxapp_runner'
 
 class EventHandlingTests < Test::Unit::TestCase
 
@@ -91,13 +90,3 @@ class EventHandlingTests < Test::Unit::TestCase
     assert_boolean(!win.child.test_cmd_event)
   end
 end
-
-class TestApp < Wx::App
-  def on_init
-    Test::Unit::UI::Console::TestRunner.run(EventHandlingTests)
-    false
-  end
-end
-
-app = TestApp.new
-app.run

data/tests/test_events.rb

@@ -1,6 +1,5 @@
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
-require 'wx'
+
+require_relative './lib/wxapp_runner'
 
 class EventTests < Test::Unit::TestCase
 
@@ -32,6 +31,18 @@ class EventTests < Test::Unit::TestCase
     assert_equal(evt.id, evt_dup.id)
     assert_equal(evt.string, evt_dup.string)
   end
+
+  def test_event_clone
+    evt = Wx::MouseEvent.new(Wx::EVT_LEFT_DOWN)
+    assert_equal(Wx::EVT_LEFT_DOWN, evt.event_type)
+    evt.position = Wx::Point.new(333,666)
+    assert_equal(Wx::Point.new(333,666), evt.position)
+    evt_dup = evt.clone
+    assert_instance_of(Wx::MouseEvent, evt_dup)
+    assert_not_equal(evt, evt_dup)
+    assert_equal(evt.event_type, evt_dup.event_type)
+    assert_equal(evt.position, evt_dup.position)
+  end
 end
 
 class TestApp < Wx::App
@@ -40,6 +51,3 @@ class TestApp < Wx::App
     false
   end
 end
-
-app = TestApp.new
-app.run

data/tests/test_geometry.rb

@@ -12,9 +12,9 @@ class GeometryTests < Test::Unit::TestCase
     assert_equal(10, w)
     assert_equal(20, h)
 
-    assert(sz == Wx::Size.new(w,h))
-    assert(sz == [w,h])
-    assert_raise(TypeError) { sz == '10, 20' }
+    assert_equal(sz, Wx::Size.new(w,h))
+    assert_equal(sz, [w,h])
+    assert_not_equal(sz,'10, 20' )
 
     assert(sz.eql? Wx::Size.new(w,h))
     refute(sz.eql?([w,h]))
@@ -30,6 +30,20 @@ class GeometryTests < Test::Unit::TestCase
     assert(Wx::Size.new(12,22).eql?(sz + 2))
     assert(Wx::Size.new(12,23).eql?(sz + Wx::Size.new(2,3)))
     assert(Wx::Size.new(12,23).eql?(sz + [2,3]))
+
+    small_sz = Wx::Size.new(10, 10)
+    medium_sz = Wx::Size.new(20, 20)
+    large_sz = Wx::Size.new(30, 30)
+    a = [large_sz, small_sz, medium_sz]
+    a.sort!
+    assert_equal(a[0], small_sz)
+    assert_equal(a[1], medium_sz)
+    assert_equal(a[2], large_sz)
+
+    h = {large_sz => 'Large', small_sz => 'Small', medium_sz => 'Medium'}
+    assert_equal(h[Wx::Size.new(10, 10)], 'Small')
+    assert_equal(h[Wx::Size.new(20, 20)], 'Medium')
+    assert_equal(h[Wx::Size.new(30, 30)], 'Large')
   end
 
   def test_point
@@ -41,9 +55,9 @@ class GeometryTests < Test::Unit::TestCase
     assert_equal(10, x)
     assert_equal(20, y)
 
-    assert(pt == Wx::Point.new(x,y))
-    assert(pt == [x,y])
-    assert_raise(TypeError) { pt == '10, 20' }
+    assert_equal(pt, Wx::Point.new(x,y))
+    assert_equal(pt, [x,y])
+    assert_not_equal(pt, '10, 20')
 
     assert(pt.eql? Wx::Point.new(x,y))
     refute(pt.eql?([x,y]))
@@ -61,6 +75,20 @@ class GeometryTests < Test::Unit::TestCase
     assert(Wx::Point.new(12,23).eql?(pt + Wx::Point.new(2,3)))
     assert(Wx::Point.new(12,23).eql?(pt + Wx::Size.new(2,3)))
     assert(Wx::Point.new(12,23).eql?(pt + [2,3]))
+
+    nearest_pt = Wx::Point.new(10, 10)
+    mid_pt = Wx::Point.new(10, 20)
+    furthest_pt = Wx::Point.new(10, 30)
+    a = [furthest_pt, nearest_pt, mid_pt]
+    a.sort!
+    assert_equal(a[0], nearest_pt)
+    assert_equal(a[1], mid_pt)
+    assert_equal(a[2], furthest_pt)
+
+    h = {furthest_pt => 'Far', nearest_pt => 'Near', mid_pt => 'Mid'}
+    assert_equal(h[Wx::Point.new(10, 10)], 'Near')
+    assert_equal(h[Wx::Point.new(10, 20)], 'Mid')
+    assert_equal(h[Wx::Point.new(10, 30)], 'Far')
   end
 
   def test_real_point
@@ -72,9 +100,9 @@ class GeometryTests < Test::Unit::TestCase
     assert_equal(10.0, x)
     assert_equal(20.0, y)
 
-    assert(pt == Wx::RealPoint.new(x,y))
-    assert(pt == [x,y])
-    assert_raise(TypeError) { pt == '10.0, 20.0' }
+    assert_equal(pt, Wx::RealPoint.new(x,y))
+    assert_equal(pt, [x,y])
+    assert_not_equal(pt, '10.0, 20.0')
 
     assert(pt.eql? Wx::RealPoint.new(x,y))
     refute(pt.eql?([x,y]))
@@ -94,6 +122,20 @@ class GeometryTests < Test::Unit::TestCase
     assert(Wx::RealPoint.new(12.0,23.0).eql?(pt + Wx::Point.new(2,3)))
     assert(Wx::RealPoint.new(12.0,23.0).eql?(pt + Wx::Size.new(2,3)))
     assert(Wx::RealPoint.new(12.0,23.0).eql?(pt + [2,3]))
+
+    nearest_pt = Wx::RealPoint.new(10, 10)
+    mid_pt = Wx::RealPoint.new(10, 20)
+    furthest_pt = Wx::RealPoint.new(10, 30)
+    a = [furthest_pt, nearest_pt, mid_pt]
+    a.sort!
+    assert_equal(a[0], nearest_pt)
+    assert_equal(a[1], mid_pt)
+    assert_equal(a[2], furthest_pt)
+
+    h = {furthest_pt => 'Far', nearest_pt => 'Near', mid_pt => 'Mid'}
+    assert_equal(h[Wx::RealPoint.new(10, 10)], 'Near')
+    assert_equal(h[Wx::RealPoint.new(10, 20)], 'Mid')
+    assert_equal(h[Wx::RealPoint.new(10, 30)], 'Far')
   end
 
   def test_rect
@@ -113,9 +155,9 @@ class GeometryTests < Test::Unit::TestCase
     assert_equal(100, w)
     assert_equal(300, h)
 
-    assert(rect == Wx::Rect.new(x,y,w,h))
-    assert(rect == [x,y,w,h])
-    assert_raise(TypeError) { rect == '10,0,20,0' }
+    assert_equal(rect, Wx::Rect.new(x,y,w,h))
+    assert_equal(rect, [x,y,w,h])
+    assert_not_equal(rect, '10,0,20,0')
 
     assert(rect.eql? Wx::Rect.new(x,y,w,h))
     refute(rect.eql?([x,y,w,h]))
@@ -131,11 +173,19 @@ class GeometryTests < Test::Unit::TestCase
     assert_equal(Wx::Rect.new(2, 20, 0, 290), (rect * Wx::Rect.new(2, 20, 0, 300)))
     assert_equal(Wx::Rect.new(102, 20, 0, 0), (rect & Wx::Rect.new(102, 20, 100, 300)))
     assert_equal(Wx::Rect.new(102, 20, -1, 290), (rect * Wx::Rect.new(102, 20, 100, 300)))
-  end
 
-end
+    rect = Wx::Rect.new(5,5,10,10)
+    assert_equal([3,3,14,14], rect.inflate([2,2]))
+    assert_not_equal(rect.object_id, rect.inflate(2,2))
+    assert_equal([3,3,14,14], rect.inflate!(2))
+    assert_equal([3,3,14,14], rect)
+    assert_equal([5,5,10,10], rect.deflate([2,2]))
+    assert_not_equal(rect.object_id, rect.deflate(2,2))
+    assert_equal([5,5,10,10], rect.deflate!(2))
+    assert_equal([5,5,10,10], rect)
+    assert_equal([6,7,10,10], rect.offset(1,2))
+    assert_equal([6,7,10,10], rect.offset!(Wx::Point.new(1,2)))
+    assert_equal([6,7,10,10], rect)
+  end
 
-if $0 == __FILE__
-  require 'test/unit/ui/console/testrunner'
-  Test::Unit::UI::Console::TestRunner.run(GeometryTests)
 end

data/tests/test_intl.rb

@@ -1,14 +1,5 @@
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
-require 'wx'
-
-class TestApp < Wx::App
-  attr_accessor :test_class
-  def on_init
-    Test::Unit::UI::Console::TestRunner.run(self.test_class)
-    false # exit after tests
-  end
-end
+
+require_relative './lib/wxapp_runner'
 
 class TestInternationalisation < Test::Unit::TestCase
   def test_encodings
@@ -101,7 +92,3 @@ class TestInternationalisation < Test::Unit::TestCase
     locale = Wx::Locale.new(Wx::LANGUAGE_DEFAULT)
   end
 end
-
-app = TestApp.new
-app.test_class = TestInternationalisation
-app.run

data/tests/test_item_data.rb

@@ -1,14 +1,5 @@
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
-require 'wx'
-
-class TestApp < Wx::App
-  attr_accessor :test_class
-  def on_init
-    Test::Unit::UI::Console::TestRunner.run(self.test_class)
-    false
-  end
-end
+
+require_relative './lib/wxapp_runner'
 
 class CtrlContainerFrame < Wx::Frame
   attr_accessor :control
@@ -181,7 +172,3 @@ class TestItemData < Test::Unit::TestCase
      f.close(true)
    end
 end
-
-app = TestApp.new
-app.test_class = TestItemData
-app.run

data/tests/test_variant.rb

@@ -1,15 +1,5 @@
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
-require 'wx'
 
-class TestApp < Wx::App
-  attr_accessor :test_class
-  def on_init
-    Test::Unit::UI::Console::TestRunner.run(self.test_class)
-    GC.start
-    false # exit after tests
-  end
-end
+require_relative './lib/wxapp_runner'
 
 class TestVariant < Test::Unit::TestCase
 
@@ -145,7 +135,3 @@ class TestVariant < Test::Unit::TestCase
  end
 
 end
-
-app = TestApp.new
-app.test_class = TestVariant
-app.run

data/tests/testapp.rb

@@ -33,8 +33,3 @@ class TestApp < Test::Unit::TestCase
     assert(o.did_call_on_exit, "didn't call on_exit?")
   end
 end
-
-if $0 == __FILE__
-  require 'test/unit/ui/console/testrunner'
-  Test::Unit::UI::Console::TestRunner.run(TestApp)
-end

data/tests/testapp_noframe.rb

@@ -21,8 +21,3 @@ class TestApp < Test::Unit::TestCase
   end
   
 end
-
-if $0 == __FILE__
-  require 'test/unit/ui/console/testrunner'
-  Test::Unit::UI::Console::TestRunner.run(TestApp)
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre.beta.10
+  version: 0.9.0.pre.beta.13
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-01 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -77,10 +77,15 @@ extra_rdoc_files: []
 files:
 - ".yardopts"
 - CREDITS.md
+- INSTALL.md
 - LICENSE
 - README.md
+- assets/logo.png
+- assets/logo.svg
+- assets/logo.xcf
 - bin/wxruby
 - ext/mkrf_conf_srcgem.rb
+- ext/wxruby3/include/wxruby-ScaledDC.h
 - ext/wxruby3/include/wxruby-runtime.h
 - ext/wxruby3/swig/RubyStockObjects.i
 - ext/wxruby3/swig/common.i
@@ -104,6 +109,8 @@ files:
 - lib/wx/core/acceleratortable.rb
 - lib/wx/core/animation.rb
 - lib/wx/core/app.rb
+- lib/wx/core/array_ext.rb
+- lib/wx/core/art_locator.rb
 - lib/wx/core/artprovider.rb
 - lib/wx/core/bitmap.rb
 - lib/wx/core/busycursor.rb
@@ -115,6 +122,7 @@ files:
 - lib/wx/core/colour.rb
 - lib/wx/core/combobox.rb
 - lib/wx/core/controlwithitems.rb
+- lib/wx/core/cursor.rb
 - lib/wx/core/data_object.rb
 - lib/wx/core/dataformat.rb
 - lib/wx/core/dc.rb
@@ -132,6 +140,7 @@ files:
 - lib/wx/core/helpcontrollerhelpprovider.rb
 - lib/wx/core/helpprovider.rb
 - lib/wx/core/icon.rb
+- lib/wx/core/id_helper.rb
 - lib/wx/core/image.rb
 - lib/wx/core/imagelist.rb
 - lib/wx/core/listbox.rb
@@ -148,6 +157,7 @@ files:
 - lib/wx/core/point.rb
 - lib/wx/core/real_point.rb
 - lib/wx/core/rect.rb
+- lib/wx/core/region_iterator.rb
 - lib/wx/core/simplehelpprovider.rb
 - lib/wx/core/size.rb
 - lib/wx/core/sizer.rb
@@ -163,12 +173,21 @@ files:
 - lib/wx/core/window.rb
 - lib/wx/core/window_update_locker.rb
 - lib/wx/core/xmlresource.rb
+- lib/wx/doc/array_ext.rb
+- lib/wx/doc/art_locator.rb
 - lib/wx/doc/aui/auimanager.rb
 - lib/wx/doc/aui/auinotebook.rb
+- lib/wx/doc/bitmap.rb
+- lib/wx/doc/clipboard.rb
 - lib/wx/doc/colour_dialog.rb
+- lib/wx/doc/const.rb
 - lib/wx/doc/core.rb
+- lib/wx/doc/cursor.rb
+- lib/wx/doc/data_object.rb
 - lib/wx/doc/dc.rb
 - lib/wx/doc/enum.rb
+- lib/wx/doc/event.rb
+- lib/wx/doc/events.rb
 - lib/wx/doc/evthandler.rb
 - lib/wx/doc/extra/00_starting.md
 - lib/wx/doc/extra/01_packages.md
@@ -180,11 +199,17 @@ files:
 - lib/wx/doc/extra/07_colour_and_font.md
 - lib/wx/doc/extra/08_extensions.md
 - lib/wx/doc/extra/09_exceptions.md
+- lib/wx/doc/extra/10_art.md
 - lib/wx/doc/functions.rb
+- lib/wx/doc/gc_dc.rb
 - lib/wx/doc/gdi_common.rb
+- lib/wx/doc/graphics_context.rb
 - lib/wx/doc/grid/grid.rb
 - lib/wx/doc/help_controller.rb
 - lib/wx/doc/html/html_help_controller.rb
+- lib/wx/doc/icon.rb
+- lib/wx/doc/id_helper.rb
+- lib/wx/doc/image.rb
 - lib/wx/doc/pg/events.rb
 - lib/wx/doc/pg/pg_property.rb
 - lib/wx/doc/pg/pgeditor.rb
@@ -199,13 +224,16 @@ files:
 - lib/wx/doc/rbn/ribbon_button_bar.rb
 - lib/wx/doc/rbn/ribbon_gallery.rb
 - lib/wx/doc/rbn/ribbon_tool_bar.rb
+- lib/wx/doc/region_iterator.rb
 - lib/wx/doc/rtc/richtext_printing.rb
+- lib/wx/doc/scaled_dc.rb
 - lib/wx/doc/screen_dc.rb
 - lib/wx/doc/stock_objects.rb
 - lib/wx/doc/stream.rb
 - lib/wx/doc/system_settings.rb
 - lib/wx/doc/treebook.rb
 - lib/wx/doc/variant.rb
+- lib/wx/doc/window.rb
 - lib/wx/doc/xml_resource.rb
 - lib/wx/global_const.rb
 - lib/wx/grid.rb
@@ -325,6 +353,7 @@ files:
 - rakelib/lib/director/cursor.rb
 - rakelib/lib/director/data_format.rb
 - rakelib/lib/director/data_object.rb
+- rakelib/lib/director/data_object_simple_base.rb
 - rakelib/lib/director/date_event.rb
 - rakelib/lib/director/date_picker_ctrl.rb
 - rakelib/lib/director/dc.rb
@@ -363,6 +392,7 @@ files:
 - rakelib/lib/director/help_controller.rb
 - rakelib/lib/director/help_provider.rb
 - rakelib/lib/director/html_cell.rb
+- rakelib/lib/director/html_data_object.rb
 - rakelib/lib/director/html_easy_printing.rb
 - rakelib/lib/director/html_event.rb
 - rakelib/lib/director/html_help_data.rb
@@ -411,6 +441,7 @@ files:
 - rakelib/lib/director/property_grid_page_state.rb
 - rakelib/lib/director/radio_box.rb
 - rakelib/lib/director/region.rb
+- rakelib/lib/director/region_iterator.rb
 - rakelib/lib/director/ribbon_art_provider.rb
 - rakelib/lib/director/ribbon_bar.rb
 - rakelib/lib/director/ribbon_bar_event.rb
@@ -425,6 +456,7 @@ files:
 - rakelib/lib/director/ribbon_tool_bar.rb
 - rakelib/lib/director/ribbon_tool_bar_event.rb
 - rakelib/lib/director/richtext_buffer.rb
+- rakelib/lib/director/richtext_buffer_data_object.rb
 - rakelib/lib/director/richtext_ctrl.rb
 - rakelib/lib/director/richtext_event.rb
 - rakelib/lib/director/richtext_file_handler.rb
@@ -433,9 +465,11 @@ files:
 - rakelib/lib/director/sash_layout_event.rb
 - rakelib/lib/director/sash_layout_window.rb
 - rakelib/lib/director/sash_window.rb
+- rakelib/lib/director/scroll_bar.rb
 - rakelib/lib/director/scrolled_t.rb
 - rakelib/lib/director/sizer.rb
 - rakelib/lib/director/sizer_item.rb
+- rakelib/lib/director/slider.rb
 - rakelib/lib/director/splash_screen.rb
 - rakelib/lib/director/splitter_event.rb
 - rakelib/lib/director/splitter_window.rb
@@ -817,8 +851,25 @@ files:
 - samples/xrc/samples.xrc
 - samples/xrc/tn_xrc_sample.png
 - samples/xrc/xrc_sample.rb
+- tests/art/my_art/sample.xpm
+- tests/art/sample3.xpm
+- tests/art/test_art/bitmap/sample.xpm
+- tests/art/test_art/bitmap/wxruby.bmp
+- tests/art/test_art/bitmap/wxruby.png
+- tests/art/test_art/bitmap/wxruby.xpm
+- tests/art/test_art/cursor/wxruby.bmp
+- tests/art/test_art/icon/sample.xpm
+- tests/art/test_art/icon/wxruby.ico
+- tests/art/test_art/icon/wxruby.png
+- tests/art/test_art/image/sample.xpm
+- tests/art/test_art/image/wxruby.jpg
+- tests/art/test_art/image/wxruby.png
+- tests/art/test_art/sample2.xpm
+- tests/lib/wxapp_runner.rb
+- tests/test_art.rb
 - tests/test_basic.rb
 - tests/test_clipboard.rb
+- tests/test_dc.rb
 - tests/test_dialog.rb
 - tests/test_event_handling.rb
 - tests/test_events.rb
@@ -832,10 +883,10 @@ homepage: https://github.com/mcorino/wxRuby3
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: https://github.com/mcorino/wxruby3/issues
-  source_code_uri: https://github.com/mcorino/wxruby3
+  bug_tracker_uri: https://github.com/mcorino/wxRuby3/issues
+  source_code_uri: https://github.com/mcorino/wxRuby3
   documentation_uri: https://mcorino.github.io/wxRuby3
-  homepage_uri: https://github.com/mcorino/wxruby3
+  homepage_uri: https://github.com/mcorino/wxRuby3
 post_install_message: |2
 
   wxRuby3 has been successfully installed including the 'wxruby' utility.