wxruby3 0.9.0.pre.rc.3 → 0.9.1

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
@@ -270,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
@@ -278,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)
@@ -434,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)
@@ -510,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
@@ -518,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
@@ -541,15 +542,11 @@ module WXRuby3
       end
 
       def maps_input_as_output?
-        !!@argout
-      end
-
-      def ignores_output?
-        @out && @out.ignore?
+        @argout && !@argout.by_ref
       end
 
-      def ignored_output
-        @out ? @out.ignored : []
+      def ignores_output?(type)
+        @out && @out.ignore? && @out.ignored.include?(type)
       end
 
       def to_swig
@@ -570,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
           []
@@ -659,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
@@ -667,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
@@ -691,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
@@ -774,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
@@ -803,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
@@ -859,7 +841,7 @@ module WXRuby3
         if @pattern.param_masks.first == parameters.first
           # just 'map' the parameter to itself
           param = parameters.shift # loose the 'mapped' parameter
-          return [RubyArg[nil, param_offset], nil]
+          return [RubyArg[nil, param_offset], nil, self]
         end
         nil
       end
@@ -887,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
@@ -990,14 +968,15 @@ 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(nil, param_offset)
               parameters.shift # loose the mapped param
@@ -1005,10 +984,11 @@ module WXRuby3
             # 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)
@@ -1032,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
@@ -268,6 +282,7 @@ module WXRuby3
         Stream.transaction do
           fsrc = CodeStream.new(initializer_src)
           fsrc.puts '#include <ruby.h>'
+          fsrc.puts '#include <ruby/version.h>'
           fsrc.puts <<~__HEREDOC
             #ifndef WXRB_EXPORT_FLAG
             # if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
@@ -305,9 +320,11 @@ module WXRuby3
           fsrc.puts "VALUE #{module_variable} = 0;"
           fsrc.puts "WXRB_IMPORT_FLAG VALUE wxRuby_Core();" unless is_core?
           fsrc.puts
-          fsrc.puts '#define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)'
-          fsrc.puts
           if is_core?
+            fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'swigrun.inc'))
+            fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'swigrubyerrors.inc'))
+            fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'swigrubyrun.inc'))
+            fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'swigdirector.inc'))
             fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'funcall.inc'))
             fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'enum.inc'))
             fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'init.inc'))

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
@@ -13,6 +16,9 @@ module WXRuby3
       CONST_RE = /(\A|\W)const(\W|\Z)/
       MULTI_WORD_TYPES = %w[char short int long]
       def initialize(param)
+        # prevent unwanted splitting on whitespaces in template type decls
+        param = param.gsub(/\<\s+/, '<')
+        param.gsub!(/\s+\>/, '>')
         @array = false
         if ::Array === param
           @ctype, @name, arr = param

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'
@@ -61,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
@@ -82,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
@@ -135,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
@@ -386,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

data/rakelib/lib/core/spec_helper.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 helper mixin.
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'pathname'
@@ -99,21 +102,21 @@ module WXRuby3
       end
     end
 
-    def get_base_list(hierarchy, foldedbases, list = ::Set.new)
+    def get_base_list(hierarchy, foldedbases, list = ::Set.new, do_not_fold: false)
       hierarchy.each_value do |super_def|
-        list << super_def.name unless foldedbases.include?(super_def.name)
-        get_base_list(super_def.supers, folded_bases(super_def.name), list)
+        list << super_def.name unless !do_not_fold && foldedbases.include?(super_def.name)
+        get_base_list(super_def.supers, do_not_fold ? [] : folded_bases(super_def.name), list, do_not_fold: do_not_fold)
       end
       list
     end
     private :get_base_list
 
-    def base_list(classdef_or_name)
+    def base_list(classdef_or_name, do_not_fold: false)
       class_def = (Extractor::ClassDef === classdef_or_name ?
                      classdef_or_name : classdef_for_name(classdef_or_name))
       base = ifspec.inheritance_override(class_def.name)
       hierarchy = (base && (base.name ? {base.name => base} : {})) || class_def.hierarchy
-      get_base_list(hierarchy, folded_bases(class_def.name)).to_a
+      get_base_list(hierarchy, do_not_fold ? [] : folded_bases(class_def.name), do_not_fold: do_not_fold).to_a
     end
 
     def get_base_module_list(hierarchy, foldedbases, list = ::Set.new)
@@ -133,6 +136,12 @@ module WXRuby3
       get_base_module_list(hierarchy, folded_bases(class_def.name)).to_a
     end
 
+    def is_derived_from?(classdef_or_name, base_name)
+      class_def = (Extractor::ClassDef === classdef_or_name ?
+                     classdef_or_name : classdef_for_name(classdef_or_name))
+      ifspec.is_derived_from?(class_def, base_name)
+    end
+
     def is_folded_base?(cnm)
       ifspec.is_folded_base?(cnm)
     end
@@ -180,7 +189,20 @@ module WXRuby3
     def has_virtuals?(classdef_or_name)
       class_def = (Extractor::ClassDef === classdef_or_name ?
                      classdef_or_name : classdef_for_name(classdef_or_name))
-      return class_def.all_methods.any? { |m| m.is_virtual }
+      return class_def.all_methods.any? { |m| !(m.ignored || m.deprecated) && m.is_virtual }
+    end
+
+    def inherits_virtuals?(classdef_or_name)
+      class_def = (Extractor::ClassDef === classdef_or_name ?
+                     classdef_or_name : classdef_for_name(classdef_or_name))
+      base_list(class_def).any? do |base_name|
+        dir = ifspec.package.director_for_class(base_name)
+        raise "Cannot determine director for class #{base_name}" unless dir
+        dir.synchronize do
+          dir.extract_interface(false) # make sure the Director has extracted data from XML
+        end
+        Simple.new(dir).has_virtuals?(base_name)
+      end
     end
 
     def gc_type(classdef)
@@ -222,11 +244,12 @@ module WXRuby3
     def has_proxy?(classdef_or_name)
       class_def = (Extractor::ClassDef === classdef_or_name ?
                      classdef_or_name : classdef_for_name(classdef_or_name))
-      rc =!disabled_proxies
+      rc = !disabled_proxies
       rc &&= (class_def.ignored ||
           class_def.is_template? ||
           has_virtuals?(class_def) ||
-          forced_proxy?(class_def.name))
+          forced_proxy?(class_def.name) ||
+          inherits_virtuals?(class_def))
       clsnm = class_name(class_def)
       rc &&= !no_proxies.include?(clsnm)
       rc

data/rakelib/lib/director/about_dialog_info.rb

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

data/rakelib/lib/director/accelerator.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -44,7 +47,9 @@ module WXRuby3
                    (TYPE($input) == T_STRING && RSTRING_LEN($input) == 1) );
             __CODE
         end
-        spec.set_only_for('__WXMSW__', 'wxAcceleratorTable::wxAcceleratorTable(const wxString &)')
+        unless Config.instance.features_set?('__WXMSW__')
+          spec.ignore('wxAcceleratorTable::wxAcceleratorTable(const wxString &)')
+        end
         spec.add_swig_code <<~__HEREDOC
           %warnfilter(509) wxAcceleratorTable::wxAcceleratorTable;
           __HEREDOC
@@ -64,7 +69,7 @@ module WXRuby3
               for (int i = 0; i < RARRAY_LEN($input); i++)
               {
                 SWIG_ConvertPtr(rb_ary_entry($input,i), (void **) &wx_acc_ent, 
-                                SWIGTYPE_p_wxAcceleratorEntry, 1);
+                                SWIGTYPE_p_wxAcceleratorEntry, 0);
                 if (wx_acc_ent == NULL) 
                   rb_raise(rb_eTypeError, "Reference to null wxAcceleratorEntry");
                 arr[i] = *wx_acc_ent;

data/rakelib/lib/director/animation.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -57,7 +60,7 @@ module WXRuby3
             void* ptr = 0;
             int res$argnum = SWIG_ConvertPtr($result, &ptr, SWIGTYPE_p_wxImage,  0 );
             if (!SWIG_IsOK(res$argnum)) {
-              Swig::DirectorTypeMismatchException::raise(rb_eTypeError, "Expected Wx::Image result");
+              Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, "Expected Wx::Image result");
             }
             *$1 = *reinterpret_cast<wxImage*> (ptr);
           __CODE

data/rakelib/lib/director/animation_ctrl.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -15,6 +18,26 @@ module WXRuby3
 
       def setup
         super
+        if Config.instance.wx_version >= '3.3.0'
+          spec.items << 'wxAnimationBundle'
+          spec.ignore 'wxAnimationBundle::GetAll', ignore_doc: false
+          spec.add_extend_code 'wxAnimationBundle', <<~__HEREDOC
+            VALUE get_all() const
+            {
+              const std::vector<wxAnimation>& ani_list = $self->GetAll();
+              VALUE rb_ani_list = rb_ary_new();
+              for (const wxAnimation& ani : ani_list)
+              {
+                VALUE rb_ani = SWIG_NewPointerObj(new wxAnimation(ani), SWIGTYPE_p_wxAnimation, SWIG_POINTER_OWN);
+                rb_ary_push(rb_ani_list, rb_ani);
+              }
+              return rb_ani_list;
+            }
+            __HEREDOC
+          spec.map 'const std::vector<wxAnimation>&' => 'Array<Wx::Animation>', swig: false do
+            map_out code: ''
+          end
+        end
         spec.do_not_generate :variables, :enums, :defines, :functions
       end
     end # class AnimationCtrl

data/rakelib/lib/director/any_button.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -13,7 +16,7 @@ module WXRuby3
 
       def setup
         super
-        if Config.instance.wx_port == :wxQT
+        if Config.instance.wx_port == :wxqt
           # pure abstract so use wxRuby specific impl class
           spec.add_header_code <<~__HEREDOC
             class wxRubyAnyButton : public wxAnyButton

data/rakelib/lib/director/app.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event_handler'
@@ -16,7 +19,9 @@ module WXRuby3
         spec.fold_bases('wxApp' => 'wxAppConsole', 'wxAppConsole' => 'wxEventFilter')
         spec.override_inheritance_chain('wxApp', %w[wxEvtHandler wxObject])
         spec.ignore %w{
-          wxApp.ProcessMessage
+          wxApp::ProcessMessage
+          wxApp::SetDisplayMode
+          wxApp::GetDisplayMode
           wxAppConsole::OnInit
           wxAppConsole::OnExit
           wxAppConsole::OnRun
@@ -38,6 +43,7 @@ module WXRuby3
           wxAppConsole::IsScheduledForDestruction
           wxAppConsole::SetInstance
           wxAppConsole::GetInstance
+          wxAppConsole::CreateTraits
           wxAppConsole::argc
           wxAppConsole::argv
           wxDECLARE_APP
@@ -237,6 +243,14 @@ module WXRuby3
                 return;
               }
           
+              // Mark any active (tracked) log target
+              wxLog* curLog = wxLog::GetActiveTarget();
+              VALUE rb_cur_log = wxRuby_FindTracking(curLog);
+              if (!NIL_P(rb_cur_log))
+              {
+                rb_gc_mark(rb_cur_log);
+              }
+
               // Mark evt handler procs associated with live windows - see
               // classes/EvtHandler.i
               wxRuby_MarkProtectedEvtHandlerProcs();
@@ -327,7 +341,17 @@ module WXRuby3
               // Get the ruby representation of the App object, and call the
               // ruby on_init method to set up the initial window state
               VALUE the_app = rb_const_get(#{spec.package.module_variable}, rb_intern("THE_APP"));
-              VALUE result  = wxRuby_Funcall(the_app, rb_intern("on_ruby_init"), 0, 0);
+              bool ex_caught = false;
+              VALUE result  = wxRuby_Funcall(ex_caught, the_app, rb_intern("on_ruby_init"), 0, 0);
+
+              if (ex_caught)
+              {
+          #ifdef __WXRB_DEBUG__
+                wxRuby_PrintException(result);
+          #endif
+                rb_iv_set(the_app, "@exception", result);
+                result = Qfalse; // exit app
+              }
         
               // If on_init return any (ruby) true value, signal to wxWidgets to
               // enter the main event loop by returning true, else return false
@@ -357,7 +381,15 @@ module WXRuby3
               ID on_exit_id = rb_intern("on_exit");
               if (rb_funcall(the_app, rb_intern("respond_to?"), 1, ID2SYM(on_exit_id)) == Qtrue)
               {
-                wxRuby_Funcall(the_app, on_exit_id, 0, 0);
+                bool ex_caught = false;
+                VALUE rc = wxRuby_Funcall(ex_caught, the_app, on_exit_id, 0, 0);
+                if (ex_caught)
+                {
+          #ifdef __WXRB_DEBUG__
+                  wxRuby_PrintException(rc);
+          #endif
+                  rb_iv_set(the_app, "@exception", rc);
+                }
               }
 
               // perform wxRuby cleanup
@@ -456,10 +488,10 @@ module WXRuby3
             VALUE msg = rb_funcall(err, message_id(), 0);
             VALUE err_name = rb_funcall(rb_funcall(err, class_id(), 0), name_id(), 0);
             VALUE bt = rb_funcall(err, backtrace_id(), 0);
-            bt = rb_funcall(bt, join_id(), 1, rb_str_new2("\\n"));
+            bt = rb_funcall(bt, join_id(), 1, rb_str_new2("\\n\\tfrom "));
             std::cerr << std::endl
-                      << ' ' << StringValuePtr(err_name) << ": " << StringValuePtr(msg) << std::endl
-                      << StringValuePtr(bt) << std::endl;
+                      << ' ' << StringValuePtr(msg) << '(' << StringValuePtr(err_name) << ')' << std::endl
+                      << "\\tfrom " << StringValuePtr(bt) << std::endl << std::endl;
           }
           __HEREDOC
         super