wxruby3 0.9.0-x64-mingw-ucrt → 0.9.2-x64-mingw-ucrt

data/rakelib/yard/templates/default/tags/html/wxrb_require.erb

@@ -0,0 +1,10 @@
+<% if object.has_tag?(:wxrb_require) %>
+  <p class="tag_title">Requires:</p>
+  <ul class="wxrb-require">
+    <% wxruby_requires.each do |req| %>
+      <li><div class='inline'>
+        <%= req.join(' or ') %>
+      </div></li>
+    <% end %>
+  </ul>
+<% end %>

data/rakelib/yard/templates/default/tags/setup.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+def wxrb_require
+  erb('wxrb_require')
+end
+
+def wxruby_requires
+  object.tags(:wxrb_require).inject([]) do |list, tag|
+    tag.text.split(',').each do |feature|
+      list << feature.split('|').collect do |s|
+        s.split('&').collect { |ss| %Q[<span class="wxrb-require">#{ss.strip}</span>] }.join('&amp;')
+      end
+    end
+    list
+  end
+end

data/rakelib/yard/yard-custom-templates.rb

@@ -1,2 +1,5 @@
 
+YARD::Tags::Library.define_tag("Requirements", :wxrb_require)
+YARD::Tags::Library.visible_tags.place(:wxrb_require).before(:author)
+
 YARD::Templates::Engine.register_template_path File.join(__dir__, 'templates')

data/samples/text/richtext.rb

@@ -1432,36 +1432,6 @@ class MyFrame < Wx::Frame
 
   end
 
-  # Forward command events to the current rich text control, if any
-  def try_before(event)
-    if event.is_command_event && !event.is_a?(Wx::ChildFocusEvent)
-      # Problem: we can get infinite recursion because the events
-      # climb back up to this frame, and repeat.
-      # Assume that command events don't cause another command event
-      # to be called, so we can rely on inCommand not being overwritten
-
-      if MyFrame.win_id != event.id && MyFrame.event_type != event.event_type
-        MyFrame.event_type = event.event_type
-        MyFrame.win_id = event.id
-        focusWin = Wx.find_focus_descendant(self)
-        focusWin = @richTextCtrl unless focusWin
-
-        if focusWin && focusWin.get_event_handler.process_event(event)
-          MyFrame.event_type = 0
-          MyFrame.win_id = 0
-          return true
-        end
-
-        MyFrame.event_type = 0
-        MyFrame.win_id = 0
-      else
-        return false
-      end
-    end
-
-    false
-  end
-
   # Write text
   def write_initial_text
     r = @richTextCtrl

data/samples/treectrl/treectrl.rb

@@ -369,7 +369,7 @@ class MyTreeCtrl < Wx::TreeCtrl
       set_item_font(root_id, Wx::ITALIC_FONT)
     end
 
-    ids = get_children(root_id)
+    ids = get_item_children(root_id)
 
     # make the first item blue
     set_item_text_colour(ids[0], Wx::BLUE)

data/tests/test_app_exit_exception.rb

@@ -0,0 +1,36 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require 'test/unit'
+require 'wx'
+
+class TestApp < Test::Unit::TestCase
+
+  class TestFrame < Wx::Frame
+    def initialize
+      super(nil, -1, '')
+      evt_paint { on_paint }
+    end
+
+    def on_paint
+      paint {}
+      close
+    end
+  end
+
+  class TestApp < Wx::App
+    def on_init
+      TestFrame.new.show
+    end
+
+    def on_exit
+      raise RuntimeError, 'on_exit exception'
+    end
+  end
+
+  def test_self_closing_frame
+    assert_raise_kind_of(RuntimeError) { TestApp.run }
+  end
+
+end

data/tests/test_app_init_exception.rb

@@ -0,0 +1,20 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require 'test/unit'
+require 'wx'
+
+class AppInitExitExceptions < Test::Unit::TestCase
+
+  class TestApp < Wx::App
+    def on_init
+      raise RuntimeError, 'on_init exception'
+    end
+  end
+
+  def test_on_init_exception
+    assert_raise_kind_of(RuntimeError) { TestApp.run }
+  end
+
+end

data/tests/test_book_controls.rb

@@ -0,0 +1,29 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxframe_runner'
+
+class BookCtrlTests < WxRuby::Test::GUITests
+
+  def setup
+    super
+    @book = Wx::Choicebook.new(frame_win, name: 'ChoiceBook')
+  end
+
+  def cleanup
+    @book.destroy
+    super
+    GC.start
+  end
+
+  attr_reader :book
+
+  def test_control_sizer
+    btn = Wx::Button.new(book, Wx::ID_ANY, 'First')
+    # issue #199 : returning the control sizer should not cause it to be owned by Ruby
+    #              because that would cause double deletes
+    book.get_control_sizer.add(btn, Wx::SizerFlags.new.expand.border(Wx::ALL))
+  end
+
+end

data/tests/test_exceptions.rb

@@ -0,0 +1,41 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxframe_runner'
+
+class DirectorExceptionTests < WxRuby::Test::GUITests
+
+  class InvalidOutputSizer < Wx::BoxSizer
+
+    def calc_min
+      Wx::Point.new(1,1) # expects Wx::Size
+    end
+
+  end
+
+  def test_invalid_output
+    szr = InvalidOutputSizer.new(Wx::Orientation::VERTICAL)
+    szr.add(Wx::Button.new(frame_win, name: 'button'), Wx::Direction::TOP)
+    frame_win.sizer = szr
+    assert_raise_kind_of(TypeError) { frame_win.layout }
+    frame_win.sizer = nil
+  end
+
+  class ExceptionSizer < Wx::BoxSizer
+
+    def calc_min
+      raise RuntimeError, 'AnyThing'
+    end
+
+  end
+
+  def test_exception_in_overload
+    szr = ExceptionSizer.new(Wx::Orientation::VERTICAL)
+    szr.add(Wx::Button.new(frame_win, name: 'button'), Wx::Direction::TOP)
+    frame_win.sizer = szr
+    assert_raise_kind_of(RuntimeError) { frame_win.layout }
+    frame_win.sizer = nil
+  end
+
+end

data/tests/test_list_ctrl.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxframe_runner'
 
-class ButtonTests < WxRuby::Test::GUITests
+class ListCtrlTests < WxRuby::Test::GUITests
 
   def setup
     super

data/tests/test_media_ctrl.rb

@@ -0,0 +1,38 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxframe_runner'
+
+# test seems to deadlock for WXGTK
+if Wx.has_feature?(:USE_MEDIACTRL)
+
+require 'uri'
+
+class MediaCtrlTests < WxRuby::Test::GUITests
+
+  def setup
+    super
+    @media = Wx::MediaCtrl.new(frame_win)
+  end
+
+  def cleanup
+    @media.destroy
+    super
+  end
+
+  attr_reader :media
+
+  def test_uri
+    # just checking if Ruby URI is properly mapped
+    # it doesn't seem the mediactrl returns a very consistent result whether the resource is not a media file
+    # or if it is a non-existing file so only check whether it is a boolean return.
+    uri = URI("file://#{File.join(__dir__, 'media/beep_lo.wav')}")
+    assert_boolean(media.load(uri))
+    uri = URI("file://#{File.join(__dir__, 'art/test_art/image/wxruby.png')}")
+    assert_boolean(media.load(uri))
+  end
+
+end
+
+end

data/tests/test_menu.rb

@@ -0,0 +1,69 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxframe_runner'
+
+class MenuTests < WxRuby::Test::GUITests
+
+  def setup
+    super
+    @menu = Wx::Menu.new
+    @menu.append(Wx::ID_HIGHEST+1, 'Item 1', 'Test menuitem 1')
+    @menu.append(Wx::ID_HIGHEST+2, 'Item 2', 'Test menuitem 2')
+    @menu.append_separator
+    @menu.append_check_item(Wx::ID_HIGHEST+3, 'Check 3', 'Test menuitem 3')
+    @menu.append_separator
+    @menu.append_radio_item(Wx::ID_HIGHEST+4, 'Radio 4', 'Test menuitem 4')
+    @menu.append_radio_item(Wx::ID_HIGHEST+5, 'Radio 5', 'Test menuitem 5')
+    @menu.append_radio_item(Wx::ID_HIGHEST+6, 'Radio 6', 'Test menuitem 6')
+    frame_win.menu_bar = Wx::MenuBar.new
+    frame_win.menu_bar.append(@menu, "&Test")
+  end
+
+  def cleanup
+    frame_win.menu_bar = nil
+    super
+  end
+
+  attr_reader :menu
+
+  def test_basic
+    assert_equal(8, menu.get_menu_item_count)
+    check, pos = menu.find_child_item(Wx::ID_HIGHEST+3)
+    assert_not_nil(check)
+    assert_equal(3, pos)
+    assert_equal('Check 3', check.item_label)
+    assert_false(check.checked?)
+    check.check
+    assert_true(check.checked?)
+    radio, pos = menu.find_child_item(Wx::ID_HIGHEST+5)
+    assert_not_nil(radio)
+    assert_equal(6, pos)
+    assert_equal('Radio 5', radio.item_label)
+    assert_false(radio.checked?)
+    radio.check
+    assert_true(radio.checked?)
+    radio, pos = menu.find_child_item(Wx::ID_HIGHEST+4)
+    assert_false(radio.checked?)
+    radio, pos = menu.find_child_item(Wx::ID_HIGHEST+6)
+    assert_false(radio.checked?)
+    radio.check
+    assert_true(radio.checked?)
+    radio, pos = menu.find_child_item(Wx::ID_HIGHEST+5)
+    assert_false(radio.checked?)
+  end
+
+  def test_enumerate
+    radio, pos = menu.find_child_item(Wx::ID_HIGHEST+4)
+    assert_true(radio.checked?) # first by default checked
+    menu.each_item do |mi|
+      mi.check if mi.id == (Wx::ID_HIGHEST+5)
+    end
+    radio, pos = menu.find_child_item(Wx::ID_HIGHEST+4)
+    assert_false(radio.checked?)
+    radio = menu.each_item.detect { |mi| mi.id == (Wx::ID_HIGHEST+5) }
+    assert_true(radio.checked?)
+  end
+
+end

data/tests/test_pg.rb

@@ -0,0 +1,27 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxframe_runner'
+
+class PGChoicesTests < WxRuby::Test::GUITests
+
+  def test_enum_labels
+    texts = %w[Red Blue Green Yellow Black White]
+    choices = Wx::PG::PGChoices.new(texts)
+    choices.each_label { |lbl| assert_equal(texts.shift, lbl) }
+  end
+
+  def test_enum_entries
+    texts = %w[Flag1 Flag2 Flag3 Flag4]
+    choices = Wx::PG::PGChoices.new
+    texts.each_with_index do |s, i|
+      choices.add(s, 1 << i)
+    end
+    choices.each_entry.each_with_index do |entry, ix|
+      assert_equal(1 << ix, entry.value)
+      assert_equal(texts[ix], entry.get_text)
+    end
+  end
+
+end

data/tests/test_richtext.rb

@@ -67,6 +67,51 @@ class RichTextCtrlWriteTests < WxRuby::Test::GUITests
     assert_equal('Second Line', richtext.get_line_text(1))
   end
 
+  def test_enumerate_lines
+    richtext.write_text <<~__HEREDOC
+      This is line 1.
+      This is line 2.
+      This is line 3.
+      __HEREDOC
+    assert_equal(4, richtext.get_number_of_lines)
+    richtext.each_line.each_with_index do |txt, lnr|
+      if lnr < 3
+        assert("This is line #{lnr+1}.", txt)
+      else
+        assert('', txt)
+      end
+    end
+    line_enum = richtext.each_line
+    txt = line_enum.detect { |l| l.index('2') }
+    assert_equal('This is line 2.', txt)
+    para = richtext.buffer.get_child_at_position(0)
+    assert_kind_of(Wx::RTC::RichTextParagraph, para)
+    assert_equal(1, para.get_lines.size)
+    para.each_line do |rtl|
+      txt = para.get_text_for_range(rtl.get_range)
+      assert("This is line 1.", txt)
+    end
+  end
+
+  def test_enumerate_children
+    richtext.write_text <<~__HEREDOC
+      This is line 1.
+      This is line 2.
+      This is line 3.
+      __HEREDOC
+    richtext.write_image(Wx.Bitmap(:wxruby, Wx::BitmapType::BITMAP_TYPE_PNG, art_section: 'test_art'))
+    assert_equal(4, richtext.buffer.get_child_count)
+    richtext.buffer.each_child.each_with_index do |c, i|
+      if i<3
+        assert_kind_of(Wx::RTC::RichTextParagraph, c)
+        assert_equal(1, c.get_lines.size)
+      else
+        assert_equal(1, c.get_child_count)
+        c.each_child { |cc| assert_kind_of(Wx::RTC::RichTextImage, cc) }
+      end
+    end
+  end
+
   def test_write_image
     assert_nothing_raised { richtext.write_image(Wx.Bitmap(:wxruby, Wx::BitmapType::BITMAP_TYPE_PNG, art_section: 'test_art')) }
     img_obj = richtext.buffer.get_leaf_object_at_position(0)

data/tests/test_sizer.rb

@@ -0,0 +1,59 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxframe_runner'
+
+class SizerTests < WxRuby::Test::GUITests
+
+  def setup
+    super
+    frame_win.set_sizer(Wx::VBoxSizer.new)
+  end
+
+  def cleanup
+    super
+    GC.start
+  end
+
+  def test_detach
+    frame_win.get_sizer.add(Wx::HBoxSizer.new)
+    frame_win.get_sizer.add_spacer(5)
+    # detaches HBoxSizer transferring ownership to Ruby; should not cause segfaults at GC
+    frame_win.get_sizer.detach(0)
+  end
+
+  def test_sizer_item_detach_and_re_attach
+    frame_win.get_sizer.add(Wx::HBoxSizer.new)
+    frame_win.get_sizer.add_spacer(5)
+    # get and detach
+    szr_itm = frame_win.get_sizer.get_item(0)
+    assert_not_nil(szr_itm)
+    assert_true(szr_itm.is_sizer)
+    szr = szr_itm.get_sizer
+    assert_not_nil(szr)
+    szr_itm.detach_sizer
+    assert_nil(szr_itm.get_sizer)
+    # remove sizer item
+    assert_true(frame_win.get_sizer.remove(0))
+    # re-attach detached sizer (should not cause segfaults at close due to incorrect ownership transfers)
+    assert_not_nil(frame_win.get_sizer.prepend(szr))
+  end
+
+  def test_children
+    frame_win.get_sizer.add(Wx::HBoxSizer.new)
+    frame_win.get_sizer.add_spacer(5)
+    frame_win.get_sizer.add(Wx::VBoxSizer.new)
+
+    assert_equal(3, frame_win.sizer.item_count)
+    children = frame_win.sizer.get_children
+    assert_equal(3, children.size)
+    assert_true(children[0].sizer?)
+    assert_true(children[1].spacer?)
+    assert_true(children[2].sizer?)
+    frame_win.sizer.each_child do |si|
+      assert_equal(children.shift, si)
+    end
+  end
+
+end

data/tests/test_std_controls.rb

@@ -111,6 +111,34 @@ class TextCtrlTests < WxRuby::Test::GUITests
     assert_equal('', text.get_value)
   end
 
+  def test_stream_append
+    text << 'This is the number ' << 101 << '.'
+    assert_equal('This is the number 101.', text.get_value)
+  end
+
+  def test_enumerate_lines
+    text.destroy
+    @text = Wx::TextCtrl.new(frame_win, style: Wx::TE_MULTILINE, name: 'Text')
+    text << <<~__HEREDOC
+      This is line 1.
+      This is line 2.
+      This is line 3.
+      __HEREDOC
+    assert_equal(4, text.get_number_of_lines)
+    text.each_line.each_with_index do |txt, lnr|
+      if lnr < 3
+        assert("This is line #{lnr+1}.", txt)
+      else
+        assert('', txt)
+      end
+    end
+    txt = text.each_line { |l| break l if l.index('2')}
+    assert_equal('This is line 2.', txt)
+    line_enum = text.each_line
+    txt = line_enum.detect { |l| l.index('3') }
+    assert_equal('This is line 3.', txt)
+  end
+
   if has_ui_simulator?
   def test_max_length
     sim = get_ui_simulator
@@ -165,7 +193,7 @@ class ComboBoxTests < WxRuby::Test::GUITests
   def setup
     super
     @combo = Wx::ComboBox.new(frame_win, name: 'ComboBox', choices: %w[One Two Three])
-    @combo.clear
+    @combo.value = '' # don't use #clear as that also clears the choices
   end
 
   def cleanup
@@ -180,6 +208,19 @@ class ComboBoxTests < WxRuby::Test::GUITests
     assert_equal('', combo.get_value)
   end
 
+  def test_enumerate
+    strings = combo.get_strings
+    combo.each_string.each_with_index do |str, ix|
+      assert_equal(strings[ix], str)
+    end
+    combo.each_string { |s| assert_equal(strings.shift, s)}
+    str_enum = combo.each_string
+    assert_kind_of(::Enumerator, str_enum)
+    assert_true(str_enum.any? { |s| s == 'Three'})
+    assert_true(combo.each_string.none? { |s| s == 'Four'})
+    assert_equal('BREAK', combo.each_string { |_| break 'BREAK' })
+  end
+
 end
 
 class CheckBoxTests < WxRuby::Test::GUITests
@@ -439,3 +480,39 @@ class GaugeTests < WxRuby::Test::GUITests
     assert_equal(100, gauge.value)
   end
 end
+
+class StaticBoxTests < WxRuby::Test::GUITests
+
+  def setup
+    super
+    @box = nil
+  end
+
+  def cleanup
+    @box.destroy if @box
+    super
+  end
+
+  attr_reader :box
+
+  def test_basic
+    @box = Wx::StaticBox.new(frame_win, label: 'Box')
+
+    txt = Wx::StaticText.new(box, Wx::ID_ANY, "This window is a child of the staticbox")
+    assert_equal(box, txt.parent)
+  end
+
+  unless Wx::PLATFORM == 'WXOSX'
+
+  def test_label_window
+    check = Wx::CheckBox.new(frame_win, Wx::ID_ANY, 'Enable')
+    @box = Wx::StaticBox.new(frame_win, label: check)
+
+    button = Wx::Button.new(box, label: 'Button')
+    box.enable(false)
+    assert_false(button.is_enabled)
+  end
+
+  end
+
+end

data/tests/test_styled_text_ctrl.rb

@@ -0,0 +1,46 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxframe_runner'
+
+class StyledTextCtrlTests < WxRuby::Test::GUITests
+
+  def setup
+    super
+    @text = Wx::STC::StyledTextCtrl.new(frame_win, name: 'StyledText')
+  end
+
+  def cleanup
+    @text.destroy
+    super
+  end
+
+  attr_reader :text
+
+  def test_text
+    assert_equal('', text.get_value)
+  end
+
+  def test_enumerate_lines
+    text.write_text <<~__HEREDOC
+      This is line 1.
+      This is line 2.
+      This is line 3.
+      __HEREDOC
+    assert_equal(4, text.get_number_of_lines)
+    text.each_line.each_with_index do |txt, lnr|
+      if lnr < 3
+        assert("This is line #{lnr+1}.", txt)
+      else
+        assert('', txt)
+      end
+    end
+    txt = text.each_line { |l| break l if l.index('2')}
+    assert_equal('This is line 2.', txt)
+    line_enum = text.each_line
+    txt = line_enum.detect { |l| l.index('3') }
+    assert_equal('This is line 3.', txt)
+  end
+
+end