fxruby 1.6.48-x64-mingw-ucrt → 1.6.50-x64-mingw-ucrt

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.48"
+    "1.6.50"
   end
 end

data/lib/fox16.rb

@@ -6,24 +6,8 @@ rescue LoadError
     major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
       raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
 
-    add_dll_path = proc do |path, &block|
-      begin
-        require 'ruby_installer/runtime'
-        RubyInstaller::Runtime.add_dll_directory(path, &block)
-      rescue LoadError
-        old_path = ENV['PATH']
-        ENV['PATH'] = "#{path};#{old_path}"
-        block.call
-        ENV['PATH'] = old_path
-      end
-    end
-
     ruby_plat = RUBY_PLATFORM.gsub("i386", "x86")
-    # Temporary add this directory for DLL search, so that bundled DLLs can be found.
-    ports_bin = File.expand_path("../../ports/#{ruby_plat}/bin", __FILE__)
-    add_dll_path.call(ports_bin) do
-      require "#{major_minor}/fox16_c"
-    end
+    require_relative "../ports/#{ruby_plat}/bin/#{major_minor.gsub(".","_")}_fox16_c"
   else
     raise
   end

data/ports/x64-mingw-ucrt/bin/fxruby-assembly.manifest

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity type="win32" name="fxruby-assembly" version="1.0.0.0"></assemblyIdentity>
+
+<file name="libwinpthread-1.dll"/><file name="libgcc_s_seh-1.dll"/><file name="libstdc++-6.dll"/><file name="libfxscintilla-25.dll"/><file name="libFOX-1.6-0.dll"/><file name="libjpeg-62.dll"/><file name="libpng16-16.dll"/><file name="libtiff-6.dll"/><file name="zlib1.dll"/>
+</assembly>

data/rdoc-sources/FXDialogBox.rb

@@ -6,6 +6,18 @@ module Fox
   # +ID_CANCEL+ or +ID_ACCEPT+, the dialog box breaks out of the modal
   # loop and returns a completion code of either 0 or 1, respectively.
   #
+  # A modal dialog can be closed directly from a button:
+  #
+  #   FXButton.new(self, "&OK", nil, self, ID_ACCEPT)
+  #
+  # A modal dialog can also be closed from an event handler like so:
+  #
+  #   FXButton.new(self, "&OK") do |bu|
+  #     bu.connect(SEL_COMMAND) do
+  #       handle(self, Fox.MKUINT(ID_ACCEPT, SEL_COMMAND), nil)
+  #     end
+  #   end
+  #
   # To close a dialog box when it's not running modally, simply call
   # {#hide} (or send it the +ID_HIDE+ command message).
   #

data/rdoc-sources/FXImage.rb

@@ -80,7 +80,10 @@ module Fox
     #
     # Populate the image with new pixel data of the same size or of a new size
     #
-    # Pixel data is copied and IMAGE_OWNED option is set.
+    # Pixel data is copied when IMAGE_OWNED option is set or when provided as Array.
+    # Pixel data is used without copying when IMAGE_OWNED isn't set and provided as String.
+    # In that case the string must be writable and receives modifications to the image.
+    #
     # If called with +width+ and +height+, the size of the serverside representation
     # of the image, if it exists, is adjusted but the contents are not updated yet.
     # This can be done by calling render().

data/rdoc-sources/FXToolTip.rb

@@ -4,7 +4,7 @@ module Fox
   # = Tooltip styles
   # TOOLTIP_PERMANENT:: Tooltip stays up indefinitely
   # TOOLTIP_VARIABLE::  Tooltip stays up variable time, depending on the length of the string
-  # TOOLTIP_NORMAL::
+  # TOOLTIP_NORMAL::    Normal tooltip
   #
   # = Message identifiers
   #

data/rdoc-sources/FXTopWindow.rb

@@ -43,7 +43,7 @@ module Fox
   # +SEL_CLOSE+::
   #   sent when the user clicks the close button in the upper right-hand
   #   corner of the top-level window.
-  # +SEL_SESSION_NOTIFY+:
+  # +SEL_SESSION_NOTIFY+::
   #   sent when the session is closed.:
   # +SEL_SESSION_CLOSED+::
   #   sent after the session is closed.

data/rdoc-sources/FXWindow.rb

@@ -78,7 +78,7 @@ module Fox
   # +LAYOUT_MIN_HEIGHT+::   Minimum height is the default
   # +LAYOUT_FILL_X+::       Stretch or shrink horizontally
   # +LAYOUT_FILL_Y+::       Stretch or shrink vertically
-  # +LAYOUT_FILL::          Stretch or shrink in both directions
+  # +LAYOUT_FILL+::         Stretch or shrink in both directions
   # +LAYOUT_EXPLICIT+::     Explicit placement
   # +LAYOUT_DOCK_SAME+::    Dock on same galley, if it fits
   # +LAYOUT_DOCK_NEXT+::    Dock on next galley

data/swig-interfaces/FXScintilla.i

@@ -96,7 +96,14 @@ struct TextRange {
 class FXScintilla : public FXScrollArea {
 public:
   enum{
-    ID_TICK,
+    ID_TICK_CARET,
+    ID_TICK_SCROLL,
+    ID_TICK_WIDEN,
+    ID_TICK_DWELL,
+    ID_TICK_PLATFORM,
+    ID_IDLE,
+    ID_STYLE_IDLE,
+    ID_LAST
     };
 public:
   long onScintillaCommand(FXObject*, FXSelector, void* PTR_IGNORE);

data/test/TC_FXApp.rb

@@ -21,7 +21,8 @@ class TC_FXApp2 < Fox::TestCase
   end
 
   def test_nil_window_raises_argument_error
-    assert_raise(ArgumentError){ app.runPopup(nil) }
+    err = assert_raise{ app.runPopup(nil) }
+    assert_match(/NULL pointer/, err.to_s)
   end
 
   def check_events(pipe_rd, pipe_wr)

data/test/TC_FXBMPImage.rb

@@ -15,7 +15,7 @@ class TC_FXBMPImage < Fox::TestCase
 
   def test_image_from_pixel_data
     img = FXBMPImage.new app
-    img.setPixels "rgbaRGBA", 0, 1, 2
+    img.setPixels +"rgbaRGBA", 0, 1, 2
     bmp_data = FXMemoryStream.open(FXStreamSave, nil) do |outfile|
       img.savePixels(outfile)
       outfile.takeBuffer

data/test/TC_FXButton.rb

@@ -11,7 +11,8 @@ class TC_FXButton < Fox::TestCase
   end
 
   def test_nil_parent_raises_argument_error
-    assert_raise(ArgumentError){ FXButton.new(nil, "buttonText") }
+    err = assert_raise{ FXButton.new(nil, "buttonText") }
+    assert_match(/NULL pointer/, err.to_s)
   end
 
   def testText

data/test/TC_FXDialogBox.rb

@@ -5,8 +5,9 @@ class TC_FXDialogBox < Test::Unit::TestCase
   include Fox
 
   def test_nil_app_raises_argument_error
-    assert_raise ArgumentError do
+    err = assert_raise do
       FXDialogBox.new(nil, "title")
     end
+    assert_match(/NULL pointer/, err.to_s)
   end
 end

data/test/TC_FXGLViewer.rb

@@ -23,7 +23,8 @@ class TC_FXGLViewer < Fox::TestCase
   end
 
   def test_nil_app_raises_argument_error
-    assert_raise(ArgumentError){ FXGLVisual.supported?(nil) }
+    err = assert_raise{ FXGLVisual.supported?(nil) }
+    assert_match(/NULL pointer/, err.to_s)
   end
 
 =begin

data/test/TC_FXImage.rb

@@ -76,14 +76,14 @@ class TC_FXImage < Fox::TestCase
 
   def test_setPixels_string
     img = FXImage.new(app, nil, 0, 2, 1)
-    img.pixels = "rgbaRGBA"
+    img.pixels = +"rgbaRGBA"
     assert_equal(0, img.options)
     assert_equal("rgbaRGBA", img.pixel_string)
   end
 
   def test_dataPtr
     img = FXImage.new(app, nil, 0, 2, 1)
-    img.pixels = "rgbaRGBA"
+    img.pixels = +"rgbaRGBA"
     assert_equal(0, img.options)
     assert_equal("rgbaRGBA", Fiddle::Pointer.new(img.dataPtr)[0, 8])
   end
@@ -121,7 +121,7 @@ class TC_FXImage < Fox::TestCase
   end
 
   def image_with_non_owned_data
-    FXImage.new(app, "rgbaRGBA", 0, 1, 2)
+    FXImage.new(app, +"rgbaRGBA", 0, 1, 2)
   end
 
   def test_create_with_non_owned_data
@@ -135,7 +135,7 @@ class TC_FXImage < Fox::TestCase
   end
 
   def set_non_owned_data(img)
-    img.setPixels("rgbaRGBA", 0, 2, 1)
+    img.setPixels(+"rgbaRGBA", 0, 2, 1)
   end
 
   def test_set_pixel_with_non_owned_data

data/test/TC_FXMainWindow.rb

@@ -5,9 +5,10 @@ class TC_FXMainWindow < Test::Unit::TestCase
   include Fox
 
   def test_nil_app_raises_argument_error
-    assert_raise ArgumentError do
+    err = assert_raise do
       FXMainWindow.new(nil, "title")
     end
+    assert_match(/NULL pointer/, err.to_s)
   end
 
   def test_non_created_app_raises_runtime_error

data/test/TC_FXMessageBox.rb

@@ -10,7 +10,8 @@ class TC_FXMessageBox < Fox::TestCase
   end
 
   def test_nil_app_raises_argument_error
-    assert_raise(ArgumentError){ FXMessageBox.new(nil, "Save?", "Save?", :opts => MBOX_SAVE_CANCEL_DONTSAVE) }
+    err = assert_raise{ FXMessageBox.new(nil, "Save?", "Save?", :opts => MBOX_SAVE_CANCEL_DONTSAVE) }
+    assert_match(/NULL pointer/, err.to_s)
   end
 
   def test_construct_with_save_cancel_dontsave

data/test/TC_FXScrollArea.rb

@@ -11,7 +11,8 @@ class TC_FXScrollArea < Fox::TestCase
   end
 
   def test_nil_parent_raises_argument_error
-    assert_raise(ArgumentError){ FXScrollArea.new(nil) }
+    err = assert_raise{ FXScrollArea.new(nil) }
+    assert_match(/NULL pointer/, err.to_s)
   end
 
   def test_position_get

data/test/TC_FXShell.rb

@@ -16,7 +16,8 @@ class TC_FXShell < Test::Unit::TestCase
   end
 
   def test_nil_parent_raises_argument_error
-    assert_raise(ArgumentError){ FXShell.new(nil, 0, 0, 0, 0, 0) }
+    err = assert_raise{ FXShell.new(nil, 0, 0, 0, 0, 0) }
+    assert_match(/NULL pointer/, err.to_s)
   end
 
   def test_new

data/test/TC_FXSize.rb

@@ -31,9 +31,11 @@ class TC_FXSize < Test::Unit::TestCase
 
   def test_uminus
     size1 = -(@size1)
-    assert(size1.w == -(@size1.w) && size1.h == -(@size1.h))
+    assert_equal(size1.w, -(@size1.w))
+    assert_equal(size1.h, -(@size1.h))
     size2 = -(@size2)
-    assert(size2.w == -(@size2.w) && size2.h == -(@size2.h))
+    assert_equal(size2.w, -(@size2.w))
+    assert_equal(size2.h, -(@size2.h))
   end
 
   def test_float

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fxruby
 version: !ruby/object:Gem::Version
-  version: 1.6.48
+  version: 1.6.50
 platform: x64-mingw-ucrt
 authors:
 - Lyle Johnson
 - Lars Kanis
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -25,7 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-description: 
 email:
 - lyle@lylejohnson.name
 - lars@greiz-reinsdorf.de
@@ -949,9 +947,6 @@ files:
 - ext/fox16_c/unregisterOwnedObjects.cpp
 - fxruby.gemspec
 - index.html
-- lib/3.1/fox16_c.so
-- lib/3.2/fox16_c.so
-- lib/3.3/fox16_c.so
 - lib/fox16.rb
 - lib/fox16/accel_table.rb
 - lib/fox16/aliases.rb
@@ -985,8 +980,14 @@ files:
 - lib/fox16/tkcompat.rb
 - lib/fox16/undolist.rb
 - lib/fox16/version.rb
+- ports/x64-mingw-ucrt/bin/3_1_fox16_c.so
+- ports/x64-mingw-ucrt/bin/3_2_fox16_c.so
+- ports/x64-mingw-ucrt/bin/3_3_fox16_c.so
+- ports/x64-mingw-ucrt/bin/3_4_fox16_c.so
+- ports/x64-mingw-ucrt/bin/4_0_fox16_c.so
+- ports/x64-mingw-ucrt/bin/fxruby-assembly.manifest
 - ports/x64-mingw-ucrt/bin/libFOX-1.6-0.dll
-- ports/x64-mingw-ucrt/bin/libfxscintilla-20.dll
+- ports/x64-mingw-ucrt/bin/libfxscintilla-25.dll
 - ports/x64-mingw-ucrt/bin/libgcc_s_seh-1.dll
 - ports/x64-mingw-ucrt/bin/libjpeg-62.dll
 - ports/x64-mingw-ucrt/bin/libpng16-16.dll
@@ -1513,11 +1514,10 @@ files:
 - test/testcase.rb
 homepage: https://github.com/larskanis/fxruby
 licenses:
-- LGPL-2.1
+- LGPL-2.1-or-later
 metadata:
   changelog_uri: https://github.com/larskanis/fxruby/blob/1.6/History.md
   documentation_uri: https://rubydoc.info/gems/fxruby/frames
-post_install_message: 
 rdoc_options:
 - "--main"
 - README.md
@@ -1532,15 +1532,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.1'
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.4.dev
+      version: 4.1.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: FXRuby is the Ruby binding to the FOX GUI toolkit.
 test_files: []