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

data/lib/wx/wxruby/cmd/test.rb

@@ -16,7 +16,7 @@ module WxRuby
           description
         else
           Dir[File.join(WxRuby::ROOT, 'tests', '*.rb')].each do |test|
-            system(RUBY, test)
+            exit(1) unless system(RUBY, test)
           end
         end
       end

data/rakelib/install.rb

@@ -34,7 +34,9 @@ module WXRuby3
                   grp_id = m[1]
                   lib_id = m[2]
                   ver = m[3].sub('.', '')
-                  lib = "wx#{grp_id.sub(/u\Z/, '')}#{ver}u#{lib_id}"
+                  # as of wxw 3.3 there seems to be an additional digit added to the version part of the dll name
+                  # so add a wildcard ('*') in that spot to match older and newer versions
+                  lib = "wx#{grp_id.sub(/u\Z/, '')}#{ver}*u#{lib_id}"
                   @wxwin_shlibs.include File.join(libdir, "#{lib}*.#{WXRuby3.config.dll_mask}")
                 end
               else

data/rakelib/yard/yard/relative_markdown_links.rb

@@ -20,7 +20,11 @@ module YARD # rubocop:disable Style/Documentation
     def resolve_links(text)
       html = Nokogiri::HTML.fragment(text)
       html.css("a[href]").each do |link|
-        href = URI(link["href"])
+        begin
+          href = URI(link["href"])
+        rescue
+          return super(text)
+        end
 
         if href.relative? && options.files
           fnames = options.files.map(&:filename)

data/samples/bigdemo/wxArtProvider.rbw

@@ -242,10 +242,11 @@ class TestPanel < Wx::Panel
 
 
     def clear_bmp(bmp)
-        dc = Wx::MemoryDC.new
-        dc.select_object(bmp)
-        dc.set_background(Wx::WHITE_BRUSH)
-        dc.clear
+        Wx::MemoryDC.draw_on do |dc|
+          dc.select_object(bmp)
+          dc.set_background(Wx::WHITE_BRUSH)
+          dc.clear
+        end
     end
 end
 

data/samples/controls/controls.rb

@@ -117,8 +117,8 @@ class MyComboBox < ComboBox
   end
 
   def onChar(event)
-    log_message("MyComboBox::OnChar")
-    if event.key_code() == ?w
+    log_message("MyComboBox::OnChar : [#{event.get_unicode_key ? event.get_unicode_key.ord : 0}]")
+    if event.get_unicode_key == ?w
       log_message("MyComboBox: 'w' will be ignored.")
     else
       event.skip()

data/samples/controls/htlbox.rb

@@ -0,0 +1,411 @@
+#!/usr/bin/env ruby
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require 'wx'
+
+# to use Wx::HtmlListBox you must derive a new class from it as you must
+# implement virtual on_get_item
+class MyHtmlListBox < Wx::HTML::HtmlListBox
+
+  def initialize(parent, multi = false)
+    super(parent, style: multi ? Wx::LB_MULTIPLE : 0)
+    # flag telling us whether we should use fg colour even for the selected
+    # item
+    @change = false
+    # flag which we toggle to update the first items text in on_get_item()
+    @first_item_updated = false
+    @link_clicked = false
+
+    set_margins(5, 5)
+
+    set_item_count(1000)
+
+    set_selection(3)
+  end
+
+  attr_accessor :link_clicked
+
+  def set_change_sel_fg(change)
+    @change = change
+  end
+
+  def update_first_item
+    @first_item_updated = !@first_item_updated
+
+    refresh_row(0)
+  end
+
+  protected
+
+  # override this method to return data to be shown in the listbox (this is
+  # mandatory)
+  def on_get_item(n)
+    return '<h1><b>Just updated</b></h1>' if n == 0 && @first_item_updated
+
+    level = n % 6 + 1
+
+    clr = Wx::Colour.new((n - 192).abs % 256,
+                         (n - 256).abs % 256,
+                         (n - 128).abs % 256)
+
+    label = "<h#{level}><font color=#{clr.get_as_string(Wx::C2S_HTML_SYNTAX)}>Item</font> <b>#{n}</b></h#{level}>"
+    if n == 1
+      if !@link_clicked
+        label += "<a href='1'>Click here...</a>"
+      else
+        label += "<font color='#9999ff'>Clicked here...</font>"
+      end
+    end
+
+    label
+  end
+
+  # change the appearance by overriding these functions (this is optional)
+  def on_draw_separator(dc, rect, _)
+    if get_parent.menu_bar.is_checked(MyFrame::ID::HtmlLbox_DrawSeparator)
+      dc.with_pen(Wx::BLACK_DASHED_PEN) do
+        dc.draw_line(rect.x, rect.y, rect.right, rect.y)
+        dc.draw_line(rect.x, rect.bottom, rect.right, rect.bottom)
+      end
+    end
+  end
+
+  def get_selected_text_colour(col_fg)
+    @change ? super : col_fg
+  end
+
+end
+
+class MyFrame < Wx::Frame
+
+  # IDs for the controls and the menu commands
+  module ID
+    include Wx::IDHelper
+    # menu items
+    HtmlLbox_CustomBox = self.next_id
+    HtmlLbox_SimpleBox = self.next_id
+    HtmlLbox_Quit = self.next_id
+
+    HtmlLbox_SetMargins = self.next_id
+    HtmlLbox_DrawSeparator = self.next_id
+    HtmlLbox_ToggleMulti = self.next_id
+    HtmlLbox_SelectAll = self.next_id
+    HtmlLbox_UpdateItem = self.next_id
+    HtmlLbox_GetItemRect = self.next_id
+
+    HtmlLbox_SetBgCol = self.next_id
+    HtmlLbox_SetSelBgCol = self.next_id
+    HtmlLbox_SetSelFgCol = self.next_id
+
+    HtmlLbox_Clear = self.next_id
+  
+    # it is important for the id corresponding to the "About" command to have
+    # this standard value as otherwise it won't be handled properly under Mac
+    # (where it is special and put into the "Apple" menu)
+    HtmlLbox_About = Wx::ID_ABOUT
+  end
+
+  Wx::ArtLocator.add_search_path(File.dirname(__dir__))
+
+  def initialize
+    super(nil, title: 'HtmlLbox wxWidgets Sample',size: [500, 500])
+
+    # set the frame icon
+    set_icon(Wx::Icon(:sample))
+
+    if Wx.has_feature?(:USE_MENUS)
+
+    # create a menu bar
+    menu_file = Wx::Menu.new
+    menu_file.append_radio_item(ID::HtmlLbox_CustomBox, "Use custom box",
+                              "Use a wxHtmlListBox virtual class control")
+    menu_file.append_radio_item(ID::HtmlLbox_SimpleBox, "Use simple box",
+                              "Use a wxSimpleHtmlListBox control")
+    menu_file.append_separator
+    menu_file.append(ID::HtmlLbox_Quit, "E&xit\tAlt-X", "Quit this program")
+
+    # create our specific menu
+    menu_hl_box = Wx::Menu.new
+    menu_hl_box.append(ID::HtmlLbox_SetMargins, "Set &margins...\tCtrl-G", "Change the margins around the items")
+    menu_hl_box.append_check_item(ID::HtmlLbox_DrawSeparator,
+                                  "&Draw separators\tCtrl-D" ,
+                                  "Toggle drawing separators between cells")
+    menu_hl_box.append_separator
+    menu_hl_box.append_check_item(ID::HtmlLbox_ToggleMulti,
+                               "&Multiple selection\tCtrl-M",
+                               "Toggle multiple selection on/off")
+    menu_hl_box.append_separator
+    menu_hl_box.append(ID::HtmlLbox_SelectAll, "Select &all items\tCtrl-A")
+    menu_hl_box.append(ID::HtmlLbox_UpdateItem, "Update &first item\tCtrl-U")
+    menu_hl_box.append(ID::HtmlLbox_GetItemRect, "Show &rectangle of item #10\tCtrl-R")
+    menu_hl_box.append_separator
+    menu_hl_box.append(ID::HtmlLbox_SetBgCol, "Set &background...\tCtrl-B")
+    menu_hl_box.append(ID::HtmlLbox_SetSelBgCol,
+                      "Set &selection background...\tCtrl-S")
+    menu_hl_box.append_check_item(ID::HtmlLbox_SetSelFgCol,
+                               "Keep &foreground in selection\tCtrl-F")
+
+    menu_hl_box.append_separator
+    menu_hl_box.append(ID::HtmlLbox_Clear, "&Clear\tCtrl-L")
+
+    # the "About" item should be in the help menu
+    help_menu = Wx::Menu.new
+    help_menu.append(ID::HtmlLbox_About, "&About\tF1", "Show about dialog")
+
+    # now append the freshly created menu to the menu bar...
+    mbar = Wx::MenuBar.new
+    mbar.append(menu_file, "&File")
+    mbar.append(menu_hl_box, "&Listbox")
+    mbar.append(help_menu, "&Help")
+
+    mbar.check(ID::HtmlLbox_DrawSeparator, true)
+
+    # ... and attach this menu bar to the frame
+    self.menu_bar = mbar
+
+    end # USE_MENUS
+
+    if Wx.has_feature?(:USE_STATUSBAR)
+    # create a status bar just for fun (by default with 1 pane only)
+    create_status_bar(2)
+    set_status_text("Welcome to wxWidgets!")
+    end # USE_STATUSBAR
+
+    # create the child controls
+    create_box
+    text = Wx::TextCtrl.new(self, Wx::ID_ANY, "", style: Wx::TE_MULTILINE)
+    Wx::Log.set_active_target(Wx::LogTextCtrl.new(text))
+
+    # and lay them out
+    sizer = Wx::HBoxSizer.new
+    sizer.add(@hlbox, 2, Wx::GROW)
+    sizer.add(text, 3, Wx::GROW)
+
+    self.sizer = sizer
+    
+    evt_menu ID::HtmlLbox_CustomBox,  :on_simple_or_custom_box
+    evt_menu ID::HtmlLbox_SimpleBox,  :on_simple_or_custom_box
+    evt_menu ID::HtmlLbox_Quit,  :on_quit
+
+    evt_menu ID::HtmlLbox_SetMargins, :on_set_margins
+    evt_menu ID::HtmlLbox_DrawSeparator, :on_draw_separator
+    evt_menu ID::HtmlLbox_ToggleMulti, :on_toggle_multi
+    evt_menu ID::HtmlLbox_SelectAll, :on_select_all
+    evt_menu ID::HtmlLbox_UpdateItem, :on_update_item
+    evt_menu ID::HtmlLbox_GetItemRect, :on_get_item_rect
+
+    evt_menu ID::HtmlLbox_About, :on_about
+
+    evt_menu ID::HtmlLbox_SetBgCol, :on_set_bg_col
+    evt_menu ID::HtmlLbox_SetSelBgCol, :on_set_sel_bg_col
+    evt_menu ID::HtmlLbox_SetSelFgCol, :on_set_sel_fg_col
+
+    evt_menu ID::HtmlLbox_Clear, :on_clear
+
+    evt_update_ui ID::HtmlLbox_SelectAll, :on_update_ui_select_all
+
+    evt_listbox Wx::ID_ANY, :on_lbox_select
+    evt_listbox_dclick Wx::ID_ANY, :on_lbox_d_click
+
+    # the HTML listbox's events
+    evt_html_link_clicked Wx::ID_ANY, :on_html_link_clicked
+    evt_html_cell_hover Wx::ID_ANY, :on_html_cell_hover
+    evt_html_cell_clicked Wx::ID_ANY, :on_html_cell_clicked
+  end
+
+  # event handlers
+  def on_simple_or_custom_box(event)
+    old = @hlbox
+
+    # we need to recreate the listbox
+    create_box
+    get_sizer.replace(old, @hlbox)
+    old.destroy
+
+    get_sizer.layout
+    refresh
+  end
+  def on_quit(event)
+    # true is to force the frame to close
+    close(true)
+  end
+  def on_about(event)
+    Wx.message_box("This sample shows Wx::HtmlListBox class.\n"+
+                   "\n"+
+                   "(c) 2023 Martin Corino\n" +
+                   "(original (c) 2003 Vadim Zeitlin)\n",
+                   "About HtmlLbox",
+                   Wx::OK | Wx::ICON_INFORMATION,
+                   self)
+  end
+
+  def on_set_margins(event)
+    margin = Wx.get_number_from_user(
+      "Enter the margins to use for the listbox items.",
+      "Margin: ",
+      "HtmlLbox: Set the margins",
+      0, 0, 20,
+      self)
+
+    if margin != -1
+      @hlbox.set_margins(margin, margin)
+      @hlbox.refresh_all
+    end
+  end
+  def on_draw_separator(_event)
+    @hlbox.refresh_all
+  end
+  def on_toggle_multi(event)
+    old = @hlbox
+
+    # we need to recreate the listbox
+    create_box
+    get_sizer.replace(old, @hlbox)
+    old.destroy
+
+    get_sizer.layout
+  end
+  def on_select_all(event)
+    @hlbox.select_all
+  end
+  def on_update_item(event)
+    @hlbox.update_first_item if @hlbox.is_a?(MyHtmlListBox)
+  end
+
+  def on_get_item_rect(event)
+   r = @hlbox.get_item_rect(10)
+   Wx.log_message("Rect of item %d: (%d, %d)-(%d, %d)",
+                  10, r.x, r.y, r.x + r.width, r.y + r.height)
+  end
+
+  def on_set_bg_col(event)
+    col = Wx.get_colour_from_user(self, @hlbox.get_background_colour)
+    if col.ok?
+      @hlbox.set_background_colour(col)
+      @hlbox.refresh
+
+      if Wx.has_feature?(:USE_STATUSBAR)
+        set_status_text("Background colour changed.")
+      end # wxUSE_STATUSBAR
+    end
+  end
+  def on_set_sel_bg_col(event)
+    col = Wx.get_colour_from_user(self, @hlbox.get_selection_background)
+    if col.ok?
+      @hlbox.set_selection_background(col)
+      @hlbox.refresh
+
+      if Wx.has_feature?(:USE_STATUSBAR)
+        set_status_text("Selection Background colour changed.")
+      end # wxUSE_STATUSBAR
+    end
+  end
+  def on_set_sel_fg_col(event)
+    if @hlbox.is_a?(MyHtmlListBox)
+      @hlbox.set_change_sel_fg(!event.checked?)
+      @hlbox.refresh
+    end
+  end
+
+  def on_clear(event)
+    @hlbox.clear
+  end
+
+  def on_update_ui_select_all(event)
+    event.enable(@hlbox && @hlbox.has_multiple_selection)
+  end
+
+  def on_lbox_select(event)
+    Wx.log_message("Listbox selection is now %d.", event.get_int)
+
+    if @hlbox.has_multiple_selection
+      s = ''
+      @hlbox.each_selected do |item|
+        s << ', ' unless s.empty?
+        s << item.to_s
+      end
+      Wx.log_message("Selected items: #{s}") unless s.empty?
+    end
+
+    if Wx.has_feature?(:USE_STATUSBAR)
+      set_status_text("# items selected = #{@hlbox.get_selected_count}")
+    end # wxUSE_STATUSBAR
+  end
+   
+  def on_lbox_d_click(event)
+    Wx.log_message("Listbox item #{event.get_int} double clicked.")
+  end
+
+  def on_html_link_clicked(event)
+    Wx.log_message("The url '%s' has been clicked!", event.get_link_info.get_href)
+
+    if @hlbox.is_a?(MyHtmlListBox)
+      @hlbox.link_clicked = true
+      @hlbox.refresh_row(1)
+    end
+  end
+  def on_html_cell_hover(event)
+    Wx.log_message("Mouse moved over cell %s at %d;%d",
+                 event.get_cell.id, event.get_point.x, event.get_point.y)
+  end
+  def on_html_cell_clicked(event)
+    Wx.log_message("Click over cell %s at %d;%d",
+                 event.get_cell.id, event.get_point.x, event.get_point.y)
+
+    # if we don't skip the event, OnHtmlLinkClicked won't be called!
+    event.skip
+  end
+
+  def create_box
+    multi = get_menu_bar.is_checked(ID::HtmlLbox_ToggleMulti)
+
+    if get_menu_bar.is_checked(ID::HtmlLbox_CustomBox)
+      @hlbox = MyHtmlListBox.new(self, multi)
+    else # simple listbox
+      @hlbox = Wx::HTML::SimpleHtmlListBox.new(self, style: multi ? Wx::LB_MULTIPLE : 0)
+
+      # unlike Wx::HTML::HtmlListBox which is abstract, Wx::HTML::SimpleHtmlListBox is a
+      # concrete control and doesn't support virtual mode, this we need
+      # to add all of its items from the beginning
+      arr = []
+      1000.times do |n|
+        clr = Wx::Colour.new((n - 192).abs % 256,
+                             (n - 256).abs % 256,
+                             (n - 128).abs % 256)
+        level = n % 6 + 1
+
+        label = "<h#{level}><font color=#{clr.get_as_string(Wx::C2S_HTML_SYNTAX)}>Item</font> <b>#{n}</b></h#{level}>"
+        arr << label
+      end
+
+      @hlbox.append(arr)
+    end
+  end
+
+end
+
+module HtmlListBoxSample
+
+  include WxRuby::Sample if defined? WxRuby::Sample
+
+  def self.describe
+    { file: __FILE__,
+      summary: 'wxRuby HtmlListBox control example.',
+      description: "wxRuby example showcasing the HtmlListBox controls.\n"+
+        "  - Wx::HtmlListBox\n"+
+        "  - Wx::SimpleHtmlListBox\n"
+    }
+  end
+
+  def self.activate
+    frame = MyFrame.new
+    frame.show
+    frame
+  end
+
+  if $0 == __FILE__
+    Wx::App.run { HtmlListBoxSample.activate }
+  end
+
+end

data/samples/drawing/graphics_drawing.rb

@@ -108,8 +108,7 @@ class GraphicsWindow < Wx::Window
     @rtxt[:font] = gdc.create_font(@font,Wx::RED); @rtxt[:txt] = "This is a red string"
     @gtxt[:font] = gdc.create_font(@font,Wx::GREEN); @gtxt[:txt] = "This is a green string"
     @btxt[:font] = gdc.create_font(@font,Wx::BLUE); @btxt[:txt] = "This is a blue string"
-    # Create the GraphicsContext resources.  For some reason, unable to utilize
-    # GraphicsContext#create(wxWindow) to create these resources in initialize.
+    # Create the GraphicsContext resources.
     @rbrush = gdc.create_brush(RED_BRUSH)
     @gbrush = gdc.create_brush(GREEN_BRUSH)
     @bbrush = gdc.create_brush(BLUE_BRUSH)

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