wxruby3 0.9.4-x64-mingw-ucrt → 0.9.7-x64-mingw-ucrt

data/tests/test_combo_ctrl.rb

@@ -0,0 +1,196 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxframe_runner'
+require_relative './lib/text_entry_tests'
+
+class ComboCtrlCtrlTests < WxRuby::Test::GUITests
+
+  include TextEntryTests
+
+  class LVComboPopup < Wx::ListView
+
+    include Wx::ComboPopup
+
+    def initialize
+      # call default control ctor; need to call Wx::ListView#create later
+      super
+    end
+
+    def init
+      @value = -1
+    end
+
+    def create(parent)
+      # need to finish creating the list view here
+      # as calling super here would just call Wx::ComboPopup#create and not Wx::ListView#create
+      # we need to use Ruby magic
+      wx_lv_create = (Wx::ListView.instance_method :create).bind(self)
+      wx_lv_create.call(parent, 1, [0,0], Wx::DEFAULT_SIZE)
+      evt_motion :on_mouse_move
+      evt_left_up :on_mouse_click
+    end
+    
+    # Return pointer to the created control
+    def get_control
+      self
+    end
+
+    def lv_find_item(*args)
+      unless @wx_lv_find_item
+        @wx_lv_find_item = (Wx::ListView.instance_method :find_item).bind(self)
+      end
+      @wx_lv_find_item.call(*args)
+    end
+    protected :lv_find_item
+
+    # Translate string into a list selection
+    def set_string_value(s)
+      n = lv_find_item(-1, s)
+      if n >= 0 && n < get_item_count
+        select(n)
+        @value = n
+      end
+    end
+ 
+    # Get list selection as a string
+    def get_string_value
+      return get_item_text(@value) if @value >= 0
+      ''
+    end
+ 
+    # Do mouse hot-tracking (which is typical in list popups)
+    def on_mouse_move(event)
+      # Move selection to cursor ...
+    end
+ 
+    # On mouse left up, set the value and close the popup
+    def on_mouse_click(_event)
+      @value = get_first_selected
+ 
+      # Send event as well ...
+ 
+      dismiss
+    end
+
+  end
+
+  def setup
+    super
+    @combo = Wx::ComboCtrl.new(frame_win, name: 'ComboCtrl')
+    @combo.set_popup_control(LVComboPopup.new)
+  end
+
+  def cleanup
+    @combo.destroy
+    super
+  end
+
+  attr_reader :combo
+  alias :text_entry :combo
+
+  def fill_list(list)
+    list.insert_item(0, 'This is the first item')
+    list.insert_item(1, 'This is the second item')
+    list.insert_item(2, 'This is the third item')
+    list.insert_item(3, 'This is the fourth item')
+  end
+
+  def test_popup
+    assert_equal('', combo.get_value)
+
+    assert_kind_of(Wx::ComboPopup, combo.get_popup_control)
+    assert_kind_of(Wx::ListView, combo.get_popup_control)
+    assert_kind_of(Wx::ListView, combo.get_popup_control.get_control)
+
+    assert_nothing_raised { fill_list(combo.get_popup_control) }
+    combo.popup
+
+    combo.set_value_by_user('This is the second item')
+
+    assert_equal('This is the second item', combo.get_popup_control.get_string_value)
+
+    combo.dismiss
+  end
+
+end
+
+class OwnerDrawnCBTests < WxRuby::Test::GUITests
+
+  include TextEntryTests
+
+  class TestODComboBox < Wx::OwnerDrawnComboBox
+
+    def on_draw_item(dc, rect, item, _flags)
+      return if item == Wx::NOT_FOUND
+
+      dc.set_text_foreground(Wx::BLACK)
+      dc.draw_text(get_string(item),
+                   rect.x + 3,
+                   rect.y + ((rect.height - dc.char_height)/2))
+    end
+
+    def on_draw_background(dc, rect, item,  flags)
+      # If item is selected or even, or we are painting the
+      # combo control itself, use the default rendering.
+      if flags.anybits?(Wx::ODCB_PAINTING_CONTROL|Wx::ODCB_PAINTING_SELECTED) || (item & 1) == 0
+        super(dc,rect,item,flags)
+        return
+      end
+
+      # Otherwise, draw every other background with different colour.
+      bgCol = Wx::Colour.new(240,240,250)
+      dc.set_brush(Wx::Brush.new(bgCol))
+      dc.set_pen(Wx::Pen.new(bgCol))
+      dc.draw_rectangle(rect)
+    end
+
+    def on_measure_item(_item)
+      48
+    end
+
+    def on_measure_item_width(_item)
+      -1 # default - will be measured from text width
+    end
+
+  end
+
+  def setup
+    super
+    @combo = TestODComboBox.new(frame_win, name: 'ODComboBox')
+  end
+
+  def cleanup
+    @combo.destroy
+    super
+  end
+
+  attr_reader :combo
+  alias :text_entry :combo
+
+  def fill_list(list)
+    list.append('This is the first item')
+    list.append('This is the second item')
+    list.append('This is the third item')
+    list.append('This is the fourth item')
+  end
+
+  def test_popup
+    assert_equal('', combo.get_value)
+
+    assert_kind_of(Wx::ComboPopup, combo.get_popup_control)
+    assert_kind_of(Wx::ComboPopupWx, combo.get_popup_control)
+    assert_kind_of(Wx::VListBox, combo.get_popup_control.get_control)
+
+    assert_nothing_raised { fill_list(combo) }
+    combo.popup
+
+    combo.set_value_by_user('This is the third item')
+
+    assert_equal('This is the third item', combo.get_popup_control.get_string_value)
+
+    combo.dismiss
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.7
 platform: x64-mingw-ucrt
 authors:
 - Martin Corino
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-07 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -126,6 +126,7 @@ files:
 - lib/wx/core/clipboard.rb
 - lib/wx/core/collapsible_pane.rb
 - lib/wx/core/colour.rb
+- lib/wx/core/combo_ctrl.rb
 - lib/wx/core/combobox.rb
 - lib/wx/core/config.rb
 - lib/wx/core/const.rb
@@ -727,6 +728,7 @@ files:
 - lib/wx/version.rb
 - lib/wx/wxruby/base.rb
 - lib/wx/wxruby/cmd/sampler.rb
+- lib/wx/wxruby/cmd/setup.rb
 - lib/wx/wxruby/cmd/test.rb
 - lib/wxruby_aui.so
 - lib/wxruby_core.so
@@ -744,6 +746,12 @@ files:
 - rakelib/lib/config/macosx.rb
 - rakelib/lib/config/mingw.rb
 - rakelib/lib/config/netbsd.rb
+- rakelib/lib/config/pkgman/arch.rb
+- rakelib/lib/config/pkgman/base.rb
+- rakelib/lib/config/pkgman/debian.rb
+- rakelib/lib/config/pkgman/macosx.rb
+- rakelib/lib/config/pkgman/rhel.rb
+- rakelib/lib/config/pkgman/suse.rb
 - rakelib/lib/config/unixish.rb
 - rakelib/lib/ext/enum_chain.rb
 - rakelib/prepost.rake
@@ -1053,6 +1061,7 @@ files:
 - tests/test_book_controls.rb
 - tests/test_box_sizer.rb
 - tests/test_clipboard.rb
+- tests/test_combo_ctrl.rb
 - tests/test_config.rb
 - tests/test_dc.rb
 - tests/test_dialog.rb
@@ -1093,7 +1102,19 @@ metadata:
   source_code_uri: https://github.com/mcorino/wxRuby3
   documentation_uri: https://mcorino.github.io/wxRuby3
   homepage_uri: https://github.com/mcorino/wxRuby3
-post_install_message:
+post_install_message: |2
+
+  wxRuby3 has been successfully installed including the 'wxruby' utility.
+
+  You can run the regression tests to verify the installation by executing:
+
+  $ ./wxruby test
+
+  The wxRuby3 sample selector can be run by executing:
+
+  $ ./wxruby sampler
+
+  Have fun using wxRuby3.
 rdoc_options:
 - "--exclude=\\.dll"
 - "--exclude=\\.so"
@@ -1114,7 +1135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: wxWidgets extension for Ruby