wxruby3 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '079f38ae02dfcba5a96738f73c678e0d9a5396920739cb370c47d79b6bb81adf'
-  data.tar.gz: 510b7637e541b981deb048d4b0aa3898ea8152900b570ead984dcb9c6daee534
+  metadata.gz: 4bac7565182a0ae6badaee56d7b323459bdc2b198281a50639fafd6fcb2d2499
+  data.tar.gz: 5dc08857adaf213871ec7fce09117bac4cc19f00cac50638de552dc2219ea803
 SHA512:
-  metadata.gz: 4b3c4ad6e1c31636d658cd9f0d986c57caf6bc6f72af19af449b7d371c3b9af45b229533f1ae3593b7c23b2b29bf74dfaac8e88740fcca0699dc093f40b29d8f
-  data.tar.gz: 827044bb4256d7afc741e77209096cd527f2c77688c0b619fd72cf1ad0bf03992de4e3c60ec93e17795835345b15932ae2773381de85177d941d8b205ab120f7
+  metadata.gz: cbd4920bcc8ae2085ed85b49ee218642c1eb8a58c6bae7132fd653f479e5af6a60c716f61a9ad38bfdcc5cdc1e3560eb4152365127414bf0c401f266b39228c9
+  data.tar.gz: 60bba874185fe173a83d8878e458721a3f3fe58cbf484be2826c100a6009dff062972af7ecbaa9bc7dd3095d100aafdf326ac2dd994e1e50e7939654673d2466

data/lib/wx/version.rb

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

data/rakelib/lib/config/unixish.rb

@@ -218,10 +218,6 @@ module WXRuby3
           @ruby_libs <<  "-L#{RB_CONFIG['libdir']}"                       # add ruby lib dir
           # add ruby defined shared ruby lib(s); not any other flags
           @ruby_libs.concat RB_CONFIG['LIBRUBYARG_SHARED'].split(' ').select { |s| s.start_with?('-l')}
-
-          # maintain minimum compatibility with ABI 3.0.1
-          @wx_abi_version = [ @wx_version, "3.0.1" ].min
-          @wx_cppflags << "-DwxABI_VERSION=%s" % @wx_abi_version.tr(".", "0")
         end
       end
     end

data/rakelib/lib/config.rb

@@ -728,10 +728,6 @@ module WXRuby3
             @wx_version || ''
           end
 
-          def wx_abi_version
-            @wx_abi_version || ''
-          end
-
           def mingw?
             @platform == :mingw
           end

data/rakelib/lib/core/package.rb

@@ -114,11 +114,20 @@ module WXRuby3
         directors.select { |dir| Package.full_docs? || !Config.instance.excluded_module?(dir.spec) }
       end
 
-      def director_for_class(class_name)
-        dir = included_directors.detect { |dir| dir.spec.module_name == class_name || dir.spec.items.include?(class_name) }
-        subpackages.each_value.detect { |spkg| dir = spkg.director_for_class(class_name) } if dir.nil?
-        dependencies.detect { |pkgdep| dir = pkgdep.director_for_class(class_name) } if dir.nil?
-        dir = parent.director_for_class(class_name) if dir.nil? && parent
+      def director_for_class(class_name, pkg_stack=[])
+        dir = included_directors.detect { |dir| dir.spec.module_name == class_name || dir.spec.items.include?(dir.spec.classdef_name(class_name)) }
+        pkg_stack << self
+        subpackages.each_value.detect do |spkg|
+          unless pkg_stack.include?(spkg) # should never happen
+            dir = spkg.director_for_class(class_name, pkg_stack)
+          end
+        end if dir.nil?
+        dependencies.detect do |pkgdep|
+          unless pkg_stack.include?(pkgdep)
+            dir = pkgdep.director_for_class(class_name)
+          end
+        end if dir.nil?
+        dir = parent.director_for_class(class_name) if dir.nil? && parent && !pkg_stack.include?(parent)
         dir
       end
 

data/rakelib/lib/director/app.rb

@@ -69,7 +69,7 @@ module WXRuby3
           wxExit
         }
         spec.ignore 'wxApp::GetGUIInstance'
-        unless Config.instance.wx_abi_version >= '3.2.1' || Config.instance.wx_version < '3.2.1'
+        unless Config.instance.wx_version < '3.2.1'
           spec.ignore 'wxApp::GTKAllowDiagnosticsControl'
         end
         spec.add_extend_code 'wxApp', <<~__HEREDOC

data/rakelib/lib/director/dragdrop.rb

@@ -43,6 +43,55 @@ module WXRuby3
         spec.add_swig_code '%markfunc wxDropSource "mark_wxDropSource";',
                            '%markfunc wxDropTarget "mark_wxDropTarget";'
         spec.extend_interface 'wxDropSource', 'virtual ~wxDropSource()' # correct interface omission
+        # make Ruby director and wrappers use custom implementation
+        spec.use_class_implementation('wxDropTarget', 'wxRubyDropTarget')
+        spec.make_concrete('wxDropTarget')
+        spec.no_proxy %w[wxDropTarget::OnData]  # prevent director overload; custom impl handles this
+        spec.add_header_code <<~__HEREDOC
+          class wxRubyDropTarget : public wxDropTarget
+          {
+          public:
+            wxRubyDropTarget(wxDataObject *dataObject = nullptr ) : wxDropTarget(dataObject) {} 
+
+            virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult dflt) override
+            {
+              static WxRuby_ID on_data_id("on_data");
+              wxDragResult c_result = wxDragError;
+              VALUE SWIGUNUSED result;
+              
+              VALUE rb_x = INT2NUM(static_cast< int >(x));
+              VALUE rb_y = INT2NUM(static_cast< int >(y));
+              VALUE rb_dflt = wxRuby_GetEnumValueObject("DragResult", static_cast<int>(dflt));
+              if (rb_dflt == Qnil)
+              {
+                std::cerr << "Unexpected argument error: invalid value for Wx::DragResult in wxDropTarget::OnData [" << dflt << "]" << std::endl;
+              }
+              else
+              {
+                VALUE self = SWIG_RubyInstanceFor(this);
+                bool ex = false;
+                result = wxRuby_Funcall(ex, self, rb_intern("on_data"), 3,rb_x, rb_y, rb_dflt);
+                if (ex)
+                {
+                  wxRuby_PrintException(result);
+                }
+                else
+                {
+                  int eval;
+                  if (!wxRuby_GetEnumValue("DragResult", result, eval))
+                  {
+                    std::cerr << "Type Error: invalid value for Wx::DragResult returned from Wx::DropTarget#on_data" << std::endl;
+                  }
+                  else
+                  {
+                    c_result = static_cast<wxDragResult>(eval);
+                  }
+                }
+              }
+              return (wxDragResult) c_result;
+            } 
+          };
+          __HEREDOC
         spec.ignore %w[wxFileDropTarget::OnDrop wxTextDropTarget::OnDrop]
         spec.no_proxy %w[wxFileDropTarget::OnDrop wxFileDropTarget::OnData]
         spec.no_proxy %w[wxTextDropTarget::OnDrop wxTextDropTarget::OnData]

data/rakelib/lib/director/utils.rb

@@ -61,6 +61,9 @@ module WXRuby3
         spec.ignore 'wxGetEmailAddress(char *,int)',
                     'wxGetUserId(char *,int)',
                     'wxGetUserName(char *,int)'
+        if Config.instance.wx_version >= '3.3.0'
+          spec.ignore_unless('WXMSW', 'wxMSWIsOnSecureScreen')
+        end
         spec.map 'wxMemorySize' => 'Integer' do
           map_out code: <<~__CODE
             $result = LL2NUM(wxLongLongNative($1).GetValue());

data/rakelib/lib/generate/doc.rb

@@ -703,7 +703,7 @@ module WXRuby3
         fdoc.puts
         mod_indent = 0
         package.all_modules.each do |modnm|
-          fdoc.iputs("module #{package.fullname}", mod_indent)
+          fdoc.iputs("module #{modnm}", mod_indent)
           fdoc.puts
           mod_indent += 1
         end

data/rakelib/lib/swig_runner.rb

@@ -628,7 +628,12 @@ module WXRuby3
         end
 
         def run
-          member_map = collect_methods rescue $!
+          begin
+            member_map = collect_methods
+          rescue Exception
+            STDERR.puts "#{$!}\n#{$!.backtrace.join("\n")}"
+            exit(1)
+          end
           return if member_map.empty?
 
           # create re match list for class names

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-13 00:00:00.000000000 Z
+date: 2024-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -1191,7 +1191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key: 
 specification_version: 4
 summary: wxWidgets extension for Ruby