wxruby3 0.9.0.pre.beta.9 → 0.9.0.pre.beta.11

data/tests/test_clipboard.rb

@@ -1,6 +1,5 @@
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
-require 'wx'
+
+require_relative './lib/wxapp_runner'
 
 class TestTextData < Test::Unit::TestCase
   # Using an in-built class
@@ -31,7 +30,7 @@ class TestTextData < Test::Unit::TestCase
     Wx::Clipboard.open do | clip |
       clip.fetch td_3
     end
-    assert_equal("", td_3.text)
+    assert_equal("", td_3.get_data_here)
   end
 end
 
@@ -66,6 +65,37 @@ class TestBitmapData < Test::Unit::TestCase
 end
 
 class TestDataObjectComposite < Test::Unit::TestCase
+  MY_INT_ARRAY_FORMAT = Wx::DataFormat.new('application/int_array_format')
+
+  class MySimpleIntArrayObject < Wx::DataObjectSimpleBase
+    def initialize(arr = nil)
+      super(MY_INT_ARRAY_FORMAT)
+      self.array = arr
+    end
+
+    def array
+      @arr
+    end
+
+    def array=(arr)
+      @arr = (arr || []).collect { |e| e.to_i }
+    end
+
+    # The default will do in this case but otherwise something like this:
+    # def _get_data_size
+    #   @arr ? @arr.pack('i*').bytesize : 0
+    # end
+
+    def _get_data
+      @arr ? @arr.pack('i*') : nil
+    end
+
+    def _set_data(data)
+      @arr = data ? data.unpack('i*') : []
+      true
+    end
+  end
+
   def test_data_object_composite
     d_obj = Wx::DataObjectComposite.new
     d_txt = Wx::TextDataObject.new
@@ -80,6 +110,9 @@ class TestDataObjectComposite < Test::Unit::TestCase
       assert_equal( 2, d_txt.get_format_count(Wx::DataObject::Direction::Get) )
       assert_equal( 3, d_obj.get_format_count(Wx::DataObject::Direction::Get) )
     end
+    d_txt = nil
+
+    GC.start
 
     d_bmp = Wx::BitmapDataObject.new(bmp)
     Wx::Clipboard.open do | clip |
@@ -87,6 +120,8 @@ class TestDataObjectComposite < Test::Unit::TestCase
       clip.place d_bmp
     end
 
+    GC.start
+
     Wx::Clipboard.open do | clip |
       assert !clip.supported?( Wx::DF_TEXT )
       assert clip.supported?( Wx::DF_BITMAP )
@@ -94,6 +129,8 @@ class TestDataObjectComposite < Test::Unit::TestCase
       clip.fetch d_obj
     end
 
+    GC.start
+
     if Wx::PLATFORM == 'WXMSW'
       assert_equal d_obj.received_format.get_type, Wx::DF_DIB.get_type
       d_bmp = d_obj.get_object(Wx::DF_DIB)
@@ -112,6 +149,8 @@ class TestDataObjectComposite < Test::Unit::TestCase
       clip.place d_txt
     end
 
+    GC.start
+
     d_obj_2 = Wx::DataObjectComposite.new
     d_txt = Wx::TextDataObject.new
     d_obj_2.add d_txt
@@ -125,6 +164,8 @@ class TestDataObjectComposite < Test::Unit::TestCase
       clip.fetch d_obj_2
     end
 
+    GC.start
+
     assert_equal d_obj_2.received_format.get_type, d_txt.get_preferred_format(Wx::DataObject::Direction::Set).get_type
     if Wx::PLATFORM == 'WXMSW'
       d_txt = d_obj_2.get_object(Wx::DF_UNICODETEXT)
@@ -132,11 +173,58 @@ class TestDataObjectComposite < Test::Unit::TestCase
       d_txt = d_obj_2.get_object(Wx::DF_TEXT)
     end
     assert_equal d_txt.text, 'THE TEXT'
+
+    GC.start
+
+    d_obj_2 = Wx::DataObjectComposite.new
+    d_obj_2.add Wx::TextDataObject.new
+    d_obj_2.add MySimpleIntArrayObject.new([1,2,3,4,5])
+    if Wx::PLATFORM == 'WXMSW'
+      assert_equal( 2, d_obj_2.get_format_count(Wx::DataObject::Direction::Get) )
+    else
+      assert_equal( 3, d_obj_2.get_format_count(Wx::DataObject::Direction::Get) )
+    end
+
+    Wx::Clipboard.open do | clip |
+      clip.clear
+      clip.place d_obj_2
+    end
+
+    GC.start
+
+    d_iarr = MySimpleIntArrayObject.new
+    Wx::Clipboard.open do | clip |
+      assert clip.supported?(MY_INT_ARRAY_FORMAT)
+      clip.fetch d_iarr
+    end
+
+    assert_equal([1,2,3,4,5], d_iarr.array)
   end
 end
 
 class TestDataObject < Test::Unit::TestCase
   MY_CUSTOM_FORMAT = Wx::DataFormat.new('text/custom_format')
+  MY_CUSTOM_TEXT = Wx::DataFormat.new('text/custom_text')
+
+  class MySimpleDataObject < Wx::DataObjectSimpleBase
+    def initialize
+      super(MY_CUSTOM_TEXT)
+      @data = ''
+    end
+
+    def _get_data_size
+      @data.bytesize
+    end
+
+    def _get_data
+      @data
+    end
+
+    def _set_data(data)
+      @data = data ? data : ''
+      true
+    end
+  end
 
   class MyBasicDataObject < Wx::DataObject
     attr_reader :my_data
@@ -187,9 +275,9 @@ class TestDataObject < Test::Unit::TestCase
     def get_data_size(format)
       case format.get_type
       when Wx::DataFormatId::DF_TEXT
-        get_as_text.to_s.size
+        get_as_text.to_s.bytesize
       when MY_CUSTOM_FORMAT.get_type
-        get_formatted.to_s.size
+        get_formatted.to_s.bytesize
       else
         0
       end
@@ -208,17 +296,35 @@ class TestDataObject < Test::Unit::TestCase
     end
   end
 
+  def test_simple_data_obj
+    d_obj = MySimpleDataObject.new
+    d_obj.set_data('Simple Data')
+    assert_equal( 1, d_obj.get_format_count )
+    assert_equal('Simple Data', d_obj.get_data_here )
+
+    Wx::Clipboard.open do | clip |
+      clip.place d_obj
+    end
+
+    d_obj2 = MySimpleDataObject.new
+    Wx::Clipboard.open do | clip |
+      assert clip.supported?( d_obj2.get_format )
+      clip.fetch d_obj2
+    end
+    assert_equal('Simple Data', d_obj2.get_data_here )
+  end
+
   def test_data_obj
     d_obj = MyBasicDataObject.new
     d_obj.set_data(Wx::DF_TEXT, 'HELLO')
-    assert_equal( 2, d_obj.get_format_count(0) )
+    assert_equal( 2, d_obj.get_format_count(Wx::DataObject::Direction::Get) )
     assert_equal('HELLO', d_obj.get_data_here(Wx::DF_TEXT) )
     assert_equal('<b>HELLO</b>', d_obj.get_data_here(MY_CUSTOM_FORMAT) )
 
     Wx::Clipboard.open do | clip |
       clip.place d_obj
     end
-    
+
     d_obj_2 = MyBasicDataObject.new
     Wx::Clipboard.open do | clip |
       assert clip.supported?( Wx::DF_TEXT )
@@ -230,12 +336,3 @@ class TestDataObject < Test::Unit::TestCase
     assert_equal('HELLO', d_obj_2.get_data_here(Wx::DF_TEXT) )
   end
 end
-
-Wx::App.run do
-  # Must run whilst App is alive
-  Test::Unit::UI::Console::TestRunner.run(TestTextData)
-  Test::Unit::UI::Console::TestRunner.run(TestBitmapData)
-  Test::Unit::UI::Console::TestRunner.run(TestDataObjectComposite)
-  Test::Unit::UI::Console::TestRunner.run(TestDataObject)
-  false
-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
 
@@ -40,6 +39,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]))
@@ -134,8 +176,3 @@ class GeometryTests < Test::Unit::TestCase
   end
 
 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
@@ -31,6 +22,73 @@ class TestItemData < Test::Unit::TestCase
     assert_retrievable_data(f.control, 0, { 'b' => 'B' })
     assert_retrievable_data(f.control, 1, 'string item data')
     assert_retrievable_data(f.control, 2, 42.3)
+
+    GC.start
+
+    # single item append; no data
+    f.control.append('integer')
+    assert_equal(4, f.control.count)
+    assert_equal('integer', f.control.get_string(3))
+    assert_equal(nil, f.control.get_item_data(3))
+
+    # single item append; with data
+    f.control.append('array', 110)
+    assert_equal(5, f.control.count)
+    assert_equal('array', f.control.get_string(4))
+    assert_equal(110, f.control.get_item_data(4))
+
+    # array item append; no data
+    f.control.append(%w[set tree bag])
+    assert_equal(8, f.control.count)
+    assert_equal(nil, f.control.get_item_data(5))
+    assert_equal(nil, f.control.get_item_data(7))
+
+    # array item append; with data
+    f.control.append(%w[object module class], ['O', 'M', 'C'])
+    assert_equal(11, f.control.count)
+    assert_equal('O', f.control.get_item_data(8))
+    assert_equal('C', f.control.get_item_data(10))
+
+    GC.start
+
+    # single item insert; no data
+    f.control.insert('integer2', 3)
+    assert_equal(12, f.control.count)
+    assert_equal('integer2', f.control.get_string(3))
+    assert_equal(nil, f.control.get_item_data(3))
+
+    # single item insert; with data
+    f.control.insert('array2', 4, 110)
+    assert_equal(13, f.control.count)
+    assert_equal('array2', f.control.get_string(4))
+    assert_equal(110, f.control.get_item_data(4))
+
+    # array item insert; no data
+    f.control.insert(%w[set2 tree2 bag2], 5)
+    assert_equal(16, f.control.count)
+    assert_equal(nil, f.control.get_item_data(5))
+    assert_equal(nil, f.control.get_item_data(7))
+
+    # array item insert; with data
+    f.control.insert(%w[object2 module2 class2], 8, ['O', 'M', 'C'])
+    assert_equal(19, f.control.count)
+    assert_equal('O', f.control.get_item_data(8))
+    assert_equal('C', f.control.get_item_data(10))
+
+    GC.start
+
+    # item delete
+    f.control.delete(8)
+    assert_equal(18, f.control.count)
+    assert_equal('M', f.control.get_item_data(8))
+
+    GC.start
+
+    # clear all
+    f.control.clear
+    assert_equal(0, f.control.count)
+
+    GC.start
   end
 
   def test_treectrl_itemdata
@@ -114,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.9
+  version: 0.9.0.pre.beta.11
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-28 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -81,6 +81,7 @@ files:
 - README.md
 - 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
@@ -167,6 +168,7 @@ files:
 - lib/wx/doc/aui/auinotebook.rb
 - lib/wx/doc/colour_dialog.rb
 - lib/wx/doc/core.rb
+- lib/wx/doc/data_object.rb
 - lib/wx/doc/dc.rb
 - lib/wx/doc/enum.rb
 - lib/wx/doc/evthandler.rb
@@ -190,6 +192,7 @@ files:
 - lib/wx/doc/pg/pgeditor.rb
 - lib/wx/doc/pg/property_grid.rb
 - lib/wx/doc/pg/property_grid_interface.rb
+- lib/wx/doc/progress_dialog.rb
 - lib/wx/doc/prt/page_setup_dialog.rb
 - lib/wx/doc/prt/print_data.rb
 - lib/wx/doc/prt/print_dialog.rb
@@ -199,6 +202,7 @@ files:
 - lib/wx/doc/rbn/ribbon_gallery.rb
 - lib/wx/doc/rbn/ribbon_tool_bar.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
@@ -324,6 +328,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
@@ -816,6 +821,7 @@ files:
 - samples/xrc/samples.xrc
 - samples/xrc/tn_xrc_sample.png
 - samples/xrc/xrc_sample.rb
+- tests/lib/wxapp_runner.rb
 - tests/test_basic.rb
 - tests/test_clipboard.rb
 - tests/test_dialog.rb