wxruby3 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36b9eb0db175364b374a899f3458497f09dddbfbc981c08b36f0c43c83d225b7
-  data.tar.gz: ac07b0f69b8878db1ee966d4ec2b79f4ee0122ee173a70a5ef7a4a274c634c6e
+  metadata.gz: 686537c22871168bb80d09ecffbc7170b1de0560930014b579ee35dd3f71f80d
+  data.tar.gz: 8ea1c3c592fd0ecc5e5922f7a3fabe12def1b97a76e30a88b0f576e90fdcca8b
 SHA512:
-  metadata.gz: b369e2270784db0220735194f98d047a97f0a277c7bba518627800e3c7ed70245a428a650aa531877314acae6c003ffad899295dcbdb36c9e1dcfb1714b46926
-  data.tar.gz: 0f86862841afe346ee8ee0218ef5a4259c9c22aa6109659e41e2e499575402aad3519a9bae99ea32150785fe8d278a5513e5a66d4ad21599ab4e9ad8c67c2f50
+  metadata.gz: 60b6061a6746bf5185e54d7c5df8de624beb633ead75d00b256d87c521c392bd7dab7f8259c061e6622bc31d4559e5a9d664914a87215c08634b74b2d9711e03
+  data.tar.gz: 3aa90ee4d255248e7678fed9a4bce668eb8cf01b7f36ff4f43dda3fff99f44d6eb37b607acdd1de26c63101fe3757e3d5b88d88020dd05dcbc87a283b40b9642

data/lib/wx/doc/stream.rb

@@ -17,12 +17,16 @@ module Wx
     #   Reads bytes from stream and writes these to output stream until eof or error.
     #   @param [IO,Wx::OutputStream] output output stream to write to
     #   @return [self]
-    def read(*args); end
+    def read(*); end
 
+    # @overload read_all(size)
     #   Reads size bytes from stream (until eof or error).
     #   @param [Integer] size number of bytes to read
     #   @return [String,nil] string with bytes read (nil if none read)
-    def read_all(size); end
+    # @overload read_all()
+    #   Reads all bytes from stream (until eof or error).
+    #   @return [String,nil] string with bytes read (nil if none read)
+    def read_all(*); end
 
   end
 
@@ -36,7 +40,7 @@ module Wx
     #   Write bytes read from input stream (until eof or error)
     #   @param [IO,Wx::InputStream] input input stream to read from
     #   @return [self]
-    def write(*args); end
+    def write(*); end
 
     # Writes bytes from buffer to stream.
     # @param [String] buffer string with bytes to write

data/lib/wx/version.rb

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

data/lib/wx/wxruby/cmd/test.rb

@@ -38,7 +38,8 @@ module WxRuby
           exit(0)
         end
         opts.on('--exclude=TEST',
-                "exclude the specified test from running")  {|v| Test.options[:excludes] << v }
+                "Exclude the specified test from running")  {|v| Test.options[:excludes] << v }
+        opts.on('--keep-going', 'Do NOT stop on error.') { Test.options[:keep_going] = true }
         opts.on('-h', '--help',
                 'Show this message.') do |v|
           puts opts
@@ -66,9 +67,14 @@ module WxRuby
                   end
                 end
         tests.each do |test|
+          rc = true
           unless Test.options[:excludes].include?(File.basename(test, '.*'))
-            exit(1) unless system(RUBY, test)
+            $stdout.puts
+            $stdout.puts "Running #{File.basename(test, '.*')} ..."
+            rc &&= system(RUBY, test)
+            exit(1) unless rc || Test.options[:keep_going]
           end
+          exit(1) unless rc
         end
       end
     end

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

@@ -43,9 +43,11 @@ module WXRuby3
         end
 
         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('debian', %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: '13')
+          debian: PlatformDependencies.new(%w[libgtk-3-dev libwebkit2gtk-4.[0-9]+-dev libgspell-1-dev libunwind-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcurl4-openssl-dev libsecret-1-dev libnotify-dev])
+                                      .add('debian', %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: '12')
+                                      .alias('debian', '12', 'debian', '13')
                                       .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', 'ubuntu', '26.04')
                                       .alias('ubuntu', '24.04', 'linuxmint', '22')
                                       .alias('ubuntu', '24.04', 'linuxmint', '22.1')
                                       .alias('ubuntu', '24.04', 'linuxmint', '22.2')

data/rakelib/lib/director/derived_dc.rb

@@ -38,7 +38,7 @@ module WXRuby3
               }
               return rc;
             }
-            __HEREDOC
+          __HEREDOC
           # not relevant anymore
           spec.ignore 'wxScreenDC::StartDrawingOnTop',
                       'wxScreenDC::EndDrawingOnTop',
@@ -82,14 +82,14 @@ module WXRuby3
               return Qfalse;
             #endif
             }
-            __HEREDOC
+          __HEREDOC
           spec.add_extend_code 'wxPaintDC', <<~__HEREDOC
             #include "wx/dcbuffer.h"
             static VALUE has_native_double_buffer()
             {
               return do_check_native_double_buffer();
             }  
-            __HEREDOC
+          __HEREDOC
         when 'wxMemoryDC'
           spec.items << 'wxBufferedDC' << 'wxBufferedPaintDC'
           spec.override_inheritance_chain('wxMemoryDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
@@ -249,6 +249,9 @@ module WXRuby3
         when 'wxSVGFileDC'
           spec.override_inheritance_chain('wxSVGFileDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
           spec.items.concat %w[wxSVGBitmapHandler wxSVGBitmapFileHandler wxSVGBitmapEmbedHandler]
+          if Config.instance.wx_version_check('3.3.2') > 0
+            spec.items.concat %w[wxSVGAttributes]
+          end
           spec.make_abstract 'wxSVGFileDC'
           spec.ignore 'wxSVGFileDC::wxSVGFileDC'
           # like all DC this should best always be a temporary stack object
@@ -284,6 +287,12 @@ module WXRuby3
                       'wxSVGFileDC::EndDoc',
                       'wxSVGFileDC::StartPage',
                       'wxSVGFileDC::EndPage'
+          if Config.instance.wx_version_check('3.3.2') > 0
+            # simplify/optimize mapping for wxSVGAttributes return values
+            spec.map 'wxSVGAttributes&' => 'Wx::SVGAttributes' do
+              map_out code: '$result = self; (void)$1;' # simply return the 'self' argument
+            end
+          end
         when 'wxGCDC'
           spec.override_inheritance_chain('wxGCDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
           spec.make_abstract 'wxGCDC'
@@ -311,7 +320,7 @@ module WXRuby3
                 }
                 return rc;
               }
-              __HEREDOC
+            __HEREDOC
           end
           spec.add_extend_code 'wxGCDC', <<~__HEREDOC
             static VALUE draw_on()
@@ -386,7 +395,7 @@ module WXRuby3
               }
               return rc;
             }
-            __HEREDOC
+          __HEREDOC
           spec.disown 'wxGraphicsContext *gc'
           spec.ignore 'wxGCDC::wxGCDC(const wxEnhMetaFileDC &)'
         when 'wxScaledDC'
@@ -422,7 +431,7 @@ module WXRuby3
               return rc;
             }
             };
-            __HEREDOC
+          __HEREDOC
           spec.swig_import %w[ext/wxruby3/swig/classes/include/wxObject.h
                               ext/wxruby3/swig/classes/include/wxDC.h]
           spec.add_interface_code <<~__HEREDOC
@@ -433,7 +442,7 @@ module WXRuby3
             protected:
               wxScaledDC(wxDC& target, double scale);
             };
-            __HEREDOC
+          __HEREDOC
         when 'wxPrinterDC'
           spec.override_inheritance_chain('wxPrinterDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version_check('3.3.0') >= 0
           spec.make_abstract 'wxPrinterDC'
@@ -513,41 +522,41 @@ module WXRuby3
               }
               return rc;
             }
-            __HEREDOC
+          __HEREDOC
           if Config.instance.wx_version_check('3.3.0') >= 0
             spec.items << 'wxOverlayDC'
             spec.override_inheritance_chain('wxOverlayDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject'])
             spec.make_abstract 'wxOverlayDC'
             spec.ignore 'wxOverlayDC::wxOverlayDC'
             spec.add_extend_code 'wxOverlayDC', <<~__HEREDOC
-            static VALUE draw_on(wxOverlay &overlay, wxWindow *win)
-            {
-              if (!wxRuby_IsAppRunning()) 
-                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
-              VALUE rc = Qnil;
-              if (rb_block_given_p ())
+              static VALUE draw_on(wxOverlay &overlay, wxWindow *win)
               {
-                wxOverlayDC ovl_dc(overlay, win);
-                wxOverlayDC* ovl_dc_ptr = &ovl_dc;
-                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(ovl_dc_ptr), SWIGTYPE_p_wxOverlayDC, 0);
-                rc = rb_yield(rb_dc);
+                if (!wxRuby_IsAppRunning()) 
+                  rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+                VALUE rc = Qnil;
+                if (rb_block_given_p ())
+                {
+                  wxOverlayDC ovl_dc(overlay, win);
+                  wxOverlayDC* ovl_dc_ptr = &ovl_dc;
+                  VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(ovl_dc_ptr), SWIGTYPE_p_wxOverlayDC, 0);
+                  rc = rb_yield(rb_dc);
+                }
+                return rc;
               }
-              return rc;
-            }
-            static VALUE draw_on(wxOverlay &overlay, wxWindow *win, const wxRect &rect)
-            {
-              if (!wxRuby_IsAppRunning()) 
-                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
-              VALUE rc = Qnil;
-              if (rb_block_given_p ())
+              static VALUE draw_on(wxOverlay &overlay, wxWindow *win, const wxRect &rect)
               {
-                wxOverlayDC ovl_dc(overlay, win, rect);
-                wxOverlayDC* ovl_dc_ptr = &ovl_dc;
-                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(ovl_dc_ptr), SWIGTYPE_p_wxOverlayDC, 0);
-                rc = rb_yield(rb_dc);
+                if (!wxRuby_IsAppRunning()) 
+                  rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+                VALUE rc = Qnil;
+                if (rb_block_given_p ())
+                {
+                  wxOverlayDC ovl_dc(overlay, win, rect);
+                  wxOverlayDC* ovl_dc_ptr = &ovl_dc;
+                  VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(ovl_dc_ptr), SWIGTYPE_p_wxOverlayDC, 0);
+                  rc = rb_yield(rb_dc);
+                }
+                return rc;
               }
-              return rc;
-            }
             __HEREDOC
           end
         else

data/rakelib/lib/director/editable_listbox.rb

@@ -16,14 +16,16 @@ module WXRuby3
 
       def setup
         super
-        # methods missing from docs
-        spec.extend_interface 'wxEditableListBox',
-                              'wxListCtrl* GetListCtrl()',
-                              'wxBitmapButton* GetDelButton()',
-                              'wxBitmapButton* GetNewButton()',
-                              'wxBitmapButton* GetUpButton()',
-                              'wxBitmapButton* GetDownButton()',
-                              'wxBitmapButton* GetEditButton()'
+        if Config.instance.wx_version_check('3.3.3') < 0
+          # methods missing from docs
+          spec.extend_interface 'wxEditableListBox',
+                                'wxListCtrl* GetListCtrl()',
+                                'wxBitmapButton* GetDelButton()',
+                                'wxBitmapButton* GetNewButton()',
+                                'wxBitmapButton* GetUpButton()',
+                                'wxBitmapButton* GetDownButton()',
+                                'wxBitmapButton* GetEditButton()'
+        end
         # redefine this
         spec.ignore 'wxEditableListBox::GetStrings', ignore_doc: false
         spec.add_extend_code 'wxEditableListBox', <<~__HEREDOC

data/rakelib/lib/director/fs_file.rb

@@ -86,6 +86,29 @@ module WXRuby3
             return nread>0 ? rb_str_new(buffer.get(), nread) : Qnil;
           }
           __HEREDOC
+        if Config.instance.wx_version_check('3.3.3') >= 0
+          # covered by custom ReadAll()
+          spec.ignore 'wxInputStream::Read(std::vector<wxUint8> &)'
+          spec.add_extend_code 'wxInputStream', <<~__HEREDOC
+            VALUE ReadAll()
+            {
+              std::vector<wxUint8> buffer;
+              $self->Read(buffer);
+              return buffer.size()>0 ? rb_str_new(reinterpret_cast<char*> (buffer.data()), buffer.size()) : Qnil;
+            }
+            __HEREDOC
+        else
+          spec.include 'wx/mstream.h'
+          spec.add_extend_code 'wxInputStream', <<~__HEREDOC
+            VALUE ReadAll()
+            {
+              wxMemoryOutputStream stream;
+              $self->Read(stream);
+              wxStreamBuffer* buffer = stream.GetOutputStreamBuffer();   
+              return buffer->GetBufferSize()>0 ? rb_str_new(reinterpret_cast<char*> (buffer->GetBufferStart()), buffer->GetBufferSize()) : Qnil;
+            }
+            __HEREDOC
+        end
         # for Read(wxOutputStream&)
         spec.map 'wxInputStream&' => 'Wx::InputStream' do
           map_out code: '$result = self; wxUnusedVar($1);'

data/rakelib/lib/director/ribbon_page.rb

@@ -16,6 +16,17 @@ module WXRuby3
 
       def setup
         super
+        if Config.instance.wx_version_check('3.3.2') <= 0
+          # implement custom version of method because of unconventional
+          # (and problematic) return type
+          spec.ignore 'wxRibbonPage::GetIcon', ignore_doc: false
+          spec.add_extend_code 'wxRibbonPage', <<~__CODE
+            wxBitmap GetIcon()
+            {
+              return $self->GetIcon();
+            }
+            __CODE
+        end
       end
     end # class RibbonPage
 

data/rakelib/lib/director/top_level_window.rb

@@ -35,10 +35,18 @@ module WXRuby3
             }
             __HEREDOC
           spec.ignore %w{
-            wxTopLevelWindow::SaveGeometry
-            wxTopLevelWindow::RestoreToGeometry
-            wxTopLevelWindow::GeometrySerializer
-          }
+              wxTopLevelWindow::SaveGeometry
+              wxTopLevelWindow::RestoreToGeometry
+            }
+          if Config.instance.wx_version_check('3.3.3') < 0
+            spec.ignore %w{
+              wxTopLevelWindow::GeometrySerializer
+            }
+          else
+            spec.ignore %w{
+              wxTopLevelWindow::GeometryStore
+            }
+          end
           # #ignore_unless if wxRuby one day supports 'WXUNIVERSAL'
           spec.ignore %w{
             wxTopLevelWindow::IsUsingNativeDecorations

data/rakelib/lib/specs/interfaces.rb

@@ -248,8 +248,8 @@ module WXRuby3
     Director.Spec(pkg, 'wxPersistentWindow', requirements: %w[USE_CONFIG])
     Director.Spec(pkg, 'wxSecretStore', requirements: %w[USE_SECRETSTORE])
     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, 'wxGeometry', requirements: Config.instance.wx_version_check('3.3.2') <= 0 ?  %w[USE_GEOMETRY] : [])
+    Director.Spec(pkg, 'wxAffineMatrix2D', requirements: Config.instance.wx_version_check('3.3.2') <= 0 ?  %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.Spec(pkg, 'wxMBConv')

data/tests/test_webview.rb

@@ -85,10 +85,10 @@ if Wx.has_feature?(:USE_WEBVIEW)
       yield_and_wait_for_test(5000) { loaded}
       # unfortunately the WebView2 loader on windows is flaky in CI builds and tends to fail (too often)
       # so just skip the test in such cases
-      if loaded || !(is_msw? && is_ci_build? && Wx::WEB::WEBVIEW_BACKEND_DEFAULT == Wx::WEB::WEBVIEW_BACKEND_EDGE)
+      if loaded || !is_ci_build?
         assert_true(loaded)
       else
-        STDERR.puts 'WARNING: Skipping test because of WebView2 load failure'
+        STDERR.puts 'WARNING: Skipping test because CI'
       end
     end
 
@@ -400,12 +400,12 @@ if Wx.has_feature?(:USE_WEBVIEW)
       frame_win.evt_webview_loaded(webview) { |_| loaded = true }
       webview.load_url('https://mcorino.github.io/wxRuby3/')
       yield_and_wait_for_test(10000) { loaded}
-      # unfortunately the WebView2 loader on windows is flaky in CI builds and tends to fail (too often)
+      # unfortunately WebView loader is flaky in CI builds and tends to fail (too often)
       # so just skip the test in such cases
-      if loaded || !(is_msw? && is_ci_build? && Wx::WEB::WEBVIEW_BACKEND_DEFAULT == Wx::WEB::WEBVIEW_BACKEND_EDGE)
+      if loaded || !is_ci_build?
         assert_true(loaded)
       else
-        STDERR.puts 'WARNING: Skipping test because of WebView2 load failure'
+        STDERR.puts 'WARNING: Skipping test because of CI'
       end
     end