wxruby3 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c66a3ae46adfde4f69fe289722d28b319f88a13d368babf85d8486d70ec89b81
-  data.tar.gz: 9ada796fe609d8fadb1f4b6436d787c2e3570863eacfd65772156cf2ba4baab3
+  metadata.gz: d4076c5fcd81a2bd38c5e53367b337a7a0f2590f047bcf12def1bd3d3df9d301
+  data.tar.gz: ade42868f8a79fcc293af4b9070eab971f80a0871a1a0fe7384d55a144a77332
 SHA512:
-  metadata.gz: 0f22f743031fe5e16981b8c01b09b9e0d505839f330b48ef25715dc73044d85cbe5a211a107d93a41203b8cc0214fad0a9f5b152f6d82f4828e08c0cef136965
-  data.tar.gz: f04a7c5176ac19c6a7702bb61f24c9c88c643e65d345618c8a96733bd60dcbb3a0933245fc1bb4b0354881f0b4d875d2379d2982e5e7d50f3fbe1d713d01f46a
+  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.1'
+  WXRUBY_VERSION    = '1.5.2'
 end

data/rakelib/lib/director/aui_manager.rb

@@ -62,7 +62,7 @@ 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();
@@ -72,7 +72,7 @@ module WXRuby3
                 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)
               {
@@ -88,7 +88,7 @@ module WXRuby3
                   $result.push_back(*pane);
                 }
               }
-              __CODE
+            __CODE
           end
           spec.map 'std::vector<wxAuiTabLayoutInfo>' => 'Array<Wx::AuiTabLayoutInfo>' do
             map_out code: <<~__CODE
@@ -99,7 +99,7 @@ module WXRuby3
                 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)
               {
@@ -115,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/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/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/tests/test_file_dialog.rb

@@ -18,7 +18,6 @@ class FileDialogTests < Test::Unit::TestCase
   end
 
   # temporary as wxw >= 3.3.0 introduced a bug
-  if Wx::WXWIDGETS_VERSION < '3.3.0'
   def test_file_dialog
     dlg = Wx::FileDialog.new(nil, 'Select file')
     assert_kind_of(Wx::FileDialog, dlg)
@@ -26,7 +25,6 @@ class FileDialogTests < Test::Unit::TestCase
     assert_kind_of(Wx::Window, dlg)
     assert_equal(Wx::ID_OK, dialog_tester(dlg))
   end
-  end
 
   class FileDialogTestCustomization < Wx::FileDialogCustomizeHook
 

metadata

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