wxruby3 1.2.1 → 1.3.1

data/rakelib/lib/generate/doc/generic_about_dialog.yaml

@@ -0,0 +1,46 @@
+---
+:wxGenericAboutDialog:
+  :detail:
+    :pre:
+      :programlisting:
+        - :pattern: !ruby/regexp /.*/
+          :replace: |
+
+            ```ruby
+            class MyFrame < Wx::Frame
+            
+              # declare custom about dialog class                        
+              class MyAboutDlg < Wx::GenericAboutDialog
+            
+                def initialize(about_info, parent=nil)
+                  super()
+            
+                  create(about_info, parent)
+                end
+            
+                def do_add_custom_controls
+                  # add custom controls ...
+                end
+                protected :do_add_custom_controls
+            
+              end
+            
+              # fill in MyFrame class ...
+            
+              # handler for an About menu/button
+              def on_about(_evt)
+                aboutInfo = Wx::AboutDialogInfo.new
+                
+                aboutInfo.set_name('MyApp')
+                aboutInfo.set_version(MY_APP_VERSION_STRING)
+                aboutInfo.set_description('My wxWidgets-based application!')
+                aboutInfo.set_copyright('(C) 1992-2024')
+                aboutInfo.set_web_site('http://myapp.org')
+                aboutInfo.add_developer('My Self')
+                
+                MyFrame.MyAboutDlg(aboutInfo, self) do |dlgAbout|
+                  dlgAbout.show_modal
+                end
+              end
+            end
+            ```

data/rakelib/lib/specs/interfaces.rb

@@ -237,6 +237,8 @@ module WXRuby3
     Director.Spec(pkg, 'wxDCOverlay', director: Director::DerivedDC)
     Director.Spec(pkg, 'wxGeometry', requirements: %w[USE_GEOMETRY])
     Director.Spec(pkg, 'wxAffineMatrix2D', requirements: %w[USE_GEOMETRY])
+    Director.Spec(pkg, 'wxCredentialEntryDialog', director: Director::Dialog, requirements: %w[USE_CREDENTIALDLG])
+    Director.Spec(pkg, 'wxGenericAboutDialog', director: Director::Dialog, requirements: %w[USE_ABOUTDLG])
   }
 
   Director.Package('Wx::PRT', 'USE_PRINTING_ARCHITECTURE') do |pkg|

data/rakelib/lib/swig_runner.rb

@@ -726,20 +726,23 @@ module WXRuby3
             elsif wrapper_re =~ line
               class_nm = $1
               mtd_nm = $2
+              if /(\w+)__SWIG_.+/ =~ mtd_nm # in case of method overloads
+                mtd_nm = $1
+              end
               at_wrapper = true
               if (mdef = member_map[class_nm].detect { |m| Extractor::MethodDef === m && (m.rb_name || m.name) == mtd_nm })
                 matched_wrapper = true
                 mtd_call_re = /(\s*)\S.*arg1\)?->#{mtd_nm}(\(.*\));/
-                line = [line, '  bool fpa_upcall = false;', '  Swig::Director *fpa_dir = 0;']
+                line = [line, '  bool SWIGUNUSED fpa_upcall = false;', '  Swig::Director* SWIGUNUSED fpa_dir = 0;']
               elsif (mdef = member_map[class_nm].detect { |m| Extractor::MemberVarDef === m && "#{m.rb_name || m.name}_get" == mtd_nm })
                 matched_wrapper = true
                 mtd_call_re = /(\s*)\S.*arg1\)?->#{mdef.name}\)?;/
-                line = [line, '  bool fpa_upcall = false;', '  Swig::Director *fpa_dir = 0;']
+                line = [line, '  bool SWIGUNUSED fpa_upcall = false;', '  Swig::Director* SWIGUNUSED fpa_dir = 0;']
               elsif (mdef = member_map[class_nm].detect { |m| Extractor::MemberVarDef === m && "#{m.rb_name || m.name}_set" == mtd_nm })
                 matched_wrapper = true
                 at_setter = true;
                 mtd_call_re = /(\s*)\S.*arg1\)?->#{mdef.name}(\s*=\s*.*);/
-                line = [line, '  bool fpa_upcall = false;', '  Swig::Director *fpa_dir = 0;']
+                line = [line, '  bool SWIGUNUSED fpa_upcall = false;', '  Swig::Director* SWIGUNUSED fpa_dir = 0;']
               end
             elsif /rb_define_method\(SwigClassWx(#{cls_re_txt}).klass\s*,\s*"(\w+)(=)?"\s*,\s*VALUEFUNC/ =~ line
               class_nm = $1

data/rakelib/lib/typemap/common.rb

@@ -364,7 +364,7 @@ module WXRuby3
               }
           __CODE
           map_directorout code: <<~__CODE
-            if (TYPE($input) != T_ARRAY)
+            if (TYPE($input) == T_ARRAY)
             {
               for (int i = 0; i < RARRAY_LEN($input); i++)
               {
@@ -398,7 +398,7 @@ module WXRuby3
             }
             __CODE
           map_directorout code: <<~__CODE
-            if (TYPE($input) != T_ARRAY)
+            if (TYPE($input) == T_ARRAY)
             {
               for (int i = 0; i < RARRAY_LEN($input); i++)
               {

data/rakelib/lib/util/string.rb

@@ -107,9 +107,10 @@ module WXRuby3
       end
 
       def rb_constant_expression(exp, const_xref)
-        exp.gsub(/(\w+(::\w+)*)(\s*\()?/) do |s|
+        exp.gsub(/(\w+(::\w+)*)(\s*\((\))?)?/) do |s|
           idstr = $1
-          is_call = !!$3
+          call_bracket = $3
+          is_empty_call = !!$4
           is_scoped = false
           ids = idstr.split('::')
           if ids.size > 1
@@ -120,18 +121,18 @@ module WXRuby3
             end
           end
           idstr = ids.shift
-          if is_call
+          if call_bracket
             # object ctor or static method call
             if is_scoped
               # static method
-              "#{scoped_name}.#{rb_method_name(idstr)}("
+              "#{scoped_name}.#{rb_method_name(idstr)}#{call_bracket}"
             else
               # ctor
               case idstr
               when 'wxString'
-                '('
+                is_empty_call ? "''" : call_bracket
               else
-                "#{idstr.start_with?('wx') ? 'Wx::' : ''}#{rb_wx_name(idstr)}.new("
+                "#{idstr.start_with?('wx') ? 'Wx::' : ''}#{rb_wx_name(idstr)}.new#{call_bracket}"
               end
             end
           else

data/samples/animate/anitest.rb

@@ -81,16 +81,20 @@ module AniTest
 
       @animation_ctrl = Wx::AnimationCtrl.new(self, Wx::ID_ANY)
 
-      animations = Wx::AnimationBundle.new
+      if Wx::WXWIDGETS_VERSION >= '3.3.0'
+        animations = Wx::AnimationBundle.new
 
-      throbber = Wx::Animation.new(File.join(__dir__, 'throbber.gif'))
-      animations.add(throbber) if throbber.ok?
+        throbber = Wx::Animation.new(File.join(__dir__, 'throbber.gif'))
+        animations.add(throbber) if throbber.ok?
 
-      throbber2x = Wx::Animation.new(File.join(__dir__, 'throbber_2x.gif'))
-      animations.add(throbber2x) if throbber2x.ok?
+        throbber2x = Wx::Animation.new(File.join(__dir__, 'throbber_2x.gif'))
+        animations.add(throbber2x) if throbber2x.ok?
 
-      if animations.ok?
-        @animation_ctrl.set_animation(animations)
+        if animations.ok?
+          @animation_ctrl.set_animation(animations)
+          @animation_ctrl.play
+        end
+      elsif @animation_ctrl.load('throbber.gif')
         @animation_ctrl.play
       end
 
@@ -137,7 +141,7 @@ module AniTest
     end
 
     def on_set_null_animation(_event)
-      @animation_ctrl.set_animation(Wx::AnimationBundle.new(Wx::NULL_ANIMATION))
+      @animation_ctrl.set_animation(Wx::NULL_ANIMATION)
     end
 
     def on_set_inactive_bitmap(event)
@@ -195,7 +199,7 @@ module AniTest
                 return
               end
 
-              @animation_ctrl.set_animation(Wx::AnimationBundle.new(temp))
+              @animation_ctrl.set_animation(temp)
               @animation_ctrl.play
 
               get_sizer.layout

data/samples/dialogs/dialogs.rb

@@ -167,7 +167,7 @@ module Dialogs
       end
 
       create(parent, -1, "Preferences")
-      create_buttons(Wx::ID_OK|Wx::ID_CANCEL)
+      create_buttons(Wx::OK|Wx::CANCEL)
       book_ctrl.set_images(imgs)
       book_ctrl.add_page(file_panel(book_ctrl), "File", false, img_id1)
       book_ctrl.add_page(cdrom_panel(book_ctrl), "CD ROM", false, img_id2)

data/tests/lib/leaked_overload_exception_test.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './wxframe_runner'
+
+class DirectorOverloadExceptionTests < WxRuby::Test::GUITests
+
+  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
+    frame_win.layout
+    frame_win.sizer = nil
+  end
+
+end

data/tests/lib/leaked_process_event_exception_test.rb

@@ -0,0 +1,33 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './wxapp_runner'
+
+class ProcessEventHandlingExceptionTests < Test::Unit::TestCase
+
+  class TestEvent < Wx::Event
+    EVT_TEST_EVENT = Wx::EvtHandler.register_class(self, nil, 'evt_test_event', 0)
+    def initialize(id=0)
+      super(EVT_TEST_EVENT, id)
+    end
+  end
+
+  class TestFrame < Wx::Frame
+
+    def initialize
+      super(nil, size: [300,300])
+
+      evt_test_event { |_evt| raise RuntimeError, 'Whatever' }
+    end
+
+  end
+
+  def test_process_event
+    win = TestFrame.new
+    win.process_event(TestEvent.new)
+    win.destroy
+    10.times { Wx.get_app.yield }
+  end
+
+end

data/tests/lib/leaked_queued_event_exception_test.rb

@@ -0,0 +1,34 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './wxapp_runner'
+
+class QueuedEventHandlingExceptionTests < Test::Unit::TestCase
+
+  class TestEvent < Wx::Event
+    EVT_TEST_EVENT = Wx::EvtHandler.register_class(self, nil, 'evt_test_event', 0)
+    def initialize(id=0)
+      super(EVT_TEST_EVENT, id)
+    end
+  end
+
+  class TestFrame < Wx::Frame
+
+    def initialize
+      super(nil, size: [300,300])
+
+      evt_test_event { |_evt| raise RuntimeError, 'Whatever' }
+    end
+
+  end
+
+  def test_queue_event
+    win = TestFrame.new
+    win.queue_event(TestEvent.new)
+    Wx.get_app.yield
+    win.destroy
+    10.times { Wx.get_app.yield }
+  end
+
+end

data/tests/lib/overload_type_exception_test.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './wxframe_runner'
+
+class DirectorTypeExceptionTests < WxRuby::Test::GUITests
+
+  class InvalidOutputSizer < Wx::BoxSizer
+
+    def calc_min
+      nil #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
+    frame_win.layout
+    frame_win.sizer = nil
+  end
+
+end

data/tests/test_exceptions.rb

@@ -2,40 +2,40 @@
 #
 # This software is released under the MIT license.
 
-require_relative './lib/wxframe_runner'
+require 'test/unit'
+require 'plat4m'
+require 'open3'
 
-class DirectorExceptionTests < WxRuby::Test::GUITests
+class DirectorExceptionTests < Test::Unit::TestCase
 
-  class InvalidOutputSizer < Wx::BoxSizer
+  # Path to the currently running Ruby program
+  RUBY = ENV["RUBY"] || File.join(
+    RbConfig::CONFIG["bindir"],
+    RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]).
+    sub(/.*\s.*/m, '"\&"')
 
-    def calc_min
-      Wx::Point.new(1,1) # expects Wx::Size
-    end
+  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)
   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
+  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)
   end
 
-  class ExceptionSizer < Wx::BoxSizer
-
-    def calc_min
-      raise RuntimeError, 'AnyThing'
-    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_equal(1, $?.exitstatus)
   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
+  def test_leaked_queued_event_handling_exception
+    assert_false(Kernel.system(RUBY, File.join(__dir__, 'lib/leaked_queued_event_exception_test.rb'), **OPTS))
+    assert_equal(1, $?.exitstatus)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-29 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -172,6 +172,7 @@ files:
 - lib/wx/core/dataformat.rb
 - lib/wx/core/datetime.rb
 - lib/wx/core/dc.rb
+- lib/wx/core/defs.rb
 - lib/wx/core/dialog.rb
 - lib/wx/core/enum.rb
 - lib/wx/core/event.rb
@@ -184,6 +185,7 @@ files:
 - lib/wx/core/font.rb
 - lib/wx/core/functions.rb
 - lib/wx/core/gauge.rb
+- lib/wx/core/gdi_object.rb
 - lib/wx/core/generic_validator.rb
 - lib/wx/core/genericdirctrl.rb
 - lib/wx/core/geometry.rb
@@ -276,6 +278,7 @@ files:
 - lib/wx/doc/functions.rb
 - lib/wx/doc/gc_dc.rb
 - lib/wx/doc/gdi_common.rb
+- lib/wx/doc/gdi_object.rb
 - lib/wx/doc/generic_validator.rb
 - lib/wx/doc/geometry.rb
 - lib/wx/doc/graphics_context.rb
@@ -294,6 +297,7 @@ files:
 - lib/wx/doc/mirror_dc.rb
 - lib/wx/doc/notebook.rb
 - lib/wx/doc/num_validator.rb
+- lib/wx/doc/object.rb
 - lib/wx/doc/owner_drawn_combobox.rb
 - lib/wx/doc/pen.rb
 - lib/wx/doc/persistence_manager.rb
@@ -707,6 +711,7 @@ files:
 - rakelib/lib/generate/doc/combo_ctrl.yaml
 - rakelib/lib/generate/doc/context_help_button.yaml
 - rakelib/lib/generate/doc/control.yaml
+- rakelib/lib/generate/doc/credential_entry_dialog.yaml
 - rakelib/lib/generate/doc/cursor.yaml
 - rakelib/lib/generate/doc/data_object.yaml
 - rakelib/lib/generate/doc/dc.yaml
@@ -723,6 +728,7 @@ files:
 - rakelib/lib/generate/doc/frame.yaml
 - rakelib/lib/generate/doc/fs_file.yaml
 - rakelib/lib/generate/doc/gdi_common.yaml
+- rakelib/lib/generate/doc/generic_about_dialog.yaml
 - rakelib/lib/generate/doc/graphics_context.yaml
 - rakelib/lib/generate/doc/graphics_object.yaml
 - rakelib/lib/generate/doc/grid_cell_attr.yaml
@@ -1110,6 +1116,10 @@ files:
 - tests/art/test_art/image/wxruby.png
 - tests/art/test_art/sample2.xpm
 - tests/lib/item_container_tests.rb
+- tests/lib/leaked_overload_exception_test.rb
+- tests/lib/leaked_process_event_exception_test.rb
+- tests/lib/leaked_queued_event_exception_test.rb
+- tests/lib/overload_type_exception_test.rb
 - tests/lib/text_entry_tests.rb
 - tests/lib/wxapp_runner.rb
 - tests/lib/wxframe_runner.rb
@@ -1197,7 +1207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: wxWidgets extension for Ruby