wxruby3 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba2a7c48f9f24e515c6891a059c0b1801f91bd11fe0dcc4d2d82c76fb810da0b
-  data.tar.gz: 9bb9ada532a116f6826dc394a0f418f278115c65b7c80702f15c80274bc44628
+  metadata.gz: d4076c5fcd81a2bd38c5e53367b337a7a0f2590f047bcf12def1bd3d3df9d301
+  data.tar.gz: ade42868f8a79fcc293af4b9070eab971f80a0871a1a0fe7384d55a144a77332
 SHA512:
-  metadata.gz: ed03bde1136e78acd711d2b1ffc696306840ca3f5032d8cd90b64f4eba005772c8de0a475035c0441537302f33a28b981f391f992715ef72207ed451b3e4bf74
-  data.tar.gz: a4e78a5adafd2cc15e05b113a2146de556bf86312d3cc2f7709b13103ecc7248c150127ff710547e63deb8055e4cf220df7ec963265a3e5b07582bbf6b5802be
+  metadata.gz: 6e9d0f837e87dc24ddbcc17a4eff510ba6af44bc3f108c76301b0fb36d86a496dab422127c7fc0b917470f5b282709696448a6d0f8a1256d18c9a2a46c972a63
+  data.tar.gz: 9065c12716485ebcefdd5a01bbb3ef7f4a3bf56c3b8aba3e12b6b4c189766e8a1279591a55553fc9e898838488f78993f95d31cd12a0c3b5e9525398d7fd4c8c

data/lib/wx/version.rb

@@ -3,5 +3,5 @@
 # This software is released under the MIT license.
 
 module Wx
-  WXRUBY_VERSION    = '1.5.0'
+  WXRUBY_VERSION    = '1.5.2'
 end

data/rakelib/lib/config/mingw.rb

@@ -109,7 +109,15 @@ module WXRuby3
             doxygen = get_cfg_string("doxygen")
             doxygen = nix_path(doxygen) unless doxygen == 'doxygen'
             chdir(File.join(ext_path, 'wxWidgets', 'docs', 'doxygen')) do
-              unless bash({ 'DOXYGEN' => doxygen,  'WX_SKIP_DOXYGEN_VERSION_CHECK' => '1' }, './regen.sh', 'xml')
+              exec_env = { 'DOXYGEN' => doxygen,  'WX_SKIP_DOXYGEN_VERSION_CHECK' => '1' }
+              # check if we're using an MSYS version or a native Windows version
+              if WXRuby3.config.sysinfo.os.pkgman && WXRuby3.config.sysinfo.os.pkgman.installed?('doxygen')
+                # The latest MSYS version doxygen generated *nix paths instead of Windows paths in the XML files
+                # to be sure the paths are shortened to relative paths we need to set WXWIDGETS to the *nix
+                # root path for wxWidgets as well and not the Windows root path as the regen.sh script still does.
+                exec_env['WXWIDGETS'] = nix_path(File.join(ext_path, 'wxWidgets'))
+              end
+              unless bash(exec_env, './regen.sh', 'xml')
                 $stderr.puts 'ERROR: Failed to generate wxWidgets XML API specifications for parsing by wxRuby3.'
                 exit(1)
               end

data/rakelib/lib/config/pkgman/linux.rb

@@ -21,7 +21,7 @@ module WXRuby3
           end
 
           def add(distro, *deps, release: nil)
-            @dependencies[distro] ||= ::Hash.new
+            @dependencies[distro] = ::Hash.new(@dependencies.default.default) unless @dependencies.has_key?(distro)
             if release
               @dependencies[distro][release] = deps.flatten
             else
@@ -45,7 +45,7 @@ module WXRuby3
         PLATFORM_DEPS = {
           debian: PlatformDependencies.new(%w[libgtk-3-dev libwebkit2gtk-4.0-dev libgspell-1-dev libunwind-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcurl4-openssl-dev libsecret-1-dev libnotify-dev])
                                       .add('ubuntu', %w[libgtk-3-dev libwebkit2gtk-4.1-dev libgspell-1-dev libunwind-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcurl4-openssl-dev libsecret-1-dev libnotify-dev], release: '24.04')
-                                      .alias('ubuntu', '24.04', 'linuxmint', '22'),
+                                      .alias('ubuntu', '24.04', 'linuxmint', '22').alias('ubuntu', '24.04', 'linuxmint', '22.1'),
           rhel: PlatformDependencies.new(%w[expat-devel findutils gspell-devel gstreamer1-plugins-base-devel gtk3-devel libcurl-devel libjpeg-devel libnotify-devel libpng-devel libSM-devel libsecret-devel libtiff-devel SDL-devel webkit2gtk4.1-devel zlib-devel]),
           suse: PlatformDependencies.new(%w[gtk3-devel webkit2gtk3-devel gspell-devel gstreamer-devel gstreamer-plugins-base-devel libcurl-devel libsecret-devel libnotify-devel libSDL-devel zlib-devel libjpeg-devel libpng-devel]),
           arch: PlatformDependencies.new(%w[pkg-config gtk3 webkit2gtk gspell libunwind gstreamer curl libsecret libnotify libpng12])

data/rakelib/lib/core/package.rb

@@ -655,8 +655,8 @@ module WXRuby3
           unless evts_handled.include?(evh_name)
             evt_klass ||= item.name if item.event
             # skip if we do not have an actually existing event class (for this platform)
-            if Package.full_docs? || (item.event && item.name == evt_klass) ||
-              (evt_klass && included_directors.any? { |dir| dir.defmod.find_item(evt_klass) })
+            if (item.event && item.name == evt_klass) ||
+              (evt_klass && (Package.full_docs? || included_directors.any? { |dir| dir.defmod.find_item(evt_klass) }))
 
               evh_args, evh_docstr = evt_nodoc ? nil : find_event_doc(evh_name)
               fdoc.doc.puts evh_docstr if evh_docstr

data/rakelib/lib/director/aui_manager.rb

@@ -18,8 +18,13 @@ module WXRuby3
         super
         spec.gc_as_object 'wxAuiManager'
         if Config.instance.wx_version >= '3.3.0'
-          spec.items  << 'wxAuiSerializer' << 'wxAuiDockLayoutInfo' << 'wxAuiPaneLayoutInfo' << 'wxAuiTabLayoutInfo' << 'wxAuiDeserializer'
-          spec.gc_as_untracked 'wxAuiSerializer', 'wxAuiDeserializer', 'wxAuiDockLayoutInfo', 'wxAuiPaneLayoutInfo', 'wxAuiTabLayoutInfo'
+          spec.items  << 'wxAuiBookSerializer' << 'wxAuiSerializer' <<
+                         'wxAuiDockLayoutInfo' << 'wxAuiPaneLayoutInfo' << 'wxAuiTabLayoutInfo' <<
+                         'wxAuiBookDeserializer' << 'wxAuiDeserializer'
+          spec.gc_as_untracked 'wxAuiBookSerializer', 'wxAuiSerializer', 'wxAuiBookDeserializer', 'wxAuiDeserializer',
+                               'wxAuiDockLayoutInfo', 'wxAuiPaneLayoutInfo', 'wxAuiTabLayoutInfo'
+          spec.make_abstract 'wxAuiBookSerializer'
+          spec.make_abstract 'wxAuiBookDeserializer'
           spec.regard 'wxAuiDockLayoutInfo::dock_direction',
                       'wxAuiDockLayoutInfo::dock_layer',
                       'wxAuiDockLayoutInfo::dock_row',
@@ -57,17 +62,17 @@ module WXRuby3
                 rb_raise(rb_eTypeError, "Expected Array of Integer for 1");
               }
             } 
-            __HEREDOC
+          __HEREDOC
           spec.map 'std::vector<wxAuiPaneLayoutInfo>' => 'Array<Wx::AuiPaneLayoutInfo>' do
             map_out code: <<~__CODE
               $result = rb_ary_new();
-              std::vector<wxAuiPaneLayoutInfo>& panes = (std::vector<wxAuiPaneLayoutInfo>&)$1;
-              for (const wxAuiPaneLayoutInfo& pane : panes)
+              std::vector<wxAuiPaneLayoutInfo>* panes = (std::vector<wxAuiPaneLayoutInfo>*)&$1;
+              for (const wxAuiPaneLayoutInfo& pane : *panes)
               {
                 VALUE r_pane = SWIG_NewPointerObj(new wxAuiPaneLayoutInfo(pane), SWIGTYPE_p_wxAuiPaneLayoutInfo, SWIG_POINTER_OWN);
                 rb_ary_push($result, r_pane);
               }
-              __CODE
+            __CODE
             map_directorout code: <<~__CODE
               if (TYPE($input) == T_ARRAY)
               {
@@ -83,18 +88,18 @@ module WXRuby3
                   $result.push_back(*pane);
                 }
               }
-              __CODE
+            __CODE
           end
           spec.map 'std::vector<wxAuiTabLayoutInfo>' => 'Array<Wx::AuiTabLayoutInfo>' do
             map_out code: <<~__CODE
               $result = rb_ary_new();
-              std::vector<wxAuiTabLayoutInfo>& tabs = (std::vector<wxAuiTabLayoutInfo>&)$1;
-              for (const wxAuiTabLayoutInfo& tab : tabs)
+              std::vector<wxAuiTabLayoutInfo>* tabs = (std::vector<wxAuiTabLayoutInfo>*)&$1;
+              for (const wxAuiTabLayoutInfo& tab : *tabs)
               {
                 VALUE r_tab = SWIG_NewPointerObj(new wxAuiTabLayoutInfo(tab), SWIGTYPE_p_wxAuiTabLayoutInfo, SWIG_POINTER_OWN);
                 rb_ary_push($result, r_tab);
               }
-              __CODE
+            __CODE
             map_directorout code: <<~__CODE
               if (TYPE($input) == T_ARRAY)
               {
@@ -110,8 +115,86 @@ module WXRuby3
                   $result.push_back(*tab);
                 }
               }
+            __CODE
+          end
+          # For wxAuiDeserialize::HandleOrphanedPage: the ruby method is passed the AuiNotebook
+          # and the page and should return either true if the orphaned page should just be appended
+          # to the main tab, a tuple with an AuiTabCtrl and a tab index to place the orphaned page in
+          # or false if the orphaned page should be removed.
+          spec.map 'int page, wxAuiTabCtrl **tabCtrl, int * tabIndex' do
+
+            add_header_code <<~__CODE
+              static WxRuby_ID s_AuiTabCtrl_id("AuiTabCtrl");
+              __CODE
+
+            map_in from: {type: 'Integer', index: 0}, temp: 'wxAuiTabCtrl *tab_ctrl, int tab_ix', code: <<~__CODE
+              $1 = NUM2INT($input);
+              tab_ctrl = nullptr; tab_ix = 0;
+              $2 = &tab_ctrl;
+              $3 = &tab_ix;
+              __CODE
+
+            # ignore C defined return value entirely (also affects directorout)
+            map_out ignore: 'bool'
+
+            map_argout as: {type: 'Boolean,Array(Wx::AUI::AuiTabCtrl, Integer)', index: 1}, code: <<~__CODE
+              if (result)
+              {
+                if (tab_ctrl$argnum)
+                {
+                  VALUE rb_klass = rb_const_get(mWxAuiManager, s_AuiTabCtrl_id());
+                  swig_type_info* swig_type = wxRuby_GetSwigTypeForClass(rb_klass);
+                  $result = rb_ary_new();
+                  rb_ary_push($result, SWIG_NewPointerObj(SWIG_as_voidptr(tab_ctrl$argnum), swig_type,  0));
+                  rb_ary_push($result, INT2NUM(tab_ix$argnum));
+                }
+                else
+                  $result = Qtrue;
+              }
+              else
+                $result = Qfalse;
               __CODE
+
+            # convert page and ignore rest for now
+            map_directorin code: '$input = INT2NUM(page);'
+
+            map_directorargout code: <<~__CODE
+              if (result != Qfalse)
+              {
+                if (result == Qtrue)
+                {
+                  c_result = true;
+                  *tabCtrl = nullptr;
+                  *tabIndex = 0; 
+                }
+                else if (TYPE(result) == T_ARRAY && RARRAY_LEN(result) == 2)
+                {
+                  VALUE rb_klass = rb_const_get(mWxAuiManager, s_AuiTabCtrl_id());
+                  swig_type_info* swig_type = wxRuby_GetSwigTypeForClass(rb_klass);
+                  void *tab_ctrl;
+                  int res = SWIG_ConvertPtr(rb_ary_entry(result, 0), &tab_ctrl, swig_type, 0);
+                  if (!SWIG_IsOK(res)) 
+                  {
+                    Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, 
+                                                               "HandleOrphanedPage should return false, true or Array(Wx::AUI::AuiTabCtrl, Integer)");
+                  }
+                  *tabCtrl = reinterpret_cast<wxAuiTabCtrl*>(tab_ctrl);
+                  *tabIndex = NUM2INT(rb_ary_entry(result, 1));
+                  c_result = true;
+                }
+                else
+                {
+                  Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, 
+                                                             "HandleOrphanedPage should return false, true or Array(Wx::AUI::AuiTabCtrl, Integer)");
+                }
+              }
+              else
+                c_result = false;
+            __CODE
+
           end
+          spec.suppress_warning(473, 'wxAuiDeserializer::CreatePaneWindow')
+
         end
         # need a custom implementation to handle (event handler proc) cleanup
         spec.add_header_code <<~__HEREDOC

data/rakelib/lib/director/aui_notebook.rb

@@ -23,14 +23,25 @@ module WXRuby3
                          wxAuiNotebookPage::caption
                          wxAuiNotebookPage::tooltip
                          wxAuiNotebookPage::bitmap
-                         wxAuiNotebookPage::rect
                          wxAuiNotebookPage::active]
           if Config.instance.wx_version >= '3.3.0'
             spec.items << 'wxAuiNotebookPosition'
-            spec.regard 'wxAuiNotebookPosition::tabctrl',
-                        'wxAuiNotebookPosition::page'
-            spec.make_readonly 'wxAuiNotebookPosition::tabctrl',
-                               'wxAuiNotebookPosition::page'
+            spec.regard 'wxAuiNotebookPosition::tabCtrl',
+                        'wxAuiNotebookPosition::tabIdx'
+            spec.make_readonly 'wxAuiNotebookPosition::tabCtrl',
+                               'wxAuiNotebookPosition::tabIdx'
+
+            spec.map 'std::vector<wxAuiTabCtrl*>' => 'Array<Wx::AuiTabCtrl>' do
+              map_out code: <<~__CODE
+                $result = rb_ary_new();
+                std::vector<wxAuiTabCtrl*>* tabctrls = (std::vector<wxAuiTabCtrl*>*)&$1;
+                for (wxAuiTabCtrl* tabctrl : *tabctrls)
+                {
+                  VALUE r_tabctrl = SWIG_NewPointerObj(SWIG_as_voidptr(tabctrl), SWIGTYPE_p_wxAuiTabCtrl, 0);
+                  rb_ary_push($result, r_tabctrl);
+                }
+                __CODE
+            end
           end
           # reset type mapping done in BookCtrls as the non-const arg is used for query-ing here (FindTab)
           # (wxWidgets should have made this a const arg)

data/rakelib/lib/director/defs.rb

@@ -32,7 +32,7 @@ module WXRuby3
           wxDELETEA
           wxSwap
         }
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version >= '3.2.7'
           spec.ignore %w[wxWARN_UNUSED]
         end
         spec.ignore 'wxOVERRIDE'

data/rakelib/lib/director/pgcell.rb

@@ -19,6 +19,9 @@ module WXRuby3
         spec.make_abstract 'wxPGCellData' # there is never any need to create an instance in Ruby
         spec.no_proxy 'wxPGCellData'
         spec.gc_never 'wxPGCellData'
+        # wxPGChoiceEntry are always passed by value and never transfer ownership
+        # so we do not need tracking or special free function
+        spec.gc_as_untracked 'wxPGChoiceEntry'
         spec.do_not_generate :variables, :enums, :defines, :functions # with PGProperty
         # add method for correctly wrapping PGCell output references
         spec.add_header_code <<~__CODE

data/rakelib/lib/director/pgproperty.rb

@@ -49,6 +49,13 @@ module WXRuby3
                       'wxPGChoices::wxPGChoices(size_t, const wxString *, const long *)',
                       'wxPGChoices::wxPGChoices(const wxChar **, const long *)',
                       'wxPGChoices::GetId'
+          # type mapping for wxPGChoiceEntry output references to make sure to always return managed copies
+          # (uses reference counted data internally)
+          spec.map "wxPGChoiceEntry&", as: "Wx::PGChoiceEntry" do
+            map_out code: <<~__CODE
+              $result = SWIG_NewPointerObj((new wxPGChoiceEntry(*static_cast< const wxPGChoiceEntry* >($1))), SWIGTYPE_p_wxPGChoiceEntry, SWIG_POINTER_OWN);
+              __CODE
+          end
           # replace by extension
           spec.ignore 'wxPGChoices::operator[]', ignore_doc: false
           spec.add_extend_code 'wxPGChoices', <<~__HEREDOC

data/rakelib/lib/director/property_grid_interface.rb

@@ -190,7 +190,7 @@ module WXRuby3
         # methods).
         spec.ignore 'wxPropertyGridInterface::RefreshGrid', ignore_doc: false
         spec.add_extend_code 'wxPropertyGridInterface', <<~__HEREDOC
-          void RefreshGrid(VALUE rb_state)
+          void RefreshGrid(VALUE rb_state = Qnil)
           {
             wxPropertyGridPageState *state = 0;
             if (!NIL_P(rb_state))

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

@@ -19,3 +19,10 @@
             ```ruby
               @mgr.get_pane(@text1).float
             ```
+:wxAuiBookDeserializer.HandleOrphanedPage:
+  :detail:
+    :pre:
+      :para:
+        - :pattern: !ruby/regexp /The overridden version may return true but modify.*appending them./
+          :replace: |
+            The overridden version may return a 2-element array with an AuiTabCtrl and tab index instead to change where the page should be inserted, e.g. by returning a tab index of 0 to insert the new pages at the beginning instead of appending them.

data/rakelib/lib/typemap/common.rb

@@ -475,6 +475,26 @@ module WXRuby3
           map_typecheck precedence: 'INT32_ARRAY', code: '$1 = (TYPE($input) == T_ARRAY);'
         end
 
+        map 'std::vector<size_t>' => 'Array<Integer>' do
+          map_out code: <<~__CODE
+              $result = rb_ary_new();
+              std::vector<size_t>* vec = (std::vector<size_t>*)&$1;
+              for (size_t i : *vec)
+              {
+                rb_ary_push($result, INT2NUM(i));
+              }
+              __CODE
+          map_directorout code: <<~__CODE
+              if (TYPE($input) == T_ARRAY)
+              {
+                for (int i = 0; i < RARRAY_LEN($input); i++)
+                {
+                  $result.push_back(NUM2INT(rb_ary_entry($input,i)));
+                }
+              }
+              __CODE
+        end
+
         # various enumerator type mappings
 
         map *%w[wxEdge wxRelationship wxKeyCode], as: 'Integer' do

data/tests/test_file_dialog.rb

@@ -17,6 +17,7 @@ class FileDialogTests < Test::Unit::TestCase
     end
   end
 
+  # temporary as wxw >= 3.3.0 introduced a bug
   def test_file_dialog
     dlg = Wx::FileDialog.new(nil, 'Select file')
     assert_kind_of(Wx::FileDialog, dlg)

data/tests/test_pg.rb

@@ -9,18 +9,26 @@ 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) }
+    GC.start
+    choices.each_label do |lbl|
+      assert_equal(texts.shift, lbl)
+      GC.start
+    end
   end
 
   def test_enum_entries
     texts = %w[Flag1 Flag2 Flag3 Flag4]
     choices = Wx::PG::PGChoices.new
+    GC.start
     texts.each_with_index do |s, i|
       choices.add(s, 1 << i)
     end
     choices.each_entry.each_with_index do |entry, ix|
+      GC.start
       assert_equal(1 << ix, entry.value)
+      GC.start
       assert_equal(texts[ix], entry.get_text)
+      GC.start
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Martin Corino
 bindir: bin
 cert_chain: []
-date: 2025-01-30 00:00:00.000000000 Z
+date: 2025-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri