wxruby3 0.9.0.pre.rc.2 → 0.9.0

data/rakelib/lib/core/include/funcall.inc

@@ -1,3 +1,6 @@
+// Copyright (c) 2023 M.J.N. Corino, The Netherlands
+//
+// This software is released under the MIT license.
 
 #undef _
 
@@ -8,74 +11,18 @@
 
 typedef VALUE (*RUBY_INVOKE_FUNC) (VALUE);
 
-namespace Swig {
-  /* Base class for director exceptions */
-  class DirectorException : public std::exception
-  {
-  protected:
-    VALUE swig_error;
-    std::string swig_msg;
-  protected:
-    DirectorException(VALUE error) : swig_error(error) { }
-    DirectorException(VALUE error, const char *hdr, const char *msg ="") : swig_error(error), swig_msg(hdr)
-    {
-      if (msg[0])
-      {
-        swig_msg += " ";
-        swig_msg += msg;
-      }
-      if (swig_msg.size())
-      {
-        VALUE str = rb_str_new(swig_msg.data(), swig_msg.size());
-        swig_error = rb_exc_new3(error, str);
-      }
-      else
-      {
-        swig_error = error;
-      }
-    }
-  public:
-    virtual ~DirectorException() throw() { }
-    VALUE getType() const
-    {
-      return CLASS_OF(swig_error);
-    }
-    VALUE getError() const
-    {
-      return swig_error;
-    }
-    /* Deprecated, use what() instead */
-    const std::string& getMessage() const
-    {
-      return swig_msg;
-    }
-    const char *what() const throw()
-    {
-      return swig_msg.c_str();
-    }
-  };
-  class DirectorRubyException : public DirectorException
-  {
-  public:
-    DirectorRubyException(const char *exname, const char *msg="")
-      : DirectorException(rb_eRuntimeError, exname, msg)
-    {
-    }
-  };
-}
-
 class WXRuby_RBFuncall
 {
 public:
-  WXRuby_RBFuncall (ID fnid, bool throw_on_ex=true)
+  WXRuby_RBFuncall (ID fnid, bool abort_on_ex=true)
    : fn_id_ (fnid),
-     throw_on_ex_ (throw_on_ex),
+     abort_on_ex_ (abort_on_ex),
      ex_caught_ (false)
   {
   }
-  WXRuby_RBFuncall (const char* fn, bool throw_on_ex=true)
+  WXRuby_RBFuncall (const char* fn, bool abort_on_ex=true)
   : fn_id_ (rb_intern (fn)),
-    throw_on_ex_ (throw_on_ex),
+    abort_on_ex_ (abort_on_ex),
     ex_caught_ (false)
   {
   }
@@ -118,14 +65,13 @@ protected:
                                &invoke_state);
     if (invoke_state)
     {
-      if (this->throw_on_ex_)
+      if (this->abort_on_ex_)
       {
         // handle exception
         VALUE rexc = this->get_exception ();
         VALUE msg = rb_eval_string ("$!.message+\"\\n\"+$!.backtrace.join(\"\\n\")");
         const char *exc_name = rb_obj_classname(rexc);
-        wxLogDebug("%s : %s", exc_name, StringValuePtr(msg));
-        throw Swig::DirectorRubyException(exc_name, StringValuePtr(msg));
+        wxLogFatalError("%s : %s", exc_name, StringValuePtr(msg));
       }
       else
       {
@@ -192,7 +138,7 @@ protected:
 
 private:
   ID      fn_id_;
-  bool    throw_on_ex_;
+  bool    abort_on_ex_;
   bool    ex_caught_;
 };
 

data/rakelib/lib/core/include/init.inc

@@ -1,3 +1,6 @@
+// Copyright (c) 2023 M.J.N. Corino, The Netherlands
+//
+// This software is released under the MIT license.
 
 #ifdef __WXMSW__
 

data/rakelib/lib/core/mapping.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 typemap mapping classes
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'set'
@@ -42,7 +45,7 @@ module WXRuby3
         elsif STD_STR_TYPES.include?(std_type)
           'String'
         elsif STD_BOOL_TYPES.include?(std_type)
-          'true,false'
+          'Boolean'
         else
           nil
         end
@@ -61,11 +64,16 @@ module WXRuby3
       "VOID_#{ctype.tr(' ', '_').upcase}"
     end
 
+    def self.strip_type_decl(ctype)
+      ctype = ctype.gsub(/const\s+/, '')
+      ctype.gsub!(/\s+(\*|&)/, '\1')
+      ctype.strip!
+      ctype.tr!('*&', '')
+      ctype
+    end
+
     def self.wx_type_to_rb(typestr)
-      c_type = typestr.gsub(/const\s+/, '')
-      c_type.gsub!(/\s+(\*|&)/, '\1')
-      c_type.strip!
-      c_type.tr!('*&', '')
+      c_type = strip_type_decl(typestr)
       (std_type_maps[c_type] || c_type).sub(/\Awx/, 'Wx::')
     end
 
@@ -265,7 +273,7 @@ module WXRuby3
       end
 
       class ArgOut < Base
-        def initialize(map, as: nil, temp: nil, code: nil, &block)
+        def initialize(map, as: nil, by_ref: false, temp: nil, code: nil, &block)
           super(map, temp: nil, code: code)
           @as = {}
           if as
@@ -273,10 +281,11 @@ module WXRuby3
           elsif !map.types.empty?
             map.types.each_pair { |pset, type| @as[pset] = _get_mapped_type(type) }
           end
+          @by_ref = by_ref
           block.call(self) if block
         end
 
-        attr_reader :as
+        attr_reader :as, :by_ref
 
         def map_as(argdef)
           _map_args(argdef, @as)
@@ -429,8 +438,8 @@ module WXRuby3
         @check = FreeArg.new(self, temp: temp, code: code, &block)
       end
 
-      def map_argout(as: nil, temp: nil, code: nil, &block)
-        @argout = ArgOut.new(self, as: as, temp: temp, code: code, &block)
+      def map_argout(as: nil, by_ref: false, temp: nil, code: nil, &block)
+        @argout = ArgOut.new(self, as: as, by_ref: by_ref, temp: temp, code: code, &block)
       end
 
       def map_directorin(temp: nil, code: nil, &block)
@@ -505,7 +514,7 @@ module WXRuby3
             # shift mapped parameters
             parameters.shift(tm_pset.param_masks.size)
             # return mappings
-            return [in_arg, out_arg]
+            return [in_arg, out_arg, self]
           end
         end
         nil
@@ -513,9 +522,6 @@ module WXRuby3
 
       def map_output(type)
         if maps_output?
-          if ignores_output? && ignored_output.include?(type)
-            return ''
-          end
           if (tm_pset = @patterns.detect { |pset| pset == type })
             return @out.to.has_key?(tm_pset) ? @out.to[tm_pset].type : ''
           end
@@ -536,15 +542,11 @@ module WXRuby3
       end
 
       def maps_input_as_output?
-        !!@argout
+        @argout && !@argout.by_ref
       end
 
-      def ignores_output?
-        @out && @out.ignore?
-      end
-
-      def ignored_output
-        @out ? @out.ignored : []
+      def ignores_output?(type)
+        @out && @out.ignore? && @out.ignored.include?(type)
       end
 
       def to_swig
@@ -565,7 +567,7 @@ module WXRuby3
                   @directorin,
                   @directorargout,
                   @varout]
-          maps << @directorout unless ignores_output?
+          maps << @directorout unless @out && @out.ignore?
           s.concat maps.collect { |mapping| mapping ? mapping.to_swig : nil }.compact
         else
           []
@@ -654,7 +656,7 @@ module WXRuby3
             # shift mapped parameters
             parameters.shift(@src_pattern.param_masks.size)
             # return mappings
-            return [in_arg, out_arg]
+            return [in_arg, out_arg, tm_app]
           end
         end
         nil
@@ -662,9 +664,6 @@ module WXRuby3
 
       def map_output(type)
         if maps_output?
-          if ignores_output? && ignored_output.include?(type)
-            return ''
-          end
           return @applied_maps.detect { |tm| tm.maps_output? }.map_output(type)
         end
         nil
@@ -686,14 +685,6 @@ module WXRuby3
         @applied_maps ? @applied_maps.any? { |map| map.maps_input_as_output? } : false
       end
 
-      def ignores_output?
-        @applied_maps ? @applied_maps.any? { |map| map.ignores_output? } : false
-      end
-
-      def ignored_output
-        ignores_output? ? @applied_maps.detect { |map| map.ignores_output? }.ignored_output : []
-      end
-
       def to_swig
         "%apply #{@src_pattern} { #{@patterns.join(', ')} };"
       end
@@ -769,7 +760,7 @@ module WXRuby3
             # shift mapped parameters
             parameters.shift(tm_pset.param_masks.size)
             # return mappings
-            return [in_arg, out_arg]
+            return [in_arg, out_arg, self]
           end
         end
         nil
@@ -798,14 +789,10 @@ module WXRuby3
         @maps_out
       end
 
-      def ignores_output?
+      def ignores_output?(_)
         false
       end
 
-      def ignored_output
-        []
-      end
-
       def to_swig
         nil
       end
@@ -854,15 +841,15 @@ module WXRuby3
         if @pattern.param_masks.first == parameters.first
           # just 'map' the parameter to itself
           param = parameters.shift # loose the 'mapped' parameter
-          return [RubyArg[Typemap.wx_type_to_rb(param.type), param_offset], nil]
+          return [RubyArg[nil, param_offset], nil, self]
         end
         nil
       end
 
       def map_output(type)
-        if matches?(type)
-          return Typemap.wx_type_to_rb(type)
-        end
+        # if matches?(type)
+        #   return Typemap.wx_type_to_rb(type)
+        # end
         nil
       end
 
@@ -882,14 +869,10 @@ module WXRuby3
         false
       end
 
-      def ignores_output?
+      def ignores_output?(_)
         false
       end
 
-      def ignored_output
-        []
-      end
-
       def to_swig
         "%clear #{@pattern};"
       end
@@ -985,31 +968,33 @@ module WXRuby3
           param_offset = 0
           args = []
           ret = []
+          maps = []
           reverse_list = list.reverse_each
           while !parameters.empty?
             result = nil
             param_count = parameters.size
             reverse_list.detect { |map| result = map.map_input(parameters, param_offset) }
-            arg_in = arg_out = nil
+            arg_in = arg_out = tmap = nil
             if result
-              arg_in, arg_out = result
+              arg_in, arg_out, tmap = result
             else
-              arg_in = RubyArg.new(Typemap.wx_type_to_rb(parameters.first.type), param_offset)
+              arg_in = RubyArg.new(nil, param_offset)
               parameters.shift # loose the mapped param
             end
             # store mapped param
             args << arg_in if arg_in
             ret << arg_out if arg_out
+            maps << tmap if tmap
             # calculate new param offset
             param_offset += (param_count - parameters.size)
           end
-          [args, ret]
+          [args, ret, maps]
         end
 
         def map_output(type)
           result = nil
           list.reverse_each.detect { |map| result = map.map_output(type) }
-          result || Typemap.wx_type_to_rb(type)
+          result
         end
 
         def to_swig
@@ -1027,7 +1012,7 @@ module WXRuby3
       STD_INT_TYPES => 'Integer',
       STD_STR_TYPES => 'String',
       STD_FLOAT_TYPES => 'Float',
-      STD_BOOL_TYPES => 'true,false'
+      STD_BOOL_TYPES => 'Boolean'
     }.inject(Typemap::Collection.new) do |list, (ctypes, rbtype)|
       unless rbtype == 'String'
         list << SystemMap.new(*ctypes.collect { |t| ["#{t} * OUTPUT", "#{t} & OUTPUT"]}.flatten,

data/rakelib/lib/core/package.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 extension library Package class
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -15,13 +18,14 @@ module WXRuby3
         @name = name
         @parent = parent
         @required_features = ::Set.new
+        @dependencies = ::Set.new
         @directors = []
         @director_index = {}
         @subpackages = {}
         @event_docs = {}
       end
 
-      attr_reader :name, :parent, :required_features, :directors, :director_index, :subpackages, :event_docs
+      attr_reader :name, :parent, :required_features, :dependencies, :directors, :director_index, :subpackages, :event_docs
 
       def is_core?
         name == 'Wx' && !parent
@@ -88,6 +92,11 @@ module WXRuby3
         self
       end
 
+      def depends_on(*pkgs)
+        dependencies.merge(pkgs.flatten)
+        self
+      end
+
       def add_director(spec)
         dir = spec.director.new(spec)
         director_index[spec.name] = dir
@@ -102,6 +111,7 @@ module WXRuby3
       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
         dir
       end
@@ -145,7 +155,11 @@ module WXRuby3
       end
 
       def dep_libs
-        parent ? parent.dep_libs + [File.join(Config.instance.dest_dir, "#{parent.libname}.#{Config.instance.dll_ext}")] : []
+        if parent
+          parent.dep_libs + [File.join(Config.instance.dest_dir, "#{parent.libname}.#{Config.instance.dll_ext}")]
+        else
+          []
+        end
       end
 
       def dep_libnames
@@ -585,6 +599,9 @@ module WXRuby3
                 # Integer constant reflecting the sub-release number of the wxWidgets release used to build wxRuby
                 WXWIDGETS_SUBRELEASE_NUMBER = \#{Wx::WXWIDGETS_SUBRELEASE_NUMBER}
               
+                # Integer constant reflecting the wxWidgets wxDEBUG_LEVEL
+                WXWIDGETS_DEBUG_LEVEL = \#{Wx::WXWIDGETS_DEBUG_LEVEL}
+
                 # Boolean constant indicating if wxRuby was build in debug (true) or release (false) mode
                 DEBUG = \#{Wx::DEBUG}
               

data/rakelib/lib/core/parameter.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 typemap Parameter class
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/core/spec.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 Director specs class
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './mapping'
@@ -43,6 +46,7 @@ module WXRuby3
         @interface_extensions = ::Hash.new
         @folded_bases = ::Hash.new
         @abstracts = ::Hash.new
+        @disowned_alloc = ::Set.new
         @mixins = ::Set.new
         @included_mixins = ::Hash.new
         @items = [modname]
@@ -60,7 +64,6 @@ module WXRuby3
         @disowns = ::Set.new
         @new_objects = ::Set.new
         @warn_filters = ::Hash.new
-        @only_for = ::Hash.new
         @includes = ::Set.new
         @swig_imports = {prepend: ::Set.new, append: ::Set.new}
         @swig_includes = ::Set.new
@@ -81,7 +84,7 @@ module WXRuby3
       end
 
       attr_reader :director, :package, :module_name, :name, :items, :folded_bases, :ignores, :regards, :readonly, :contracts, :event_overrides,
-                  :mixins, :included_mixins, :disabled_proxies, :no_proxies, :disowns, :new_objects, :warn_filters, :only_for,
+                  :mixins, :included_mixins, :disabled_proxies, :no_proxies, :disowns, :new_objects, :warn_filters,
                   :includes, :swig_imports, :swig_includes, :renames, :swig_code, :begin_code,
                   :runtime_code, :header_code, :wrapper_code, :extend_code, :init_code, :interface_code,
                   :nogen_sections, :post_processors, :requirements, :type_maps
@@ -134,6 +137,15 @@ module WXRuby3
         (!doc || doc_override) ? supers : nil
       end
 
+      def is_derived_from?(class_def, base_name)
+        base = inheritance_override(class_def.name)
+        if base
+          !!Extractor::ClassDef.find_base({base.name => base}, base_name)
+        else
+          class_def.is_derived_from?(base_name)
+        end
+      end
+
       def extend_interface(cls, *declarations, visibility: 'public')
         ((@interface_extensions[cls] ||= {})[visibility] ||= ::Set.new).merge declarations.flatten
         self
@@ -165,7 +177,7 @@ module WXRuby3
           @gc_type = :GC_NEVER
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_NEVER }
+          names.flatten.each {|n| @gc_type[n] = :GC_NEVER }
         end
         self
       end
@@ -175,7 +187,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_OBJECT
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_OBJECT }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_OBJECT }
         end
         self
       end
@@ -185,7 +197,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_WINDOW
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_WINDOW }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_WINDOW }
         end
         self
       end
@@ -195,7 +207,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_FRAME
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_FRAME }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_FRAME }
         end
         self
       end
@@ -205,7 +217,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_DIALOG
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_DIALOG }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_DIALOG }
         end
         self
       end
@@ -215,7 +227,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_EVENT
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_EVENT }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_EVENT }
         end
         self
       end
@@ -225,7 +237,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_SIZER
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_SIZER }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_SIZER }
         end
         self
       end
@@ -235,7 +247,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_REFCOUNTED
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_REFCOUNTED }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_REFCOUNTED }
         end
         self
       end
@@ -245,7 +257,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_UNTRACKED_REFCOUNTED
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_UNTRACKED_REFCOUNTED }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_UNTRACKED_REFCOUNTED }
         end
         self
       end
@@ -255,7 +267,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_UNTRACKED
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_UNTRACKED }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_UNTRACKED }
         end
         self
       end
@@ -283,6 +295,16 @@ module WXRuby3
         self
       end
 
+      def allocate_disowned(cls)
+        @disowned_alloc << cls
+        post_processors << :fix_disowned_alloc unless post_processors.include? :fix_disowned_alloc
+        self
+      end
+
+      def allocate_disowned?(cls)
+        @disowned_alloc.include?(cls)
+      end
+
       def abstract?(cls)
         @abstracts.has_key?(cls) && @abstracts[cls]
       end
@@ -375,11 +397,6 @@ module WXRuby3
         self
       end
 
-      def set_only_for(id, *names)
-        (@only_for[id.to_s] ||= ::Set.new).merge(names.flatten)
-        self
-      end
-
       def include(*paths)
         @includes.merge(paths.flatten)
         self