RubyGems - wxruby3 - Versions diffs - 1.7.0 → 1.8.0 - Mend

wxruby3 1.7.0 → 1.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (220) hide show

checksums.yaml +4 -4
data/INSTALL.md +27 -2
data/README.md +15 -15
data/ext/wxruby3/include/wxRubyApp.h +145 -46
data/ext/wxruby3/include/wxruby-ComboPopup.h +25 -8
data/ext/wxruby3/include/wxruby-GCTracking.h +262 -0
data/ext/wxruby3/include/wxruby-MBConv.h +190 -0
data/ext/wxruby3/include/wxruby-SharedEventHandler.h +183 -0
data/ext/wxruby3/include/wxruby-SharedPtr.h +104 -0
data/ext/wxruby3/include/wxruby-runtime.h +29 -0
data/ext/wxruby3/swig/custom/rubytracking.swg +8 -22
data/ext/wxruby3/swig/custom/wx_ruby_shared_ptr.i +434 -0
data/ext/wxruby3/swig/custom/wx_shared_ptr.i +431 -0
data/ext/wxruby3/swig/mark_free_impl.i +7 -132
data/ext/wxruby3/swig/memory_management.i +8 -44
data/ext/wxruby3/swig/wx.i +46 -73
data/lib/wx/core/const.rb +0 -1
data/lib/wx/core/context_help.rb +17 -0
data/lib/wx/core/cursor.rb +1 -0
data/lib/wx/core/helpcontrollerhelpprovider.rb +10 -2
data/lib/wx/core/mbconv.rb +11 -0
data/lib/wx/core/media_ctrl.rb +31 -0
data/lib/wx/core/top_level_window.rb +7 -0
data/lib/wx/core.rb +6 -0
data/lib/wx/doc/art_provider.rb +17 -0
data/lib/wx/doc/context_help.rb +42 -0
data/lib/wx/doc/core.rb +0 -5
data/lib/wx/doc/functions.rb +10 -0
data/lib/wx/doc/gen/affine_matrix2d.rb +2 -0
data/lib/wx/doc/gen/art_provider.rb +12 -0
data/lib/wx/doc/gen/aui/aui_notebook_event.rb +15 -15
data/lib/wx/doc/gen/aui/aui_pane_info.rb +8 -8
data/lib/wx/doc/gen/aui/aui_tool_bar_event.rb +5 -5
data/lib/wx/doc/gen/book_ctrl_base.rb +2 -1
data/lib/wx/doc/gen/calendar_event.rb +5 -5
data/lib/wx/doc/gen/choicebook.rb +2 -2
data/lib/wx/doc/gen/collapsible_pane.rb +1 -1
data/lib/wx/doc/gen/colour_dialog.rb +1 -1
data/lib/wx/doc/gen/colour_picker_event.rb +3 -3
data/lib/wx/doc/gen/context_help_button.rb +0 -53
data/lib/wx/doc/gen/core.rb +4 -4
data/lib/wx/doc/gen/credential_entry_dialog.rb +2 -2
data/lib/wx/doc/gen/date_event.rb +2 -2
data/lib/wx/doc/gen/dial_up_event.rb +2 -2
data/lib/wx/doc/gen/dir_filter_list_ctrl.rb +2 -2
data/lib/wx/doc/gen/event.rb +58 -58
data/lib/wx/doc/gen/ext_help_controller.rb +62 -16
data/lib/wx/doc/gen/file_ctrl.rb +4 -4
data/lib/wx/doc/gen/file_dir_picker_event.rb +2 -2
data/lib/wx/doc/gen/file_system.rb +1 -1
data/lib/wx/doc/gen/find_dialog_event.rb +5 -5
data/lib/wx/doc/gen/font_picker_event.rb +1 -1
data/lib/wx/doc/gen/grid/grid_ctrl.rb +67 -32
data/lib/wx/doc/gen/header_ctrl_event.rb +13 -13
data/lib/wx/doc/gen/help_controller.rb +45 -2
data/lib/wx/doc/gen/html/html_help_controller.rb +74 -32
data/lib/wx/doc/gen/html/html_help_window.rb +3 -3
data/lib/wx/doc/gen/html/html_window.rb +4 -4
data/lib/wx/doc/gen/hyperlink_ctrl.rb +1 -1
data/lib/wx/doc/gen/list_ctrl.rb +22 -22
data/lib/wx/doc/gen/listbook.rb +2 -2
data/lib/wx/doc/gen/mb_conv.rb +10 -0
data/lib/wx/doc/gen/media_event.rb +6 -6
data/lib/wx/doc/gen/notebook.rb +2 -2
data/lib/wx/doc/gen/pg/pg_validation_info.rb +14 -14
data/lib/wx/doc/gen/pg/property_grid_interface.rb +2 -2
data/lib/wx/doc/gen/rbn/ribbon_art_provider.rb +19 -9
data/lib/wx/doc/gen/rbn/ribbon_button_bar.rb +2 -2
data/lib/wx/doc/gen/rbn/ribbon_gallery.rb +3 -3
data/lib/wx/doc/gen/rbn/ribbon_panel.rb +2 -2
data/lib/wx/doc/gen/rbn/ribbon_tool_bar.rb +2 -2
data/lib/wx/doc/gen/rt/event_list.rb +17 -0
data/lib/wx/doc/gen/rt/shared_evt_handler.rb +14 -0
data/lib/wx/doc/gen/rt/thread_event.rb +71 -0
data/lib/wx/doc/gen/rtc/rich_text_ctrl.rb +19 -19
data/lib/wx/doc/gen/sash_event.rb +2 -2
data/lib/wx/doc/gen/sash_layout_window.rb +2 -2
data/lib/wx/doc/gen/search_ctrl.rb +2 -2
data/lib/wx/doc/gen/spin_ctrl.rb +2 -2
data/lib/wx/doc/gen/splitter_window.rb +6 -6
data/lib/wx/doc/gen/stc/styled_text_event.rb +34 -34
data/lib/wx/doc/gen/task_bar_icon_event.rb +10 -10
data/lib/wx/doc/gen/text_ctrl.rb +4 -4
data/lib/wx/doc/gen/toggle_button.rb +1 -1
data/lib/wx/doc/gen/toolbook.rb +2 -2
data/lib/wx/doc/gen/top_level_window.rb +19 -0
data/lib/wx/doc/gen/tree_ctrl.rb +21 -21
data/lib/wx/doc/gen/treebook.rb +4 -4
data/lib/wx/doc/gen/utils.rb +2 -2
data/lib/wx/doc/gen/web/event_list.rb +95 -0
data/lib/wx/doc/gen/web/web_view.rb +1136 -0
data/lib/wx/doc/gen/web/web_view_event.rb +210 -0
data/lib/wx/doc/gen/web/web_view_handler.rb +318 -0
data/lib/wx/doc/gen/window.rb +1 -1
data/lib/wx/doc/gen/wizard_event.rb +7 -7
data/lib/wx/doc/html/html_help_controller.rb +23 -1
data/lib/wx/doc/mbconv.rb +108 -0
data/lib/wx/doc/rt/shared_event_handler.rb +49 -0
data/lib/wx/doc/rt/thread_event.rb +28 -0
data/lib/wx/doc/webview.rb +40 -0
data/lib/wx/helpers.rb +1 -1
data/lib/wx/html/htmlhelpcontroller.rb +10 -0
data/lib/wx/keyword_defs.rb +11 -0
data/lib/wx/rt/events/evt_list.rb +8 -0
data/lib/wx/rt/require.rb +8 -0
data/lib/wx/rt/thread_event.rb +14 -0
data/lib/wx/rt.rb +16 -0
data/lib/wx/version.rb +1 -1
data/lib/wx/web/events/evt_list.rb +74 -0
data/lib/wx/web/require.rb +8 -0
data/lib/wx/web/webview.rb +106 -0
data/lib/wx/web.rb +17 -0
data/lib/wx/wxruby/cmd/setup.rb +15 -0
data/lib/wx.rb +2 -0
data/rakelib/configure.rb +24 -0
data/rakelib/gem.rb +3 -2
data/rakelib/install.rb +54 -27
data/rakelib/lib/config/macosx.rb +7 -5
data/rakelib/lib/config/mingw.rb +66 -5
data/rakelib/lib/config/pkgman/mingw.rb +1 -1
data/rakelib/lib/config/unixish.rb +4 -2
data/rakelib/lib/config.rb +37 -3
data/rakelib/lib/core/include/client_data.inc +38 -17
data/rakelib/lib/core/include/funcall.inc +1 -1
data/rakelib/lib/core/include/swigdirector.inc +3 -3
data/rakelib/lib/core/include/swigrubyrun.inc +14 -26
data/rakelib/lib/core/package.rb +0 -2
data/rakelib/lib/director/app.rb +1 -8
data/rakelib/lib/director/art_provider.rb +7 -3
data/rakelib/lib/director/comboctrl.rb +0 -7
data/rakelib/lib/director/context_help_button.rb +35 -2
data/rakelib/lib/director/event_handler.rb +32 -28
data/rakelib/lib/director/fs_file.rb +15 -10
data/rakelib/lib/director/functions.rb +8 -0
data/rakelib/lib/director/grid_cell_attr.rb +1 -3
data/rakelib/lib/director/grid_cell_editor.rb +14 -12
data/rakelib/lib/director/grid_cell_renderer.rb +11 -8
data/rakelib/lib/director/grid_ctrl.rb +140 -121
data/rakelib/lib/director/help_controller.rb +70 -2
data/rakelib/lib/director/mb_conv.rb +30 -0
data/rakelib/lib/director/menu.rb +92 -42
data/rakelib/lib/director/menu_bar.rb +84 -45
data/rakelib/lib/director/menu_item.rb +2 -2
data/rakelib/lib/director/persistence_manager.rb +3 -2
data/rakelib/lib/director/preview_frame.rb +2 -2
data/rakelib/lib/director/richtext_buffer.rb +5 -2
data/rakelib/lib/director/shared_evt_handler.rb +30 -0
data/rakelib/lib/director/sizer.rb +8 -17
data/rakelib/lib/director/sizer_item.rb +3 -4
data/rakelib/lib/director/task_bar_icon.rb +7 -7
data/rakelib/lib/director/thread_event.rb +33 -0
data/rakelib/lib/director/validator.rb +3 -1
data/rakelib/lib/director/variant.rb +16 -12
data/rakelib/lib/director/webview.rb +166 -0
data/rakelib/lib/director/webview_event.rb +37 -0
data/rakelib/lib/director/webview_handler.rb +63 -0
data/rakelib/lib/generate/doc/thread_event.yaml +20 -0
data/rakelib/lib/generate/doc/web_view.yaml +135 -0
data/rakelib/lib/generate/doc/web_view_event.yaml +38 -0
data/rakelib/lib/generate/doc/web_view_handler.yaml +58 -0
data/rakelib/lib/specs/interfaces.rb +12 -0
data/rakelib/lib/typemap/common.rb +34 -1
data/rakelib/lib/typemap/mb_conv.rb +58 -0
data/rakelib/prepost.rake +23 -31
data/rakelib/prepost.rb +20 -0
data/samples/event/threaded.rb +295 -42
data/samples/event/tn_threaded.png +0 -0
data/samples/help/doc/back.gif +0 -0
data/samples/help/doc/contents.gif +0 -0
data/samples/help/doc/cshelp.txt +9 -0
data/samples/help/doc/doc.chm +0 -0
data/samples/help/doc/doc.cnt +8 -0
data/samples/help/doc/doc.h +7 -0
data/samples/help/doc/doc.hhc +40 -0
data/samples/help/doc/doc.hhk +31 -0
data/samples/help/doc/doc.hhp +33 -0
data/samples/help/doc/doc.hpj +21 -0
data/samples/help/doc/doc.htm +27 -0
data/samples/help/doc/doc1.htm +24 -0
data/samples/help/doc/doc2.htm +12 -0
data/samples/help/doc/doc3.htm +12 -0
data/samples/help/doc/doc4.htm +12 -0
data/samples/help/doc/doc5.htm +14 -0
data/samples/help/doc/forward.gif +0 -0
data/samples/help/doc/up.gif +0 -0
data/samples/help/doc.chm +0 -0
data/samples/help/doc.chw +0 -0
data/samples/help/doc.zip +0 -0
data/samples/help/help.rb +352 -0
data/samples/help/tn_help.png +0 -0
data/samples/webview/handler_advanced.html +55 -0
data/samples/webview/tn_webview.png +0 -0
data/samples/webview/webview.rb +1264 -0
data/tests/assets/handler_advanced.html +55 -0
data/tests/assets/test.css +1 -0
data/tests/assets/test.html +9 -0
data/tests/assets/test.zip +0 -0
data/tests/lib/text_entry_tests.rb +2 -2
data/tests/lib/wxapp_runner.rb +40 -0
data/tests/lib/wxframe_runner.rb +17 -2
data/tests/test_art.rb +8 -8
data/tests/test_clipboard.rb +4 -4
data/tests/test_config.rb +6 -6
data/tests/test_exceptions.rb +8 -6
data/tests/test_ext_controls.rb +3 -3
data/tests/test_file_dialog.rb +5 -5
data/tests/test_font.rb +7 -7
data/tests/test_grid_ctrl.rb +133 -0
data/tests/test_help.rb +88 -0
data/tests/test_intl.rb +1 -1
data/tests/test_media_ctrl.rb +14 -6
data/tests/test_menu.rb +94 -86
data/tests/test_persistence.rb +1 -1
data/tests/test_proof_check.rb +5 -5
data/tests/test_propgrid.rb +1 -1
data/tests/test_shared_event_handler.rb +141 -0
data/tests/test_std_controls.rb +5 -5
data/tests/test_webview.rb +492 -0
data/tests/test_window.rb +3 -3
metadata +78 -2

data/tests/assets/handler_advanced.html ADDED Viewed

@@ -0,0 +1,55 @@
+<head>
+    <title>Advanced Handler Sample</title>
+    <style>
+        .mono {
+            font-family: monospace;
+        }
+    </style>
+    <script>
+        function sendRequest() {
+            let url = document.getElementById("request_url").value;
+            let request_content_type = document.getElementById("request_content_type").value;
+            let request_data = document.getElementById("request_data").value;
+            console.log("clicked");
+            const req = new XMLHttpRequest();
+            req.addEventListener("load", (ev) => {
+                document.getElementById("response_response").value = req.responseText;
+            });
+            req.open("POST", url);
+            req.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+            req.send(request_data);
+        }
+    </script>
+</head>
+<body>
+    <p>
+        This sample demonstrates how to use <i>Wx::WebViewHandler::start_request()</i>
+        to enable advanced requests from html and javascript in the web view.
+    </p>
+    Request URL<br />
+    <input id="request_url" size="40" value=""><br />
+    Request content type<br />
+    <input id="request_content_type" size="40" value="application/json"><br />
+    Request Data<br />
+    <textarea class="mono" cols="60" rows="8" id="request_data">{ param1: "wxwidgets", param2: "webview" }</textarea>
+    <br />
+    <button onclick="sendRequest()">Start request</button><br />
+    Response Data<br />
+    <textarea class="mono" cols="60" rows="8" id="response_response"></textarea>
+    <script>
+        // init request_url
+        let postURL;
+        if (navigator.userAgent.indexOf("Edg") > 0)
+            postURL = "https://wxpost.wxsite//main/test/1";
+        else
+            postURL = "wxpost://main/test/1";
+        document.getElementById("request_url").value = postURL;
+    </script>
+</body>

data/tests/assets/test.css ADDED Viewed

	@@ -0,0 +1 @@
1	+ h1 {color: red;}

data/tests/assets/test.html ADDED Viewed

@@ -0,0 +1,9 @@
+<html>
+<head>
+<title>File System Example</title>
+<link rel='stylesheet' type='text/css' href='test.css'>
+</head>
+<body><h1>ZIP Embedded Page</h1>
+<p>This page was retrieved from a ZIP file.</p>
+</body>
+</html>

data/tests/assets/test.zip ADDED Viewed

Binary file

data/tests/lib/text_entry_tests.rb CHANGED Viewed

@@ -25,7 +25,7 @@ module TextEntryTests
     updates = count_events(text_entry, :evt_text) do |c_upd|
       # WXQT only sends event when text changes
-      unless Wx::PLATFORM == 'WXQT'
+      unless is_qt?
         text_entry.value = ''
         assert_equal(1, c_upd.count)
         c_upd.count = 0
@@ -36,7 +36,7 @@ module TextEntryTests
       c_upd.count = 0
       # WXQT only sends event when text changes
-      unless Wx::PLATFORM == 'WXQT'
+      unless is_qt?
         text_entry.value = 'foo'
         assert_equal(1, c_upd.count)
         c_upd.count = 0

data/tests/lib/wxapp_runner.rb CHANGED Viewed

@@ -32,6 +32,38 @@ module WxRuby
     class Unit < Minitest::Test
+      def self.is_macos?
+        Wx::PLATFORM == 'WXOSX'
+      end
+      def is_macos?
+        Unit.is_macos?
+      end
+      def self.is_msw?
+        Wx::PLATFORM == 'WXMSW'
+      end
+      def is_msw?
+        Unit.is_msw?
+      end
+      def self.is_gtk?
+        Wx::PLATFORM == 'WXGTK'
+      end
+      def is_gtk?
+        Unit.is_gtk?
+      end
+      def self.is_qt?
+        Wx::PLATFORM == 'WXQT'
+      end
+      def is_qt?
+        Unit.is_qt?
+      end
       def self.is_ci_build?
         (ENV['GITHUB_ACTION'] || ENV['CI'])
       end
@@ -40,6 +72,14 @@ module WxRuby
         Unit.is_ci_build?
       end
+      def self.is_cirrus_ci_build?
+        (ENV['CIRRUS_CI'] || ENV['CI'])
+      end
+      def is_cirrus_ci_build?
+        Unit.is_cirrus_ci_build?
+      end
       def self.uses_wayland?
         Wx.has_feature?('HAVE_WAYLAND_CLIENT')
       end

data/tests/lib/wxframe_runner.rb CHANGED Viewed

@@ -75,11 +75,11 @@ module WxRuby
     class GUITests < Test::Unit
       def after_setup
-        10.times { Wx.get_app.yield }
+        yield_for_a_while(100)
       end
       def after_teardown
-        10.times { Wx.get_app.yield }
+        yield_for_a_while(100)
         GC.start
       end
@@ -177,6 +177,7 @@ module WxRuby
         start = ::Time.now
         while (Time.now - start) < timeout
           Wx.get_app.yield
+          sleep(0.01) if is_msw? # it seems on windows things may suffer from tight loops so give some breathing room
         end
       end
@@ -184,6 +185,20 @@ module WxRuby
         GUITests.yield_for_a_while(msec)
       end
+      def self.yield_and_wait_for_test(msec, &block)
+        timeout = msec / 1000.0 # sec float
+        start = ::Time.now
+        while (Time.now - start) < timeout
+          Wx.get_app.yield
+          return if block.call
+          sleep(0.01) if is_msw? # it seems on windows things may suffer from tight loops so give some breathing room
+        end
+      end
+      def yield_and_wait_for_test(msec, &block)
+        GUITests.yield_and_wait_for_test(msec, &block)
+      end
       def self.has_ui_simulator?
         Wx.has_feature?(:USE_UIACTIONSIMULATOR) && (Wx::PLATFORM != 'WXGTK' || !uses_wayland?) && (Wx::PLATFORM != 'WXOSX' || Wx::WXWIDGETS_VERSION >= '3.3')
       end

data/tests/test_art.rb CHANGED Viewed

@@ -59,16 +59,16 @@ class TestArt < WxRuby::Test::Unit
     assert_instance_of(Wx::Bitmap, bundle.get_bitmap([256,256]))
   end
-  if Wx::PLATFORM == 'WXMSW'
+  if is_msw?
-  def test_cursors
-    cursor = nil
-    assert_nothing_raised do
-      cursor = Wx.Cursor(:wxruby)
+    def test_cursors
+      cursor = nil
+      assert_nothing_raised do
+        cursor = Wx.Cursor(:wxruby)
+      end
+      assert_instance_of(Wx::Cursor, cursor)
+      assert(cursor.ok?)
     end
-    assert_instance_of(Wx::Cursor, cursor)
-    assert(cursor.ok?)
-  end
   end

data/tests/test_clipboard.rb CHANGED Viewed

@@ -142,7 +142,7 @@ class TestDataObjectComposite < WxRuby::Test::Unit
     bmp = Wx::Bitmap.new(File.join(__dir__, '../samples/minimal/mondrian.png'))
     d_obj.add( Wx::BitmapDataObject.new )
-    if Wx::PLATFORM == 'WXMSW'
+    if is_msw?
       assert_equal( 1, d_txt.get_format_count(Wx::DataObject::Direction::Get) )
       assert_equal( 2, d_obj.get_format_count(Wx::DataObject::Direction::Get) )
     else
@@ -170,7 +170,7 @@ class TestDataObjectComposite < WxRuby::Test::Unit
     GC.start
-    if Wx::PLATFORM == 'WXMSW'
+    if is_msw?
       assert_equal d_obj.received_format.get_type, Wx::DF_DIB.get_type
       d_bmp = d_obj.get_object(Wx::DF_DIB)
     else
@@ -206,7 +206,7 @@ class TestDataObjectComposite < WxRuby::Test::Unit
     GC.start
     assert_equal d_obj_2.received_format.get_type, d_txt.get_preferred_format(Wx::DataObject::Direction::Set).get_type
-    if Wx::PLATFORM == 'WXMSW'
+    if is_msw?
       d_txt = d_obj_2.get_object(Wx::DF_UNICODETEXT)
     else
       d_txt = d_obj_2.get_object(Wx::DF_TEXT)
@@ -218,7 +218,7 @@ class TestDataObjectComposite < WxRuby::Test::Unit
     d_obj_2 = Wx::DataObjectComposite.new
     d_obj_2.add Wx::TextDataObject.new
     d_obj_2.add MySimpleIntArrayObject.new([1,2,3,4,5])
-    if Wx::PLATFORM == 'WXMSW'
+    if is_msw?
       assert_equal( 2, d_obj_2.get_format_count(Wx::DataObject::Direction::Get) )
     else
       assert_equal( 3, d_obj_2.get_format_count(Wx::DataObject::Direction::Get) )

data/tests/test_config.rb CHANGED Viewed

@@ -204,15 +204,15 @@ class TestConfig < WxRuby::Test::Unit
     # by default expansion is on
     # Cirrus CI Linux builds run in privileged container without proper user env
-    has_user = Wx::PLATFORM == 'WXMSW' || ENV['USER']
+    has_user = is_msw? || ENV['USER']
     # add a number of entries for env var in new group 'Environment'
     cfg['/Environment/HOME'] = '$HOME'
-    cfg['Environment'].USER = Wx::PLATFORM == 'WXMSW' ? '%USERNAME%' : '${USER}' if has_user
+    cfg['Environment'].USER = is_msw? ? '%USERNAME%' : '${USER}' if has_user
     cfg['/Environment/PATH'] = '$(PATH)'
     assert_equal(ENV['HOME'], cfg.Environment['HOME'])
-    assert_equal(ENV[Wx::PLATFORM == 'WXMSW' ?  'USERNAME' : 'USER'], cfg['/Environment/USER']) if has_user
+    assert_equal(ENV[is_msw? ?  'USERNAME' : 'USER'], cfg['/Environment/USER']) if has_user
     assert_equal(ENV['PATH'], cfg.Environment.PATH)
     # test escaping
@@ -228,9 +228,9 @@ class TestConfig < WxRuby::Test::Unit
     assert_equal('${NonExistingLongNonsenseVariable}', cfg.Environment['NONSENSE'])
-    cfg['/Environment/MULTIPLE'] = "$HOME / #{Wx::PLATFORM == 'WXMSW' ? '%USERNAME%' : '${USER}'}" if has_user
+    cfg['/Environment/MULTIPLE'] = "$HOME / #{is_msw? ? '%USERNAME%' : '${USER}'}" if has_user
-    assert_equal("#{ENV['HOME']} / #{Wx::PLATFORM == 'WXMSW' ? ENV['USERNAME'] : ENV['USER']}", cfg.Environment['MULTIPLE']) if has_user
+    assert_equal("#{ENV['HOME']} / #{is_msw? ? ENV['USERNAME'] : ENV['USER']}", cfg.Environment['MULTIPLE']) if has_user
     # disable env var expansion
     cfg.expand_env_vars = false
@@ -272,7 +272,7 @@ class TestConfig < WxRuby::Test::Unit
   end
   # default registry based config does not seem to do well in CI build env
-  unless is_ci_build? && Wx::PLATFORM == 'WXMSW'
+  unless is_ci_build? && is_msw?
   def test_default_wx
     Wx::ConfigBase.set(nil) # reset global instance

data/tests/test_exceptions.rb CHANGED Viewed

@@ -14,27 +14,29 @@ class DirectorExceptionTests < Minitest::Test
     RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]).
     sub(/.*\s.*/m, '"\&"')
+  INC_DIR = File.realpath(File.join(__dir__, '..', 'lib'))
   OPTS = {
     :err => (Plat4m.current.windows? ? 'NULL' : '/dev/null'), :out => (Plat4m.current.windows? ? 'NULL' : '/dev/null'),
   }
   def test_invalid_overload_type
-    assert_false(Kernel.system(RUBY, File.join(__dir__, 'lib/overload_type_exception_test.rb'), **OPTS))
-    assert_equal(254, $?.exitstatus)
+    assert_false(Kernel.system(RUBY, '-I', INC_DIR, File.join(__dir__, 'lib/overload_type_exception_test.rb'), **OPTS))
+    assert_equal(126, $?.exitstatus)
   end
   def test_leaked_exception_in_overload
-    assert_false(Kernel.system(RUBY, File.join(__dir__, 'lib/leaked_overload_exception_test.rb'), **OPTS))
-    assert_equal(255, $?.exitstatus)
+    assert_false(Kernel.system(RUBY, '-I', INC_DIR, File.join(__dir__, 'lib/leaked_overload_exception_test.rb'), **OPTS))
+    assert_equal(127, $?.exitstatus)
   end
   def test_leaked_process_event_handling_exception
-    assert_false(Kernel.system(RUBY, File.join(__dir__, 'lib/leaked_process_event_exception_test.rb'), **OPTS))
+    assert_false(Kernel.system(RUBY, '-I', INC_DIR, File.join(__dir__, 'lib/leaked_process_event_exception_test.rb'), **OPTS))
     assert_equal(1, $?.exitstatus)
   end
   def test_leaked_queued_event_handling_exception
-    assert_false(Kernel.system(RUBY, File.join(__dir__, 'lib/leaked_queued_event_exception_test.rb'), **OPTS))
+    assert_false(Kernel.system(RUBY, '-I', INC_DIR, File.join(__dir__, 'lib/leaked_queued_event_exception_test.rb'), **OPTS))
     assert_equal(1, $?.exitstatus)
   end

data/tests/test_ext_controls.rb CHANGED Viewed

@@ -158,7 +158,7 @@ class CommandLinkButtonTests < WxRuby::Test::GUITests
       end
       # intermittent failures in OSX CI builds
-      unless Wx::PLATFORM == 'WXOSX' && is_ci_build?
+      unless is_macos? && is_ci_build?
         assert_equal(1, count)
       end
     end
@@ -213,7 +213,7 @@ class SpinCtrlTests < WxRuby::Test::GUITests
         sim.key_down(Wx::KeyCode::K_UP)
         sim.key_up(Wx::KeyCode::K_UP)
       end
-      unless Wx::PLATFORM == 'WXOSX' && is_ci_build?
+      unless is_macos? && is_ci_build?
         assert_equal(1, count)
         assert_equal(1, spin.value)
       end
@@ -257,7 +257,7 @@ class SpinCtrlDoubleTests < WxRuby::Test::GUITests
         sim.key_down(Wx::KeyCode::K_UP)
         sim.key_up(Wx::KeyCode::K_UP)
       end
-      unless Wx::PLATFORM == 'WXOSX' && is_ci_build?
+      unless is_macos? && is_ci_build?
         assert_equal(1, count)
         assert_equal(1.0, spin.value)
       end

data/tests/test_file_dialog.rb CHANGED Viewed

@@ -7,7 +7,7 @@ require_relative './lib/wxapp_runner'
 class FileDialogTests < WxRuby::Test::Unit
   def dialog_tester(dlg, rc=Wx::ID_OK)
-    if Wx::PLATFORM == 'WXGTK'
+    if is_gtk?
       timer = Wx::Timer.new(dlg)
       dlg.evt_timer(timer) { dlg.end_modal(rc) }
       timer.start_once(2000)
@@ -28,9 +28,9 @@ class FileDialogTests < WxRuby::Test::Unit
   class FileDialogTestCustomization < Wx::FileDialogCustomizeHook
-    def initialize
-      super
-      @hooked = Wx::PLATFORM != 'WXGTK'
+    def initialize(hooked)
+      super()
+      @hooked = hooked
     end
     attr_reader :hooked
@@ -44,7 +44,7 @@ class FileDialogTests < WxRuby::Test::Unit
   def test_customized_file_dialog
     dlg = Wx::FileDialog.new(nil, 'Select file')
-    hook = FileDialogTestCustomization.new
+    hook = FileDialogTestCustomization.new(!is_gtk?)
     dlg.set_customize_hook(hook)
     GC.start
     assert_equal(Wx::ID_OK, dialog_tester(dlg))

data/tests/test_font.rb CHANGED Viewed

@@ -66,7 +66,7 @@ class FontTests < WxRuby::Test::Unit
     font = Wx::Font.new
     font.set_numeric_weight(123)
-    assert_equal(123, font.get_numeric_weight) unless Wx::PLATFORM == 'WXOSX'
+    assert_equal(123, font.get_numeric_weight) unless is_macos?
     assert_equal(Wx::FontWeight::FONTWEIGHT_THIN,  font.get_weight)
@@ -87,7 +87,7 @@ class FontTests < WxRuby::Test::Unit
       # if the call to set_face_name() below fails on your system/port,
       # consider adding another branch to this if
-      known_good_face_name = if Wx::PLATFORM == 'WXMSW' || Wx::PLATFORM == 'WXOSX'
+      known_good_face_name = if is_msw? || is_macos?
                                "Arial"
                              else
                                "Monospace"
@@ -138,7 +138,7 @@ class FontTests < WxRuby::Test::Unit
       # on wxMSW Wx::FONTSTYLE_SLANT==Wx::FONTSTYLE_ITALIC, so accept the latter
       # as a valid value too.
       if ( test.get_style != Wx::FONTSTYLE_SLANT )
-        assert( Wx::PLATFORM == 'WXMSW' && Wx::FONTSTYLE_ITALIC == test.get_style )
+        assert( is_msw? && Wx::FONTSTYLE_ITALIC == test.get_style )
       end
       # test get/set_underlined()
@@ -184,7 +184,7 @@ class FontTests < WxRuby::Test::Unit
         puts("original font user description: #{test.get_native_font_info_user_desc}") unless is_ci_build?
         puts("the other font description: #{temp.get_native_font_info_user_desc}") unless is_ci_build?
-        assert_equal( temp, test ) unless Wx::PLATFORM == 'WXOSX'
+        assert_equal( temp, test ) unless is_macos?
     end
     # test that clearly invalid font info strings do not work
@@ -202,17 +202,17 @@ class FontTests < WxRuby::Test::Unit
     font.set_underlined(true)
     font.set_strikethrough(true)
     assert(font == Wx::Font.new(font))
-    assert(font == Wx::Font.new(font.get_native_font_info_desc)) unless Wx::PLATFORM == 'WXOSX'
+    assert(font == Wx::Font.new(font.get_native_font_info_desc)) unless is_macos?
     assert(Wx::Font.new(font.get_native_font_info_desc).get_underlined)
     assert(Wx::Font.new(font.get_native_font_info_desc).get_strikethrough)
     font.set_underlined(false)
     assert(font == Wx::Font.new(font))
-    assert(font == Wx::Font.new(font.get_native_font_info_desc)) unless Wx::PLATFORM == 'WXOSX'
+    assert(font == Wx::Font.new(font.get_native_font_info_desc)) unless is_macos?
     assert(!Wx::Font.new(font.get_native_font_info_desc).get_underlined)
     font.set_underlined(true)
     font.set_strikethrough(false)
     assert(font == Wx::Font.new(font))
-    assert(font == Wx::Font.new(font.get_native_font_info_desc)) unless Wx::PLATFORM == 'WXOSX'
+    assert(font == Wx::Font.new(font.get_native_font_info_desc)) unless is_macos?
     assert(Wx::Font.new(font.get_native_font_info_desc).get_underlined)
     assert(!Wx::Font.new(font.get_native_font_info_desc).get_strikethrough)
   end

data/tests/test_grid_ctrl.rb ADDED Viewed

@@ -0,0 +1,133 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+require_relative './lib/wxframe_runner'
+class GridCtrlTests < WxRuby::Test::GUITests
+  class MyTextCellEditor < Wx::GRID::GridCellTextEditor
+    def apply_edit(row, col, grid)
+      grid.set_cell_value(row, col, "'#{get_value}'" )
+    end
+  end
+  def setup
+    super
+    sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+    make_grid(frame_win)
+    sizer.add(@grid, 1, Wx::ALL|Wx::GROW, 4)
+    frame_win.set_sizer(sizer)
+  end
+  def teardown
+    frame_win.sizer.remove(0)
+    @grid.destroy
+    super
+  end
+  attr_reader :grid
+  # Create a wxGrid object
+  def make_grid(panel)
+    @grid = Wx::GRID::Grid.new(panel, -1)
+    # Then we call CreateGrid to set the dimensions of the grid
+    # (11 rows and 12 columns in this example)
+    @grid.create_grid( 20, 12 )
+    @grid.set_default_cell_background_colour(Wx::WHITE)
+    @grid.set_default_cell_text_colour(Wx::BLACK)
+    # We can set the sizes of individual rows and columns
+    # in pixels, and the label value string
+    @grid.set_row_size( 0, 60 )
+    @grid.set_row_label_value( 0, "Row1" )
+    @grid.set_row_label_alignment(Wx::ALIGN_CENTRE, Wx::ALIGN_CENTRE)
+    @grid.set_col_size( 0, 120 )
+    @grid.set_col_label_value( 0, "Col1" )
+    @grid.set_col_label_alignment(Wx::ALIGN_CENTRE, Wx::ALIGN_CENTRE)
+    # And set grid cell contents as strings
+    @grid.set_cell_value( 0, 0, "wxGrid is good" )
+    # We can specify that some cells are read-only
+    @grid.set_cell_value( 0, 2, "Read-only" )
+    @grid.set_read_only( 0, 2 )
+    cell_attr = Wx::GRID::GridCellAttr.new
+    cell_attr.editor = MyTextCellEditor.new
+    @grid.set_row_attr(1, cell_attr)
+    cell_attr2 = Wx::GRID::GridCellAttr.new
+    cell_attr2.editor = cell_attr.editor(@grid, 1, 1)
+    @grid.set_row_attr(2, cell_attr2)
+    # Colours can be specified for grid cell contents
+    @grid.set_cell_value(1, 1, "white on red")
+    @grid.set_cell_text_colour(1, 1, Wx::WHITE)
+    @grid.set_cell_background_colour(1, 1, Wx::RED)
+    # We can specify the some cells will store numeric
+    # values rather than strings. Here we set grid column 6
+    # to hold floating point values displayed with width
+    # of 2 and precision of 2. The column is highlighted in light grey
+    @grid.set_col_format_float(5, 2, 2)
+    cell_attr = Wx::GRID::GridCellAttr.new
+    cell_attr.set_background_colour( Wx::LIGHT_GREY )
+    @grid.set_col_attr(5, cell_attr)
+    @grid.set_cell_value(0, 5, "3.1415")
+    @grid.set_cell_value(0, 6,
+                         "The whole column to the left uses float format")
+    # Custom Editors Can be used
+    editor = Wx::GRID::GridCellNumberEditor.new(5, 20)
+    @grid.set_cell_value(3, 1, 'Number editor below')
+    @grid.set_cell_editor(4, 1, editor)
+    editor = Wx::GRID::GridCellFloatEditor.new(4, 2)
+    @grid.set_cell_value(3, 2, 'Float editor below')
+    @grid.set_cell_editor(4, 2, editor)
+    editor = Wx::GRID::GridCellChoiceEditor.new(['foo', 'bar', 'baz'])
+    @grid.set_cell_value(3, 3, 'Choice editor below')
+    @grid.set_cell_editor(4, 3, editor)
+    @grid.auto_size_row(3, true)
+    # Display of cells can be customised
+    @grid.set_cell_editor(6, 0, Wx::GRID::GridCellBoolEditor.new)
+    @grid.set_cell_renderer(6, 0, Wx::GRID::GridCellBoolRenderer.new)
+    @grid.set_cell_value(6, 1, 'Cell to the left displayed as boolean')
+  end
+  def test_grid
+    grid.set_grid_cursor([0, 2])
+    assert_true(grid.is_current_cell_read_only)
+    grid.set_grid_cursor([1, 1])
+    grid.enable_cell_edit_control
+    grid.get_cell_editor(*[1,1]).get_control.set_value('hello world')
+    grid.save_edit_control_value
+    grid.disable_cell_edit_control
+    assert_equal("'hello world'", grid.get_cell_value(1, 1))
+    unless is_ci_build? && is_macos?
+      grid.set_grid_cursor([4, 3])
+      grid.enable_cell_edit_control
+      grid.get_cell_editor(4, 3).get_control.set_selection(1)
+      grid.save_edit_control_value
+      grid.disable_cell_edit_control
+      assert_equal('bar', grid.get_cell_value(4, 3))
+    end
+    grid.set_grid_cursor([6, 0])
+    grid.enable_cell_edit_control
+    grid.get_cell_editor(6, 0).get_control.set_value(true)
+    grid.save_edit_control_value
+    grid.disable_cell_edit_control
+    assert_equal('1', grid.get_cell_value(6, 0))
+  end
+end

data/tests/test_help.rb ADDED Viewed

@@ -0,0 +1,88 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+require_relative './lib/wxframe_runner'
+if Wx.has_feature?(:USE_HELP)
+  class TestHelp < WxRuby::Test::GUITests
+    class << self
+      def hlp_initialised
+        @hlp_initialized ||= false
+      end
+      def hlp_initialized=(init)
+        @hlp_initialized = init
+      end
+    end
+    def before_setup
+      super
+      unless self.class.hlp_initialised
+        Wx::HelpProvider.set(Wx::HelpControllerHelpProvider.new)
+        @hlp_controller = Wx::HelpController.new
+        Wx::HelpProvider.get.set_help_controller(@hlp_controller)
+        assert_true(@hlp_controller.init(File.join(__dir__, '..', 'samples', 'help', 'doc')))
+        self.class.hlp_initialized = true
+      end
+    end
+    def setup
+      super
+      @button = Wx::Button.new(frame_win, label: 'Button')
+      @text = Wx::TextCtrl.new(frame_win, name: 'Text')
+      @check = Wx::CheckBox.new(frame_win, label: 'Check Box')
+      Wx::HelpProvider.get.add_help(frame_win, 'Frame help')
+      Wx::HelpProvider.get.add_help(@button, 'Button help')
+      Wx::HelpProvider.get.add_help(@text, 'Text help')
+    end
+    def teardown
+      super
+      @button.destroy
+      @text.destroy
+      @check.destroy
+    end
+    attr_reader :button, :text, :check
+    def test_get_help
+      assert_equal('Frame help', Wx::HelpProvider.get.get_help(frame_win))
+      assert_equal('Button help', Wx::HelpProvider.get.get_help(button))
+      assert_equal('Text help', Wx::HelpProvider.get.get_help(text))
+      assert_empty(Wx::HelpProvider.get.get_help(check))
+    end
+    def test_show_help
+      assert_true(Wx::HelpProvider.get.show_help(frame_win))
+      assert_true(Wx::HelpProvider.get.show_help(button))
+      assert_true(Wx::HelpProvider.get.show_help(text))
+      assert_false(Wx::HelpProvider.get.show_help(check))
+    end
+    def test_remove_help
+      assert_true(Wx::HelpProvider.get.show_help(button))
+      Wx::HelpProvider.get.remove_help(button)
+      assert_false(Wx::HelpProvider.get.show_help(button))
+      assert_empty(Wx::HelpProvider.get.get_help(button))
+    end
+    unless is_cirrus_ci_build?
+      def test_help_controller
+        assert_true(Wx::HelpProvider.get.get_help_controller.display_contents)
+        assert_true(Wx::HelpProvider.get.get_help_controller.quit) unless is_msw?
+        assert_true(Wx::HelpProvider.get.get_help_controller.display_section('Introduction'))
+        assert_true(Wx::HelpProvider.get.get_help_controller.quit) unless is_msw?
+      end
+    end
+  end
+end

data/tests/test_intl.rb CHANGED Viewed

@@ -91,7 +91,7 @@ class TestInternationalisation < WxRuby::Test::Unit
     assert_raises(ArgumentError) { Wx::Locale.set_locale('bad') }
     # this causes problems on MacOSX if the language / region combination is unusual
     # like on my system (US English language / NL region)
-    unless Wx::PLATFORM == 'WXOSX'
+    unless is_macos?
       locale = Wx::Locale.new(Wx::LANGUAGE_DEFAULT)
     end
   end