wxruby3 0.9.0.pre.beta.13-x64-mingw-ucrt → 0.9.0.pre.rc.1-x64-mingw-ucrt

data/samples/drawing/{svgtest.rb → image_prt.rb}

@@ -4,7 +4,7 @@
 
 require 'wx'
 
-class SVGPage < Wx::ScrolledWindow
+class ImagePage < Wx::ScrolledWindow
 
   PAGES = [
     'Lines',
@@ -41,9 +41,36 @@ class SVGPage < Wx::ScrolledWindow
   end
 
   def on_save(filename)
-    svgDC = Wx::SVGFileDC.new(filename, 600, 650)
-    on_draw(svgDC)
-    svgDC.ok?
+    case File.extname(filename)
+    when '.svg'
+      Wx::SVGFileDC.draw_on(filename, 600, 650) do |svgDC|
+        on_draw(svgDC)
+        svgDC.ok?
+      end
+    when '.ps'
+      print_data = Wx::PRT::PrintData.new
+      print_data.set_print_mode(Wx::PRINT_MODE_FILE)
+      print_data.set_filename(filename)
+      print_data.set_orientation(Wx::PrintOrientation::PORTRAIT)
+      print_data.set_paper_id(Wx::PaperSize::PAPER_A4)
+      screen_ppi = printer_ppi = nil
+      Wx::ScreenDC.draw_on do |dc|
+        screen_ppi = dc.get_ppi
+      end
+      Wx::PRT::PostScriptDC.draw_on(print_data) do |dc|
+        printer_ppi = dc.get_ppi
+        scale = printer_ppi.x.to_f / screen_ppi.x.to_f
+        dc.start_doc("Drawing sample")
+        # Define default font.
+        dc.set_font(Wx::FontInfo.new(10).family(Wx::FontFamily::FONTFAMILY_MODERN))
+        dc.start_page
+        Wx::ScaledDC.draw_on(dc, scale) do |sdc|
+          on_draw(sdc)
+        end
+        dc.end_page
+        dc.end_doc
+      end
+    end
   end
 
   def on_paint
@@ -278,10 +305,10 @@ class SVGPage < Wx::ScrolledWindow
   
 end
 
-class SVGFrame < Wx::Frame
+class ImageFrame < Wx::Frame
 
   def initialize
-    super(nil, title: 'SVG Demo', size: [500, 400])
+    super(nil, title: 'ImagePrint Demo', size: [500, 400])
 
     icon_file = File.join(__dir__,'..', 'art', "wxruby.png")
     self.icon = Wx::Icon.new(icon_file)
@@ -310,8 +337,8 @@ class SVGFrame < Wx::Frame
     @notebook = Wx::Notebook.new(self, style: Wx::BK_TOP)
 
     # Add SVG Windows to a notebook
-    SVGPage::PAGES.each_with_index do |title, index|
-      @notebook.add_page(SVGPage.new(@notebook, index), title)
+    ImagePage::PAGES.each_with_index do |title, index|
+      @notebook.add_page(ImagePage.new(@notebook, index), title)
     end
 
     evt_menu Wx::ID_SAVE, :file_save_picture
@@ -322,9 +349,13 @@ class SVGFrame < Wx::Frame
   def file_save_picture(event)
     page = @notebook.current_page
 
+    wildcard = 'SVG vector picture files (*.svg)|*.svg'
+    if Wx.has_feature?(:USE_PRINTING_ARCHITECTURE)
+      wildcard << '|PostScript files (*.ps)|*.ps'
+    end
     Wx::FileDialog(self, 'Save Picture as', '',
                    @notebook.get_page_text(@notebook.get_selection),
-                   'SVG vector picture files (*.svg)|*.svg',
+                   wildcard,
                    Wx::FD_SAVE|Wx::FD_OVERWRITE_PROMPT) do |dlg|
       if dlg.show_modal == Wx::ID_OK
         page.on_save(dlg.get_path)
@@ -334,14 +365,14 @@ class SVGFrame < Wx::Frame
 
   def on_about(event)
     Wx.message_box(
-      "wxRuby SVG sample\n" +
-      "(converted from wxWidgets)\n" +
+      "wxRuby ImagePrint sample\n" +
+      "(converted from wxWidgets SVGTest)\n" +
       "Authors:\n" +
       "   Chris Elliott (c) 2002-2009\n" +
       "   Prashant Kumar Nirmal (c) 2017\n" +
       "   Martin Corino (c) 2023\n" +
-      'Usage: click File|Save to Save the Selected SVG Test',
-      'About SVG Test')
+      'Usage: click File|Save to Save the Selected Image page',
+      'About ImagePrint Test')
   end
 
   def on_quit(event)
@@ -350,24 +381,24 @@ class SVGFrame < Wx::Frame
 
 end
 
-module SVGTestSample
+module ImagePrintSample
 
   include WxRuby::Sample if defined? WxRuby::Sample
 
   def self.describe
     { file: __FILE__,
-      summary: 'wxRuby SVGFileDC example.',
-      description: 'wxRuby example showcasing Wx::SVGFileDC to create SVG files.' }
+      summary: 'wxRuby Image printing example.',
+      description: 'wxRuby example showcasing Wx::SVGFileDC/Wx::PostScriptDC to create SVG/PS files.' }
   end
 
   def self.activate
-    frame = SVGFrame.new
+    frame = ImageFrame.new
     frame.show
     frame
   end
 
   if $0 == __FILE__
-    Wx::App.run { SVGTestSample.activate }
+    Wx::App.run { ImagePrintSample.activate }
   end
 
 end

data/samples/propgrid/propgrid.rb

@@ -1384,29 +1384,31 @@ class FormMain < Wx::Frame
                                       Wx::PG::PG_LABEL,
                                       "Test Text"))
     myTestBitmap1x = Wx::Bitmap.new(60, 15, 32)
-    mdc = Wx::MemoryDC.new(myTestBitmap1x)
-    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)
+    Wx::MemoryDC.draw_on(myTestBitmap1x) 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
 
     myTestBitmap2x = Wx::Bitmap.new(120, 30, 32)
-    mdc = Wx::MemoryDC.new(myTestBitmap2x)
-    mdc.set_background(Wx::WHITE_BRUSH)
-    mdc.clear
-    mdc.set_pen(Wx::Pen.new(Wx::BLUE, 2))
-    mdc.set_brush(Wx::WHITE_BRUSH)
-    mdc.draw_rectangle(0, 0, 120, 30)
-    mdc.draw_line(0, 0, 119, 31)
-    mdc.set_text_foreground(Wx::BLUE)
-    f = mdc.font
-    f.set_pixel_size(f.get_pixel_size * 2)
-    mdc.set_font(f)
-    mdc.draw_text("x2", 0, 0)
+    Wx::MemoryDC.draw_on(myTestBitmap2x) do |mdc|
+      mdc.set_background(Wx::WHITE_BRUSH)
+      mdc.clear
+      mdc.set_pen(Wx::Pen.new(Wx::BLUE, 2))
+      mdc.set_brush(Wx::WHITE_BRUSH)
+      mdc.draw_rectangle(0, 0, 120, 30)
+      mdc.draw_line(0, 0, 119, 31)
+      mdc.set_text_foreground(Wx::BLUE)
+      f = mdc.font
+      f.set_pixel_size(f.get_pixel_size * 2)
+      mdc.set_font(f)
+      mdc.draw_text("x2", 0, 0)
+    end
 
     myTestBitmap2x.set_scale_factor(2)
     pg.set_property_image("StringPropertyWithBitmap", Wx::BitmapBundle.from_bitmaps(myTestBitmap1x, myTestBitmap2x))

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