wxruby3 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c66a3ae46adfde4f69fe289722d28b319f88a13d368babf85d8486d70ec89b81
-  data.tar.gz: 9ada796fe609d8fadb1f4b6436d787c2e3570863eacfd65772156cf2ba4baab3
+  metadata.gz: 3ea544cb7fe32dce3bbef74d16dc56ebe6fe8cb0ff381cbeee3a5ee9a37471d5
+  data.tar.gz: 2afddf4097dffcf4ee6bb4ed649d86165dd5e1decea9f330c27792e95eb2447d
 SHA512:
-  metadata.gz: 0f22f743031fe5e16981b8c01b09b9e0d505839f330b48ef25715dc73044d85cbe5a211a107d93a41203b8cc0214fad0a9f5b152f6d82f4828e08c0cef136965
-  data.tar.gz: f04a7c5176ac19c6a7702bb61f24c9c88c643e65d345618c8a96733bd60dcbb3a0933245fc1bb4b0354881f0b4d875d2379d2982e5e7d50f3fbe1d713d01f46a
+  metadata.gz: 03f848a8b259e10f1a7dfe74505361825e2819cbc8fd2f20d5ca1f1990afa9d9fea4abecaa5bbdda4129864c4f24aa22fb7b1508fc2632839f0d7ffa89919cba
+  data.tar.gz: e187a4d0fd6c3f4985afae321228e6956e56df349001e2f6478ea458bafaf4bd5e8210d94de963270820eaedc7ff8de9f3b60684cc493415ce5ad67d4741a228

data/lib/wx/aui/auinotebook.rb

@@ -4,27 +4,36 @@
 
 # Advanced User Interface Notebook - draggable panes etc
 
-class Wx::AUI::AuiNotebook
+module  Wx
+  module AUI
 
-  # Before wxWidgets 3.3 the AUI manager of this control would prevent
-  # WindowDestroyEvent propagation so we 'patch' in a std event handler
-  # that designates the event skipped.
-  if Wx::WXWIDGETS_VERSION < '3.3'
-    wx_initialize = instance_method :initialize
-    wx_redefine_method :initialize do |*args|
-      wx_initialize.bind(self).call(*args)
-      evt_window_destroy { |evt| evt.skip }
+    if Wx::WXWIDGETS_VERSION >= '3.3'
+      AuiDefaultTabArt = AuiFlatTabArt
     end
-  end
 
-  # Convenience method for iterating pages
-  def each_page
-    if block_given?
-      0.upto(get_page_count - 1) do | i |
-        yield get_page(i)
+    class AuiNotebook
+
+      # Before wxWidgets 3.3 the AUI manager of this control would prevent
+      # WindowDestroyEvent propagation so we 'patch' in a std event handler
+      # that designates the event skipped.
+      if Wx::WXWIDGETS_VERSION < '3.3'
+        wx_initialize = instance_method :initialize
+        wx_redefine_method :initialize do |*args|
+          wx_initialize.bind(self).call(*args)
+          evt_window_destroy { |evt| evt.skip }
+        end
+      end
+
+      # Convenience method for iterating pages
+      def each_page
+        if block_given?
+          0.upto(get_page_count - 1) do | i |
+            yield get_page(i)
+          end
+        else
+          ::Enumerator.new { |y| each_page { |pg| y << pg } }
+        end
       end
-    else
-      ::Enumerator.new { |y| each_page { |pg| y << pg } }
     end
   end
 end

data/lib/wx/core/dialog.rb

@@ -21,6 +21,34 @@ class Wx::Dialog
 
   end
 
+  def create_button_sizer(flags)
+    if Wx.has_feature?(:USE_BUTTON)
+      create_std_dialog_button_sizer(flags)
+    else
+      nil
+    end
+  end
+
+  def create_separated_sizer(sizer)
+    # Mac Human Interface Guidelines recommend not to use static lines as
+    # grouping elements
+    if Wx.has_feature?(:USE_STATLINE) && Wx::PLATFORM != 'WXOSX'
+      topsizer = Wx::VBoxSizer.new
+      topsizer.add(Wx::StaticLine.new(self),
+                   Wx::SizerFlags.new.expand.double_border(Wx::BOTTOM))
+      topsizer.add(sizer, Wx::SizerFlags.new.expand)
+      sizer = topsizer
+    end
+
+    sizer
+  end
+
+  def create_separated_button_sizer(flags)
+      sizer = create_button_sizer(flags)
+      return create_separated_sizer(sizer) if sizer
+      nil
+  end
+
   module Functor
     def self.included(klass)
       scope = klass.name.split('::')

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.3'
 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/aui_tab_art.rb

@@ -14,7 +14,12 @@ module WXRuby3
 
       def setup
         super
-        spec.items << 'wxAuiDefaultTabArt' << 'wxAuiSimpleTabArt'
+        if Config.instance.wx_version >= '3.3.0'
+          spec.items << 'wxAuiFlatTabArt' << 'wxAuiSimpleTabArt'
+          spec.ignore 'wxAuiDefaultTabArt', 'wxAuiNativeTabArt'
+        else
+          spec.items << 'wxAuiDefaultTabArt' << 'wxAuiSimpleTabArt'
+        end
         spec.gc_as_object
         spec.disable_proxies
         # missing from interface documentation
@@ -92,8 +97,54 @@ module WXRuby3
                               'wxAuiSimpleTabArt::Clone')
         spec.do_not_generate(:variables, :defines, :enums, :functions)
       end
+
+
+      def generator
+        WXRuby3::AuiTabArtGenerator.new(self)
+      end
+      protected :generator
+
+      def doc_generator
+        WXRuby3::AuiTabArtDocGenerator.new(self)
+      end
+      protected :doc_generator
+
     end # class AuiTabArt
 
   end # class Director
 
+  class AuiTabArtGenerator < InterfaceGenerator
+
+    def gen_interface_classes(fout)
+      super
+      if Config.instance.wx_version >= '3.3.0'
+        fout.puts
+        fout.puts 'class wxAuiNativeTabArt : public wxAuiTabArt'
+        fout.puts '{'
+        fout.puts '};'
+      end
+    end
+
+  end
+
+  class AuiTabArtDocGenerator < DocGenerator
+    def gen_class_doc(fdoc)
+      super
+      if Config.instance.wx_version >= '3.3.0'
+        fdoc.doc.puts 'Wx::AUI::AuiNativeTabArt is either an art provider providing native-like appearance (WXMSW and WXGTK) or a generic Tab Art provider if not available.'
+        fdoc.puts 'class AuiNativeTabArt < AuiTabArt; end'
+        fdoc.puts
+      end
+    end
+    def gen_constants_doc(fdoc)
+      super
+      if Config.instance.wx_version >= '3.3.0'
+        fdoc.doc.puts 'Wx::AUI::AuiDefaultTabArt is an alias for the tab art provider used by {Wx::AUI::AuiNotebook} by default.'
+        fdoc.doc.puts 'Since wxWidgets 3.3.0, this is {Wx::AUI::AuiFlatTabArt} under all platforms. In the previous versions, this was wxAuiNativeTabArt.'
+        fdoc.puts 'AuiDefaultTabArt = Wx::AUI::AuiFlatTabArt'
+        fdoc.puts
+      end
+    end
+  end
+
 end # module WXRuby3

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/dialog.rb

@@ -34,7 +34,28 @@ module WXRuby3
             extern VALUE wxRuby_GetDialogClass() {
               return SwigClassWxDialog.klass;
             }
-          __HEREDOC
+            __HEREDOC
+          spec.ignore 'wxDialog::CreateButtonSizer',            # pure Ruby impl
+                      'wxDialog::CreateSeparatedButtonSizer',   # pure Ruby impl
+                      'wxDialog::CreateSeparatedSizer',         # pure Ruby impl
+                      'wxDialog::CreateTextSizer',              # custom impl
+                      ignore_doc: false
+          spec.new_object 'wxDialog::CreateStdDialogButtonSizer' if Config.instance.features_set?('USE_BUTTON')
+          spec.add_extend_code 'wxDialog', <<~__HEREDOC
+            VALUE CreateTextSizer(const wxString& message, int widthMax)
+            {
+              wxSizer* txt_szr = $self->CreateTextSizer(message, widthMax);
+              if (txt_szr) 
+              {
+                // Get the wx class
+                wxString class_name( txt_szr->GetClassInfo()->GetClassName() );
+                swig_type_info* swig_type = wxRuby_GetSwigTypeForClassName(class_name);
+                if (swig_type)
+                  return SWIG_NewPointerObj(SWIG_as_voidptr(txt_szr), swig_type, SWIG_POINTER_OWN |  0 );
+              } 
+              return Qnil;
+            }
+            __HEREDOC
         when 'wxMessageDialog'
           spec.ignore 'wxMessageDialog::ButtonLabel'
           spec.map 'const ButtonLabel&' => 'String,Integer' do

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_dialog.rb

@@ -16,5 +16,66 @@ class DialogTests < Test::Unit::TestCase
     dlg = TestDialog.new
     assert_kind_of(Wx::Dialog, dlg)
     assert_kind_of(Wx::Window, dlg)
+    dlg.destroy
+  end
+
+  class  TestDialog2 < Wx::Dialog
+    def initialize
+      super(nil, -1,  'Test Dialog')
+
+      sizer_top = Wx::VBoxSizer.new
+      sizer_top.add(Wx::StaticText.new(self, label: 'Some text ...'))
+
+      sizer_btn = Wx::HBoxSizer.new
+      btn_focused = Wx::Button.new(self, -1, "Default button")
+      btn_other = Wx::Button.new(self, -1, "&Another button")
+      btn_close = Wx::Button.new(self, Wx::ID_CANCEL, "&Close")
+      sizer_btn.add(btn_focused, 0, Wx::ALIGN_CENTER | Wx::ALL, 5)
+      sizer_btn.add(btn_other, 0, Wx::ALIGN_CENTER | Wx::ALL, 5)
+      sizer_btn.add(btn_close, 0, Wx::ALIGN_CENTER | Wx::ALL, 5)
+
+      sizer_top.add(create_separated_sizer(sizer_btn))
+
+      set_auto_layout(true)
+      set_sizer(sizer_top)
+
+      sizer_top.set_size_hints(self)
+      sizer_top.fit(self)
+
+      btn_focused.set_focus
+      btn_focused.set_default
+    end
+  end
+
+  def test_dialog_with_separated_sizer
+    dlg = TestDialog2.new
+    dlg.show(true)
+    200.times { Wx.get_app.yield }
+    sleep(2) unless is_ci_build?
+    dlg.destroy
+  end
+
+  class TestDialog3 < Wx::Dialog
+    def initialize
+      super(nil, -1,  'Test Dialog')
+
+      sizer_top = Wx::VBoxSizer.new
+      sizer_top.add(Wx::StaticText.new(self, label: 'Some text ...'))
+      sizer_top.add(create_separated_button_sizer(Wx::YES_NO|Wx::CANCEL))
+
+      set_auto_layout(true)
+      set_sizer(sizer_top)
+
+      sizer_top.set_size_hints(self)
+      sizer_top.fit(self)
+    end
+  end
+
+  def test_dialog_with_button_sizer
+    dlg = TestDialog3.new
+    dlg.show(true)
+    200.times { Wx.get_app.yield }
+    sleep(2) unless is_ci_build?
+    dlg.destroy
   end
 end

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.3
 platform: ruby
 authors:
 - Martin Corino
 bindir: bin
 cert_chain: []
-date: 2025-02-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -1210,7 +1210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: wxWidgets extension for Ruby
 test_files: []