wxruby3 0.9.0.pre.beta.9-x64-mingw-ucrt → 0.9.0.pre.beta.11-x64-mingw-ucrt

data/samples/sampler/ext.rb

@@ -38,12 +38,12 @@ end
 # otherwise samples using 'include Wx' (or other modules) will fail on referencing
 # a (module) method unscoped from one of these included modules
 module ::Kernel
-  def method_missing(name, *args)
+  def method_missing(name, *args, &block)
     if self.class.name.start_with?('WxRuby::Sample::SampleLoader_') && (scope = self.class.name.split('::')).size > 3
       top_mod = Object.const_get(scope[0,3].join('::'))
-      return top_mod.__send__(name, *args) if top_mod.respond_to?(name)
+      return top_mod.__send__(name, *args, &block) if top_mod.respond_to?(name)
       top_mod.included_modules.each do |imod|
-        return imod.__send__(name, *args) if imod.respond_to?(name)
+        return imod.__send__(name, *args, &block) if imod.respond_to?(name)
       end
     end
     super

data/samples/sampler/stc_editor.rb

@@ -117,21 +117,21 @@ module WxRuby
       style_set_foreground(Wx::STC::STC_STYLE_DEFAULT, Wx::BLACK);
       style_set_background(Wx::STC::STC_STYLE_DEFAULT, Wx::WHITE);
       style_clear_all
-      style_set_foreground(Wx::STC::STC_STYLE_LINENUMBER, Wx::Colour.new('SlateGray'))
+      style_set_foreground(Wx::STC::STC_STYLE_LINENUMBER, Wx::Colour.new('Dark Grey'))
       style_set_background(Wx::STC::STC_STYLE_LINENUMBER, Wx::WHITE);
       style_set_foreground(Wx::STC::STC_STYLE_INDENTGUIDE, Wx::LIGHT_GREY);
-      set_whitespace_background(false, Wx::Colour.new('DarkSlateGray'))
-      style_set_foreground(SCE_RB_COMMENTLINE, Wx::Colour.new('DARKGREEN'))
+      set_whitespace_background(false, Wx::Colour.new('Dark Slate Grey'))
+      style_set_foreground(SCE_RB_COMMENTLINE, Wx::Colour.new('Dark Green'))
       style_set_bold(SCE_RB_COMMENTLINE, true)
       style_set_foreground(SCE_RB_WORD, Wx::BLACK)
       style_set_bold(SCE_RB_WORD, true)
-      style_set_foreground(SCE_RB_OPERATOR, Wx::Colour.new('Teal'))
+      style_set_foreground(SCE_RB_OPERATOR, Wx::Colour.new('Dark Olive Green'))
       style_set_bold(SCE_RB_OPERATOR, true)
-      style_set_foreground(SCE_RB_POD, Wx::Colour.new('GREY'))
+      style_set_foreground(SCE_RB_POD, Wx::Colour.new('Grey'))
       style_set_foreground(SCE_RB_NUMBER, Wx::BLUE)
       style_set_foreground(SCE_RB_STRING, c_maroon)
       style_set_foreground(SCE_RB_CHARACTER, Wx::RED)
-      style_set_foreground(SCE_RB_SYMBOL, Wx::Colour.new('DARKBLUE'))
+      style_set_foreground(SCE_RB_SYMBOL, Wx::Colour.new('Navy'))
       style_set_bold(SCE_RB_SYMBOL, true)
       if Wx::WXWIDGETS_VERSION >= '3.3.0'
         style_set_foreground(SCE_RB_HERE_DELIM, Wx::BLACK)
@@ -145,8 +145,8 @@ module WxRuby
         style_set_foreground(SCE_RB_STRING_QR, c_maroon)
         style_set_foreground(SCE_RB_STRING_QW, c_maroon)
       end
-      bg = Wx::Colour.new('LightGray')
-      fg = Wx::Colour.new('DarkCyan')
+      bg = Wx::Colour.new('Light Grey')
+      fg = Wx::Colour.new('Cadet Blue')
       set_fold_margin_colour(true, bg)
       set_fold_margin_hi_colour(true, bg)
       marker_set_foreground(Wx::STC::STC_MARKNUM_FOLDER, fg)
@@ -156,8 +156,8 @@ module WxRuby
     end
 
     def dark_theme
-      bg = Wx::Colour.new('DarkSlateGray')
-      c_str = Wx::Colour.new('LimeGreen')
+      bg = Wx::Colour.new('Dark Slate Grey')
+      c_str = Wx::Colour.new('Lime Green')
       style_set_background(Wx::STC::STC_STYLE_DEFAULT, bg)
       style_set_foreground(Wx::STC::STC_STYLE_DEFAULT, Wx::WHITE)
       style_clear_all
@@ -166,28 +166,28 @@ module WxRuby
       style_set_foreground(Wx::STC::STC_STYLE_INDENTGUIDE, bg);
       set_whitespace_background(true, bg)
       style_set_eol_filled(SCE_RB_DEFAULT, true)
-      style_set_foreground(SCE_RB_COMMENTLINE, Wx::Colour.new('Silver'))
+      style_set_foreground(SCE_RB_COMMENTLINE, Wx::Colour.new('Light Grey'))
       style_set_background(SCE_RB_COMMENTLINE, bg)
       style_set_bold(SCE_RB_COMMENTLINE, true)
-      style_set_foreground(SCE_RB_WORD, Wx::Colour.new('Chocolate'))
+      style_set_foreground(SCE_RB_WORD, Wx::Colour.new('Coral'))
       style_set_background(SCE_RB_WORD, bg)
       style_set_bold(SCE_RB_WORD, true)
-      style_set_foreground(SCE_RB_OPERATOR, Wx::Colour.new('LightCyan'))
+      style_set_foreground(SCE_RB_OPERATOR, Wx::Colour.new('Light Grey'))
       style_set_background(SCE_RB_OPERATOR, bg)
       style_set_bold(SCE_RB_OPERATOR, true)
-      style_set_foreground(SCE_RB_POD, Wx::Colour.new('Gray'))
+      style_set_foreground(SCE_RB_POD, Wx::Colour.new('Grey'))
       style_set_background(SCE_RB_POD, bg)
-      style_set_foreground(SCE_RB_NUMBER, Wx::Colour.new('DeepSkyBlue'))
+      style_set_foreground(SCE_RB_NUMBER, Wx::Colour.new('Cyan'))
       style_set_background(SCE_RB_NUMBER, bg)
       style_set_foreground(SCE_RB_STRING, c_str)
       style_set_background(SCE_RB_STRING, bg)
-      style_set_foreground(SCE_RB_CHARACTER, Wx::Colour.new('YellowGreen'))
+      style_set_foreground(SCE_RB_CHARACTER, Wx::Colour.new('Yellow Green'))
       style_set_background(SCE_RB_CHARACTER, bg)
       style_set_foreground(SCE_RB_SYMBOL, Wx::Colour.new('Gold'))
       style_set_background(SCE_RB_SYMBOL, bg)
       style_set_bold(SCE_RB_SYMBOL, true)
       if Wx::WXWIDGETS_VERSION >= '3.3.0'
-        style_set_foreground(SCE_RB_HERE_DELIM, Wx::Colour.new('Chocolate'))
+        style_set_foreground(SCE_RB_HERE_DELIM, Wx::Colour.new('Coral'))
         style_set_bold(SCE_RB_HERE_DELIM, true)
         style_set_foreground(SCE_RB_HERE_Q, c_str)
         style_set_foreground(SCE_RB_HERE_QQ, c_str)
@@ -198,8 +198,8 @@ module WxRuby
         style_set_foreground(SCE_RB_STRING_QR, c_str)
         style_set_foreground(SCE_RB_STRING_QW, c_str)
       end
-      bg = Wx::Colour.new('CadetBlue')
-      fg = Wx::Colour.new('Chocolate')
+      bg = Wx::Colour.new('Cadet Blue')
+      fg = Wx::Colour.new('Coral')
       set_fold_margin_colour(true, bg)
       set_fold_margin_hi_colour(true, bg)
       marker_set_foreground(Wx::STC::STC_MARKNUM_FOLDER, fg)

data/samples/sampler/txt_editor.rb

@@ -35,9 +35,9 @@ module WxRuby
     end
 
     def dark_theme
-      self.background_colour = Wx::Colour.new('DarkSlateGray')
+      self.background_colour = Wx::Colour.new('Dark Slate Grey')
       self.foreground_colour = Wx::WHITE
-      self.set_default_style(txtatt = Wx::TextAttr.new(Wx::WHITE, Wx::Colour.new('DarkSlateGray'), self.font))
+      self.set_default_style(txtatt = Wx::TextAttr.new(Wx::WHITE, Wx::Colour.new('Dark Slate Grey'), self.font))
       self.set_style(0, self.get_last_position, txtatt)
     end
 

data/samples/treectrl/treectrl.rb

@@ -262,39 +262,41 @@ class MyTreeCtrl < Wx::TreeCtrl
   end
 
   def create_buttons_image_list(size)
-    if size < 0
-      self.buttons_image_list = nil
-      return
-    end
-
-    # Make an image list containing small icons
-    images = Wx::ImageList.new(size, size, true)
+    unless Wx::PLATFORM == 'WXMSW'
+      if size < 0
+        self.buttons_image_list = nil
+        return
+      end
 
-    # should correspond to TreeCtrlIcon_xxx enum
-    Wx::BusyCursor.busy do
-      icons = if @alternate_images
-                [Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon3.xpm'), Wx::BITMAP_TYPE_XPM),
-                 Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon3.xpm'), Wx::BITMAP_TYPE_XPM),
-                 Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon5.xpm'), Wx::BITMAP_TYPE_XPM),
-                 Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon5.xpm'), Wx::BITMAP_TYPE_XPM)
-                ]
-              else
-                icon_size = Wx::Size.new(@image_size, @image_size)
-                ic1 = Wx::ArtProvider::get_icon(Wx::ART_FOLDER, Wx::ART_LIST, icon_size)
-                ic2 = Wx::ArtProvider::get_icon(Wx::ART_FOLDER_OPEN, Wx::ART_LIST, icon_size)
-                [ic1, ic1, ic2, ic2]
-              end
+      # Make an image list containing small icons
+      images = Wx::ImageList.new(size, size, true)
 
-      icons.each do |ic|
-        if ic.width == size
-          images.add(ic)
-        else
-          resized = ic.convert_to_image.rescale(size, size)
-          images.add(Wx::Bitmap.new(resized))
+      # should correspond to TreeCtrlIcon_xxx enum
+      Wx::BusyCursor.busy do
+        icons = if @alternate_images
+                  [Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon3.xpm'), Wx::BITMAP_TYPE_XPM),
+                   Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon3.xpm'), Wx::BITMAP_TYPE_XPM),
+                   Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon5.xpm'), Wx::BITMAP_TYPE_XPM),
+                   Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon5.xpm'), Wx::BITMAP_TYPE_XPM)
+                  ]
+                else
+                  icon_size = Wx::Size.new(@image_size, @image_size)
+                  ic1 = Wx::ArtProvider::get_icon(Wx::ART_FOLDER, Wx::ART_LIST, icon_size)
+                  ic2 = Wx::ArtProvider::get_icon(Wx::ART_FOLDER_OPEN, Wx::ART_LIST, icon_size)
+                  [ic1, ic1, ic2, ic2]
+                end
+
+        icons.each do |ic|
+          if ic.width == size
+            images.add(ic)
+          else
+            resized = ic.convert_to_image.rescale(size, size)
+            images.add(Wx::Bitmap.new(resized))
+          end
         end
-      end
 
-      self.buttons_image_list = images
+        self.buttons_image_list = images
+      end
     end
   end
 
@@ -1454,7 +1456,7 @@ class MyFrame < Wx::Frame
   end
 
   def on_toggle_buttons(event)
-    unless Wx.has_feature?(:WXMSW)
+    unless Wx::PLATFORM == 'WXMSW'
       if Wx::THE_APP.show_buttons
         @treectrl.create_buttons_image_list(-1)
         Wx::get_app.show_buttons = false

data/tests/lib/wxapp_runner.rb

@@ -0,0 +1,64 @@
+
+require 'test/unit'
+require 'test/unit/ui/console/testrunner'
+require 'wx'
+
+module Wx::SF
+
+  module Test
+
+    class App < Wx::App
+      def initialize(test_runner, start_mtd)
+        super()
+        @test_runner = test_runner
+        @start_mtd = start_mtd
+      end
+
+      def on_init
+        @result = @start_mtd.bind(@test_runner).call
+        false
+      end
+
+      attr_reader :result
+    end
+
+    if defined? ::IntelliJ
+      require 'test/unit/ui/teamcity/testrunner'
+      BaseRunner = ::Test::Unit::UI::TeamCity::TestRunner
+    else
+      BaseRunner = ::Test::Unit::UI::Console::TestRunner
+    end
+
+    class Runner < BaseRunner
+
+      org_start_mtd = instance_method :start
+      define_method :start do
+        (app = Wx::SF::Test::App.new(self, org_start_mtd)).run
+        app.result
+      end
+
+    end
+
+  end
+
+end
+
+module Test
+  module Unit
+    AutoRunner.register_runner(:wxapp) do |auto_runner|
+      Wx::SF::Test::Runner
+    end
+    AutoRunner.default_runner = :wxapp
+    if defined? ::IntelliJ
+      class AutoRunner
+        alias :wx_initialize :initialize
+        private :wx_initialize
+
+        def initialize(*args)
+          wx_initialize(*args)
+          @runner = AutoRunner.default_runner
+        end
+      end
+    end
+  end
+end

data/tests/test_basic.rb

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

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