wxruby3 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4076c5fcd81a2bd38c5e53367b337a7a0f2590f047bcf12def1bd3d3df9d301
-  data.tar.gz: ade42868f8a79fcc293af4b9070eab971f80a0871a1a0fe7384d55a144a77332
+  metadata.gz: 3ea544cb7fe32dce3bbef74d16dc56ebe6fe8cb0ff381cbeee3a5ee9a37471d5
+  data.tar.gz: 2afddf4097dffcf4ee6bb4ed649d86165dd5e1decea9f330c27792e95eb2447d
 SHA512:
-  metadata.gz: 6e9d0f837e87dc24ddbcc17a4eff510ba6af44bc3f108c76301b0fb36d86a496dab422127c7fc0b917470f5b282709696448a6d0f8a1256d18c9a2a46c972a63
-  data.tar.gz: 9065c12716485ebcefdd5a01bbb3ef7f4a3bf56c3b8aba3e12b6b4c189766e8a1279591a55553fc9e898838488f78993f95d31cd12a0c3b5e9525398d7fd4c8c
+  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.2'
+  WXRUBY_VERSION    = '1.5.3'
 end

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/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/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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Martin Corino
 bindir: bin
 cert_chain: []
-date: 2025-03-22 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: []