wxruby3 0.9.0.pre.beta.14 → 0.9.0.pre.rc.1

data/samples/ribbon/ribbon.rb

@@ -153,9 +153,7 @@ class MyFrame < Wx::Frame
     sizer_panelsizer_h.add(sizer_panelsizer_v, 0)
     sizer_panel.set_sizer(sizer_panelsizer_h)
 
-    label_font = Wx::Font.new(Wx::FontInfo.new(8).light)
-    @bitmap_creation_dc = Wx::MemoryDC.new
-    @bitmap_creation_dc.set_font(label_font)
+    @label_font = Wx::Font.new(Wx::FontInfo.new(8).light)
 
     scheme = Wx::RBN::RibbonPage.new(@ribbon, Wx::ID_ANY, "Appearance", bitmap_(:eye_xpm))
     @default_primary = Wx::Colour.new
@@ -507,9 +505,10 @@ class MyFrame < Wx::Frame
 
         # Colour not in gallery - add it
         unless item
-          item = add_colour_to_gallery(gallery,
-                                       clr.get_as_string(Wx::C2S_HTML_SYNTAX), @bitmap_creation_dc,
-                                       clr)
+          Wx::MemoryDC.draw_on do |dc|
+            item = add_colour_to_gallery(gallery,
+                                         clr.get_as_string(Wx::C2S_HTML_SYNTAX), dc, clr)
+          end
           gallery.realise
         end
 
@@ -738,46 +737,47 @@ class MyFrame < Wx::Frame
     else
       gallery = Wx::RBN::RibbonGallery.new(panel, gallery_id)
     end
-    dc = @bitmap_creation_dc
-    def_item = add_colour_to_gallery(gallery, "Default", dc, defclr)
-    gallery.set_selection(def_item)
-    add_colour_to_gallery(gallery, "BLUE", dc)
-    add_colour_to_gallery(gallery, "BLUE VIOLET", dc)
-    add_colour_to_gallery(gallery, "BROWN", dc)
-    add_colour_to_gallery(gallery, "CADET BLUE", dc)
-    add_colour_to_gallery(gallery, "CORAL", dc)
-    add_colour_to_gallery(gallery, "CYAN", dc)
-    add_colour_to_gallery(gallery, "DARK GREEN", dc)
-    add_colour_to_gallery(gallery, "DARK ORCHID", dc)
-    add_colour_to_gallery(gallery, "FIREBRICK", dc)
-    add_colour_to_gallery(gallery, "GOLD", dc)
-    add_colour_to_gallery(gallery, "GOLDENROD", dc)
-    add_colour_to_gallery(gallery, "GREEN", dc)
-    add_colour_to_gallery(gallery, "INDIAN RED", dc)
-    add_colour_to_gallery(gallery, "KHAKI", dc)
-    add_colour_to_gallery(gallery, "LIGHT BLUE", dc)
-    add_colour_to_gallery(gallery, "LIME GREEN", dc)
-    add_colour_to_gallery(gallery, "MAGENTA", dc)
-    add_colour_to_gallery(gallery, "MAROON", dc)
-    add_colour_to_gallery(gallery, "NAVY", dc)
-    add_colour_to_gallery(gallery, "ORANGE", dc)
-    add_colour_to_gallery(gallery, "ORCHID", dc)
-    add_colour_to_gallery(gallery, "PINK", dc)
-    add_colour_to_gallery(gallery, "PLUM", dc)
-    add_colour_to_gallery(gallery, "PURPLE", dc)
-    add_colour_to_gallery(gallery, "RED", dc)
-    add_colour_to_gallery(gallery, "SALMON", dc)
-    add_colour_to_gallery(gallery, "SEA GREEN", dc)
-    add_colour_to_gallery(gallery, "SIENNA", dc)
-    add_colour_to_gallery(gallery, "SKY BLUE", dc)
-    add_colour_to_gallery(gallery, "TAN", dc)
-    add_colour_to_gallery(gallery, "THISTLE", dc)
-    add_colour_to_gallery(gallery, "TURQUOISE", dc)
-    add_colour_to_gallery(gallery, "VIOLET", dc)
-    add_colour_to_gallery(gallery, "VIOLET RED", dc)
-    add_colour_to_gallery(gallery, "WHEAT", dc)
-    add_colour_to_gallery(gallery, "WHITE", dc)
-    add_colour_to_gallery(gallery, "YELLOW", dc)
+    Wx::MemoryDC.draw_on do |dc|
+      def_item = add_colour_to_gallery(gallery, "Default", dc, defclr)
+      gallery.set_selection(def_item)
+      add_colour_to_gallery(gallery, "BLUE", dc)
+      add_colour_to_gallery(gallery, "BLUE VIOLET", dc)
+      add_colour_to_gallery(gallery, "BROWN", dc)
+      add_colour_to_gallery(gallery, "CADET BLUE", dc)
+      add_colour_to_gallery(gallery, "CORAL", dc)
+      add_colour_to_gallery(gallery, "CYAN", dc)
+      add_colour_to_gallery(gallery, "DARK GREEN", dc)
+      add_colour_to_gallery(gallery, "DARK ORCHID", dc)
+      add_colour_to_gallery(gallery, "FIREBRICK", dc)
+      add_colour_to_gallery(gallery, "GOLD", dc)
+      add_colour_to_gallery(gallery, "GOLDENROD", dc)
+      add_colour_to_gallery(gallery, "GREEN", dc)
+      add_colour_to_gallery(gallery, "INDIAN RED", dc)
+      add_colour_to_gallery(gallery, "KHAKI", dc)
+      add_colour_to_gallery(gallery, "LIGHT BLUE", dc)
+      add_colour_to_gallery(gallery, "LIME GREEN", dc)
+      add_colour_to_gallery(gallery, "MAGENTA", dc)
+      add_colour_to_gallery(gallery, "MAROON", dc)
+      add_colour_to_gallery(gallery, "NAVY", dc)
+      add_colour_to_gallery(gallery, "ORANGE", dc)
+      add_colour_to_gallery(gallery, "ORCHID", dc)
+      add_colour_to_gallery(gallery, "PINK", dc)
+      add_colour_to_gallery(gallery, "PLUM", dc)
+      add_colour_to_gallery(gallery, "PURPLE", dc)
+      add_colour_to_gallery(gallery, "RED", dc)
+      add_colour_to_gallery(gallery, "SALMON", dc)
+      add_colour_to_gallery(gallery, "SEA GREEN", dc)
+      add_colour_to_gallery(gallery, "SIENNA", dc)
+      add_colour_to_gallery(gallery, "SKY BLUE", dc)
+      add_colour_to_gallery(gallery, "TAN", dc)
+      add_colour_to_gallery(gallery, "THISTLE", dc)
+      add_colour_to_gallery(gallery, "TURQUOISE", dc)
+      add_colour_to_gallery(gallery, "VIOLET", dc)
+      add_colour_to_gallery(gallery, "VIOLET RED", dc)
+      add_colour_to_gallery(gallery, "WHEAT", dc)
+      add_colour_to_gallery(gallery, "WHITE", dc)
+      add_colour_to_gallery(gallery, "YELLOW", dc)
+    end
 
     gallery
   end
@@ -802,6 +802,7 @@ class MyFrame < Wx::Frame
 
       bitmap = Wx::Bitmap.new(iWidth, iHeight)
       dc.select_object(bitmap)
+      dc.set_font(@label_font)
       b = Wx::Brush.new (c)
       dc.set_pen(Wx::BLACK_PEN)
       dc.set_brush(b)

data/tests/lib/wxapp_runner.rb

@@ -3,7 +3,7 @@ require 'test/unit'
 require 'test/unit/ui/console/testrunner'
 require 'wx'
 
-module Wx::SF
+module WxRuby
 
   module Test
 
@@ -33,7 +33,7 @@ module Wx::SF
 
       org_start_mtd = instance_method :start
       define_method :start do
-        (app = Wx::SF::Test::App.new(self, org_start_mtd)).run
+        (app = WxRuby::Test::App.new(self, org_start_mtd)).run
         app.result
       end
 
@@ -46,7 +46,7 @@ end
 module Test
   module Unit
     AutoRunner.register_runner(:wxapp) do |auto_runner|
-      Wx::SF::Test::Runner
+      WxRuby::Test::Runner
     end
     AutoRunner.default_runner = :wxapp
     if defined? ::IntelliJ

data/tests/lib/wxframe_runner.rb

@@ -0,0 +1,59 @@
+
+require_relative './wxapp_runner'
+
+module WxRuby
+
+  module Test
+
+    class App < Wx::App
+      def on_init
+        @tests_have_run = false
+        evt_idle :on_idle
+        @frame = Wx::Frame.new(nil, size: [600,400])
+        @frame.show
+      end
+
+      def on_idle(_evt)
+        done = @tests_have_run
+        @tests_have_run = true
+        @result = @start_mtd.bind(@test_runner).call unless done
+        self.exit_main_loop
+      end
+
+      attr_reader :frame
+    end
+
+    class GUITests < ::Test::Unit::TestCase
+
+      def test_frame
+        Wx.get_app.frame
+      end
+
+      class EventCounter
+        def initialize
+          @count = 0
+        end
+        attr_accessor :count
+
+        def inc
+          @count +=1
+        end
+      end
+
+      def count_events(win, evt, id1=Wx::ID_ANY, id2=nil)
+        return 0 unless block_given?
+        evt_count = EventCounter.new
+        if id2.nil?
+          win.event_handler.send(evt.to_sym, id1, ->(_evt){ evt_count.inc })
+        else
+          win.event_handler.send(evt.to_sym, id1, id2, ->(_evt){ evt_count.inc })
+        end
+        yield evt_count
+        evt_count.count
+      end
+
+    end
+
+  end
+
+end

data/tests/test_app_event_filter.rb

@@ -0,0 +1,74 @@
+
+require_relative './lib/wxapp_runner'
+
+class AppEventFilterTests < Test::Unit::TestCase
+
+  class TestEvent < Wx::Event
+    EVT_TEST_EVENT = Wx::EvtHandler.register_class(self, nil, 'evt_test_event', 0)
+    def initialize(id=0)
+      super(EVT_TEST_EVENT, id)
+    end
+  end
+
+  class TestCmdEvent < Wx::CommandEvent
+    EVT_TEST_CMD_EVENT = Wx::EvtHandler.register_class(self, nil, 'evt_test_cmd_event', 0)
+    def initialize(id=0)
+      super(EVT_TEST_CMD_EVENT, id)
+    end
+  end
+
+  class TestFrame < Wx::Frame
+    def initialize
+      super(nil, size: [300,300])
+      @test_event = false
+      @test_cmd_event = false
+
+      evt_test_event { |evt| @test_event = true }
+      evt_test_cmd_event { |evt| @test_cmd_event = true }
+    end
+
+    attr_reader :test_event, :test_cmd_event
+
+    def reset
+      @test_event = false
+      @test_cmd_event = false
+    end
+  end
+
+  module ::WxRuby
+    module Test
+      class App < Wx::App
+        def filter_event(event)
+          @filtered = true if event.is_a?(TestEvent)
+          super
+        end
+
+        def filtered
+          @filtered
+        end
+
+        def filtered=(f)
+          @filtered = f
+        end
+      end
+    end
+  end
+
+  def test_app_event_filter
+    GC.start
+    win = TestFrame.new
+    win.event_handler.process_event(TestEvent.new)
+    GC.start
+    assert(Wx.get_app.filtered)
+    Wx.get_app.filtered = false
+    win.event_handler.process_event(TestCmdEvent.new)
+    GC.start
+    assert(!Wx.get_app.filtered)
+    assert_nothing_raised { Wx::EvtHandler.clear_filters }
+    GC.start
+    win.event_handler.process_event(TestEvent.new)
+    assert(Wx.get_app.filtered)
+    GC.start
+  end
+
+end

data/tests/test_art_provider.rb

@@ -0,0 +1,52 @@
+
+require_relative './lib/wxapp_runner'
+
+class TestArtProvider < Test::Unit::TestCase
+
+  class MyArtProvider < Wx::ArtProvider
+
+    class << self
+      def is_called?
+        !!@called
+      end
+      def set_called(f = true)
+        @called = f
+      end
+    end
+
+    def create_bitmap(id, client, size)
+      if id == Wx::ArtProvider.get_message_box_icon_id(Wx::ICON_INFORMATION)
+        MyArtProvider.set_called
+        Wx::Bitmap(:sample3)
+      else
+        MyArtProvider.set_called(false)
+        super
+      end
+    end
+
+  end
+
+  def test_custom_provider
+    assert_not_nil(Wx::ArtProvider.get_message_box_icon(Wx::ICON_INFORMATION))
+    GC.start
+    assert(!MyArtProvider.is_called?)
+    GC.start
+    assert_nothing_raised { Wx::ArtProvider.push(MyArtProvider.new) }
+    GC.start
+    assert_not_nil(Wx::ArtProvider.get_message_box_icon(Wx::ICON_INFORMATION))
+    GC.start
+    assert(MyArtProvider.is_called?)
+    GC.start
+    assert_not_nil(Wx::ArtProvider.get_message_box_icon(Wx::ICON_ERROR))
+    GC.start
+    assert(!MyArtProvider.is_called?)
+    GC.start
+    assert_nothing_raised { Wx::ArtProvider.pop }
+    GC.start
+    assert_not_nil(Wx::ArtProvider.get_message_box_icon(Wx::ICON_INFORMATION))
+    GC.start
+    assert(!MyArtProvider.is_called?)
+    GC.start
+  end
+
+end

data/tests/test_clipboard.rb

@@ -54,6 +54,7 @@ if Wx.has_feature?(:USE_HTML) && Wx::WXWIDGETS_VERSION >= '3.3'
       Wx::Clipboard.open do | clip |
         clip.fetch td_2
       end
+
       assert_equal('<html><body><h1>Header</h1></body></html>', td_2.html)
 
       Wx::Clipboard.open do | clip |
@@ -64,7 +65,7 @@ if Wx.has_feature?(:USE_HTML) && Wx::WXWIDGETS_VERSION >= '3.3'
       Wx::Clipboard.open do | clip |
         clip.fetch td_3
       end
-      assert_equal('', td_3.get_data_here)
+      assert_equal('', td_3.get_html)
     end
   end
 end

data/tests/test_event_handling.rb

@@ -41,6 +41,7 @@ class EventHandlingTests < Test::Unit::TestCase
       @child = Child.new(self)
       @test_event = false
       @test_cmd_event = false
+      @called_after = false
 
       evt_test_event { |evt| @test_event = true }
       evt_test_cmd_event { |evt| @test_cmd_event = true }
@@ -48,45 +49,227 @@ class EventHandlingTests < Test::Unit::TestCase
 
     attr_reader :child
     attr_reader :test_event, :test_cmd_event
+    attr_accessor :called_after
 
     def reset
       @test_event = false
       @test_cmd_event = false
+      @called_after = false
       child.reset
     end
   end
 
   def test_event
     win = TestFrame.new
-    assert_boolean(!win.test_event)
-    assert_boolean(!win.child.test_event)
+    assert(!win.test_event)
+    assert(!win.child.test_event)
     win.child.event_handler.process_event(TestEvent.new)
-    assert_boolean(!win.test_event)
-    assert_boolean(win.child.test_event)
+    assert(!win.test_event)
+    assert(win.child.test_event)
     win.reset
     win.child.event_handler.process_event(TestEvent.new(1))
-    assert_boolean(!win.test_event)
-    assert_boolean(win.child.test_event)
+    assert(!win.test_event)
+    assert(win.child.test_event)
     win.reset
     win.event_handler.process_event(TestEvent.new)
-    assert_boolean(win.test_event)
-    assert_boolean(!win.child.test_event)
+    assert(win.test_event)
+    assert(!win.child.test_event)
+    win.destroy
+    Wx.get_app.yield
   end
 
   def test_cmd_event
     win = TestFrame.new
-    assert_boolean(!win.test_cmd_event)
-    assert_boolean(!win.child.test_cmd_event)
+    assert(!win.test_cmd_event)
+    assert(!win.child.test_cmd_event)
     win.child.event_handler.process_event(TestCmdEvent.new)
-    assert_boolean(!win.test_cmd_event)
-    assert_boolean(win.child.test_cmd_event)
+    assert(!win.test_cmd_event)
+    assert(win.child.test_cmd_event)
     win.reset
     win.child.event_handler.process_event(TestCmdEvent.new(1))
-    assert_boolean(win.test_cmd_event)
-    assert_boolean(win.child.test_cmd_event)
+    assert(win.test_cmd_event)
+    assert(win.child.test_cmd_event)
     win.reset
     win.event_handler.process_event(TestCmdEvent.new)
-    assert_boolean(win.test_cmd_event)
-    assert_boolean(!win.child.test_cmd_event)
+    assert(win.test_cmd_event)
+    assert(!win.child.test_cmd_event)
+    win.destroy
+    Wx.get_app.yield
   end
+
+  def test_queue_event
+    win = TestFrame.new
+    assert(!win.test_cmd_event)
+    assert(!win.child.test_cmd_event)
+    win.child.event_handler.queue_event(TestCmdEvent.new)
+    Wx.get_app.yield
+    assert(!win.test_cmd_event)
+    assert(win.child.test_cmd_event)
+    win.reset
+    win.child.event_handler.queue_event(TestCmdEvent.new(1))
+    Wx.get_app.yield
+    assert(win.test_cmd_event)
+    assert(win.child.test_cmd_event)
+    win.reset
+    win.event_handler.queue_event(TestCmdEvent.new)
+    Wx.get_app.yield
+    assert(win.test_cmd_event)
+    assert(!win.child.test_cmd_event)
+    win.destroy
+    Wx.get_app.yield
+  end
+
+  def test_pending_event
+    win = TestFrame.new
+    assert(!win.test_cmd_event)
+    assert(!win.child.test_cmd_event)
+    win.child.event_handler.add_pending_event(TestCmdEvent.new)
+    Wx.get_app.yield
+    assert(!win.test_cmd_event)
+    assert(win.child.test_cmd_event)
+    win.reset
+    win.child.event_handler.add_pending_event(TestCmdEvent.new(1))
+    Wx.get_app.yield
+    assert(win.test_cmd_event)
+    assert(win.child.test_cmd_event)
+    win.reset
+    win.event_handler.add_pending_event(TestCmdEvent.new)
+    Wx.get_app.yield
+    assert(win.test_cmd_event)
+    assert(!win.child.test_cmd_event)
+    win.destroy
+    Wx.get_app.yield
+  end
+
+  def test_post_event
+    win = TestFrame.new
+    assert(!win.test_cmd_event)
+    assert(!win.child.test_cmd_event)
+    Wx.post_event(win.child.event_handler, TestCmdEvent.new)
+    Wx.get_app.yield
+    assert(!win.test_cmd_event)
+    assert(win.child.test_cmd_event)
+    win.reset
+    Wx.post_event(win.child.event_handler, TestCmdEvent.new(1))
+    Wx.get_app.yield
+    assert(win.test_cmd_event)
+    assert(win.child.test_cmd_event)
+    win.reset
+    Wx.post_event(win.event_handler, TestCmdEvent.new)
+    Wx.get_app.yield
+    assert(win.test_cmd_event)
+    assert(!win.child.test_cmd_event)
+    win.destroy
+    Wx.get_app.yield
+  end
+
+  def test_call_after
+    win = TestFrame.new
+    assert(!win.called_after)
+    win.event_handler.call_after { win.called_after = true }
+    Wx.get_app.yield
+    assert(win.called_after)
+    win.reset
+    win.child.event_handler.call_after { win.called_after = true }
+    Wx.get_app.yield
+    assert(win.called_after)
+    win.destroy
+    Wx.get_app.yield
+  end
+
+  def test_event_blocker
+    win = TestFrame.new
+    assert(!win.test_event)
+    win.event_handler.process_event(TestEvent.new)
+    assert(win.test_event)
+    win.reset
+    Wx::EventBlocker.blocked_for(win) do |blkr|
+      win.event_handler.process_event(TestEvent.new(1))
+    end
+    assert(!win.test_event)
+    win.event_handler.process_event(TestEvent.new)
+    assert(win.test_event)
+    win.reset
+    Wx::EventBlocker.blocked_for(win, TestEvent::EVT_TEST_EVENT) do |blkr|
+      win.event_handler.process_event(TestEvent.new(1))
+    end
+    assert(!win.test_event)
+    win.event_handler.process_event(TestEvent.new)
+    assert(win.test_event)
+    win.reset
+    Wx::EventBlocker.blocked_for(win, Wx::EVT_ACTIVATE) do |blkr|
+      win.event_handler.process_event(TestEvent.new(1))
+    end
+    assert(win.test_event)
+    win.destroy
+    Wx.get_app.yield
+  end
+
+  class MyEventFilter < Wx::EventFilter
+    def initialize
+      super
+      @filtered = false
+    end
+
+    attr_accessor :filtered
+
+    def filter_event(event)
+      @filtered = true if event.is_a?(TestEvent)
+      Wx::EventFilter::Event_Skip
+    end
+  end
+
+  def test_event_filter
+    filter = MyEventFilter.new
+    assert_nothing_raised { Wx::EvtHandler.add_filter(filter) }
+    GC.start
+    win = TestFrame.new
+    win.child.event_handler.process_event(TestEvent.new)
+    GC.start
+    assert(filter.filtered)
+    filter.filtered = false
+    win.child.event_handler.process_event(TestCmdEvent.new)
+    GC.start
+    assert(!filter.filtered)
+    assert_nothing_raised { Wx::EvtHandler.remove_filter(filter) }
+    GC.start
+    win.child.event_handler.process_event(TestEvent.new)
+    assert(!filter.filtered)
+    GC.start
+    win.destroy
+    Wx.get_app.yield
+  end
+
+  class MyEventFilter2 < Wx::EventFilter
+
+    class << self
+      attr_accessor :filtered
+    end
+
+    def filter_event(event)
+      MyEventFilter2.filtered = true if event.is_a?(TestEvent)
+      Wx::EventFilter::Event_Skip
+    end
+  end
+
+  def test_event_filter_clear
+    assert_nothing_raised { Wx::EvtHandler.add_filter(MyEventFilter2.new) }
+    GC.start
+    win = TestFrame.new
+    win.child.event_handler.process_event(TestEvent.new)
+    GC.start
+    assert(MyEventFilter2.filtered)
+    MyEventFilter2.filtered = false
+    win.child.event_handler.process_event(TestCmdEvent.new)
+    GC.start
+    assert(!MyEventFilter2.filtered)
+    assert_nothing_raised { Wx::EvtHandler.clear_filters }
+    GC.start
+    win.child.event_handler.process_event(TestEvent.new)
+    assert(!MyEventFilter2.filtered)
+    GC.start
+    win.destroy
+    Wx.get_app.yield
+  end
+
 end

data/tests/test_events.rb

@@ -7,9 +7,9 @@ class EventTests < Test::Unit::TestCase
     evt = Wx::Event.new(100, 1)
     assert_equal(100, evt.event_type)
     assert_equal(1, evt.id)
-    assert_boolean(!evt.should_propagate)
+    assert(!evt.should_propagate)
     evt.skip
-    assert_boolean(evt.skipped)
+    assert(evt.skipped)
     evt_dup = evt.clone
     assert_not_equal(evt, evt_dup)
     assert_equal(evt.event_type, evt_dup.event_type)
@@ -20,9 +20,9 @@ class EventTests < Test::Unit::TestCase
     evt = Wx::CommandEvent.new(100, 1)
     assert_equal(100, evt.event_type)
     assert_equal(1, evt.id)
-    assert_boolean(evt.should_propagate)
+    assert(evt.should_propagate)
     evt.skip
-    assert_boolean(evt.skipped)
+    assert(evt.skipped)
     evt.string = 'CommandEvent Test'
     assert_equal('CommandEvent Test', evt.string)
     evt_dup = evt.clone
@@ -44,10 +44,3 @@ class EventTests < Test::Unit::TestCase
     assert_equal(evt.position, evt_dup.position)
   end
 end
-
-class TestApp < Wx::App
-  def on_init
-    Test::Unit::UI::Console::TestRunner.run(EventTests)
-    false
-  end
-end