wxruby3 0.9.0 → 0.9.1

data/rakelib/lib/director/task_bar_icon.rb

@@ -54,7 +54,7 @@ module WXRuby3
               int swig_res = SWIG_ConvertPtr(result, &ptr, $1_descriptor, 0 | SWIG_POINTER_DISOWN);
               if (!SWIG_IsOK(swig_res))
               {
-                Swig::DirectorTypeMismatchException::raise(rb_eTypeError,
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError,
                          "create_popup_menu must return a Wx::Menu, or nil");
               }
               $result = reinterpret_cast < wxMenu * > (ptr);

data/rakelib/lib/director/tree_ctrl.rb

@@ -17,13 +17,31 @@ module WXRuby3
       include Typemap::TreeItemId
 
       def setup
-        spec.post_processors << :fixtreectrl
         spec.items.replace %w[wxTreeCtrl treebase.h]
         spec.override_inheritance_chain('wxTreeCtrl', %w[wxControl wxWindow wxEvtHandler wxObject])
         # mixin WithImages
         spec.include_mixin 'wxTreeCtrl', 'Wx::WithImages'
         spec.ignore('operator!=', 'operator==')
         spec.include 'wx/dirctrl.h'
+        # Use a custom interface class to work around the wxTreeCtrl::SortItems/OnCompareItems issue
+        # without having to patch the SWIG director class
+        spec.add_header_code <<~__HEREDOC
+          class WxRubyTreeCtrl : public wxTreeCtrl
+          {
+          public:
+            WxRubyTreeCtrl() : wxTreeCtrl() {}
+            WxRubyTreeCtrl(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
+		                       const wxSize& size = wxDefaultSize, long style = wxTR_DEFAULT_STYLE, 
+                           const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTreeCtrlNameStr)
+              : wxTreeCtrl(parent, id, pos, size, style, validator, name)
+            {}
+            virtual ~WxRubyTreeCtrl() {}
+          private:
+            DECLARE_DYNAMIC_CLASS(WxRubyTreeCtrl);
+          };
+          IMPLEMENT_DYNAMIC_CLASS(WxRubyTreeCtrl,  wxTreeCtrl);          
+          __HEREDOC
+        spec.use_class_implementation('wxTreeCtrl', 'WxRubyTreeCtrl')
         # These only differ from SetXXXList in the way memory ownership is
         # transferred. So only support the version that won't leak on wxRuby.
         spec.ignore %w[
@@ -371,47 +389,4 @@ module WXRuby3
 
   end # class Director
 
-  module SwigRunner
-    class Processor
-
-      # special post-processor for TreeCtrl
-      class Fixtreectrl < Processor
-
-        def run
-          director_found = false
-          update_source do |line|
-            # Ugly: special fixes for TreeCtrl - these macros and extra funcs
-            # are needed to allow user-defined sorting to work
-            # default ctor needed for Swig::Director
-            if line["Director(VALUE self) : swig_self(self), swig_disown_flag(false)"]
-              line = "    Director() { } // added by fixmodule.rb \n" + line
-            end
-            if line["SwigDirector_wxTreeCtrl::SwigDirector_wxTreeCtrl(VALUE self)"]
-              line = "IMPLEMENT_DYNAMIC_CLASS(SwigDirector_wxTreeCtrl,  wxTreeCtrl);\n" + line
-              director_found = true
-            end
-
-            line
-          end
-          if director_found
-            # We also need to tweak the header file
-            update_header do |line|
-              if line.strip == 'public:'
-                line << "\nSwigDirector_wxTreeCtrl() {};"
-              elsif /\A};/ =~ line
-                line = <<~__HEREDOC
-                  private:
-                  DECLARE_DYNAMIC_CLASS(SwigDirector_wxTreeCtrl);
-                  };
-                  __HEREDOC
-              end
-              line
-            end
-          end
-        end
-      end # class Fixtreectrl
-
-    end
-  end
-
 end # module WXRuby3

data/rakelib/lib/generate/doc/animation_ctrl.yaml

@@ -0,0 +1,15 @@
+---
+:wxAnimationBundle:
+  :detail:
+    :pre:
+      :programlisting:
+        - :pattern: !ruby/regexp /.*/
+          :replace: |
+            
+            ```ruby
+              animationCtrl = Wx::AnimationCtrl.new(parent, Wx::ID_ANY)
+              animations = Wx::AnimationBundle.new 
+              animations.add("throbber.gif")
+              animations.add("throbber_2x.gif")
+              animationCtrl.play if animationCtrl.set_animation(animations)
+            ```

data/rakelib/lib/generate/doc/events.yaml

@@ -57,6 +57,16 @@
               if event.get_modifiers == Wx::KeyModifier::MOD_CONTROL
                 # ... handle Ctrl-XXX ...
             ```
+:wxKeyEvent.GetRawKeyCode:
+  :detail:
+    :post:
+      - :pattern: !ruby/regexp /,\s+use\s+\#ifdef\s+\{Wx::HAS_RAW_KEY_CODES\}.*available\./
+        :subst: '.'
+:wxKeyEvent.GetRawKeyFlags:
+  :detail:
+    :post:
+      - :pattern: !ruby/regexp /,\s+use\s+\#ifdef\s+\{Wx::HAS_RAW_KEY_CODES\}.*available\./
+        :subst: '.'
 :wxMouseEvent.GetModifiers:
   :detail:
     :pre:
@@ -114,10 +124,6 @@
                   vb_pt = get_view_start # Top left corner of client
                 
                   Wx::RegionIterator.for_region(get_update_region) do |region_it|
-            
-                    int vX,vY,vW,vH                 
-                    wxRegionIterator upd(GetUpdateRegion()) # get the update rect list
-                
                     region_it.each do |rct|
                       # rct == Dimensions of client area to repaint in pixels
                 

data/rakelib/lib/generate/doc/static_box.yaml

@@ -18,6 +18,14 @@
             
               end
             ```
+    :post:
+      - :pattern: !ruby/regexp /,\s+use\s+\{Wx::HAS_WINDOW_LABEL_IN_STATIC_BOX\}.*compile-time\./
+        :subst: '.'
+:wxStaticBox.Create:
+  :detail:
+    :post:
+      - :pattern: !ruby/regexp /,\s+use\s+\{Wx::HAS_WINDOW_LABEL_IN_STATIC_BOX\}.*compile-time\./
+        :subst: '.'
 :wxStaticBox.Enable:
   :detail:
     :pre:

data/rakelib/lib/generate/doc/xml_resource.yaml

@@ -11,6 +11,9 @@
                 Wx.log_error("Couldn't load resources!")
               end
             ```
+    :post:
+      - :pattern: !ruby/regexp /If\s+\{Wx::USE_FILESYS\}.*\)\./
+        :subst: 'If {Wx::Setup::USE_FILESYSTEM} is enabled, this method understands {Wx::FileSystem} URLs.'
 :wxXmlResource.LoadDialog:
   :detail:
     :pre:

data/rakelib/lib/generate/doc.rb

@@ -172,7 +172,7 @@ module WXRuby3
               end
             end
           end
-          text.gsub!(/WX(K_[A-Z]+)/) { "{Wx::#{$1}}"}
+          text.gsub!(/WX(K_[A-Z]+)/) { "{Wx::KeyCode::#{$1}}"}
         end
         if event_section?
           case text
@@ -280,7 +280,7 @@ module WXRuby3
 
       def _ident_str_to_doc(s, ref_scope = nil)
         return s if no_idents?
-        return s if %w[wxRuby wxMSW wxOSX wxGTK wxX11].any? { |w| s.start_with?(w) }
+        return s if %w[wxRuby wxMSW wxOSX wxGTK wxX11 wxMac].any? { |w| s.start_with?(w) }
         nmlist = s.split('::')
         nm_str = nmlist.shift.to_s
         constnm = rb_wx_name(nm_str)
@@ -343,6 +343,7 @@ module WXRuby3
             mtd = $1
             args = _arglist_to_doc($2)
           end
+          # transform the scope prefix
           if DocGenerator.constants_xref_db.has_key?(constnm)
             constnm = "#{DocGenerator.constants_xref_db[constnm]['mod']}::#{constnm}"
           elsif DocGenerator.constants_xref_db.has_key?(rb_constant_name(nm_str))
@@ -355,8 +356,18 @@ module WXRuby3
             known = false
             constnm = "Wx::#{constnm}"
           end
+          # transform and append the element id
           if mtd.nil?
-            if DocGenerator.constants_xref_db.has_key?(rb_wx_name(itmnm)) || !_is_method?(itmnm, nm_str)
+            if DocGenerator.constants_xref_db.has_key?(rb_wx_name(itmnm))
+              itmnm = rb_wx_name(itmnm)
+              # in case of enum constants the documented scope most likely omits the enum class
+              # which we want for correct linking for wxRuby
+              if DocGenerator.constants_xref_db[itmnm]['mod'].start_with?("#{constnm}::")
+                ["#{DocGenerator.constants_xref_db[itmnm]['mod']}::#{rb_wx_name(itmnm)}", known]
+              else
+                ["#{constnm}::#{rb_wx_name(itmnm)}", known]
+              end
+            elsif !_is_method?(itmnm, nm_str)
               ["#{constnm}::#{rb_wx_name(itmnm)}", known]
             else
               sep = _is_static_method?(nm_str, itmnm) ? '.' : '#'

data/rakelib/lib/generate/interface.rb

@@ -590,19 +590,20 @@ module WXRuby3
           fout.puts "%constant char*  #{item.name} = #{$2};"
         elsif item.value =~ /wx(Size|Point)(\(.*\))/
           frbext = init_rb_ext_file unless frbext
-          frbext.indent { frbext.puts "#{rb_wx_name(item.name)} = Wx::#{$1}.new#{$2}" }
+          frbext.indent { frbext.puts "#{rb_constant_name(item.name)} = Wx::#{$1}.new#{$2}" }
           frbext.puts
         elsif item.value =~ /wx(Colour|Font)(\(.*\))/
           frbext = init_rb_ext_file unless frbext
           frbext.indent do
-            frbext.puts "Wx.add_delayed_constant(self, :#{rb_wx_name(item.name)}) { Wx::#{$1}.new#{$2} }"
+            frbext.puts "Wx.add_delayed_constant(self, :#{rb_constant_name(item.name)}) { Wx::#{$1}.new#{$2} }"
           end
           frbext.puts
         elsif item.value =~ /wxSystemSettings::(\w+)\((.*)\)/
           frbext = init_rb_ext_file unless frbext
+          setting_mtd = $1
           args = $2.split(',').collect {|a| rb_constant_value(a) }.join(', ')
           frbext.indent do
-            frbext.puts "Wx.add_delayed_constant(self, :#{rb_wx_name(item.name)}) { Wx::SystemSettings.#{rb_method_name($1)}(#{args}) }"
+            frbext.puts "Wx.add_delayed_constant(self, :#{rb_constant_name(item.name)}) { Wx::SystemSettings.#{rb_method_name(setting_mtd)}(#{args}) }"
           end
           frbext.puts
         else

data/rakelib/lib/specs/interfaces.rb

@@ -153,6 +153,8 @@ module WXRuby3
     Director.Spec(pkg, 'wxFileDirPickerEvent', director: Director::Event, requirements: Director.AnyOf(%w[wxUSE_DIRDLG wxUSE_DIRPICKERCTRL], %w[wxUSE_FILEDLG wxUSE_FILEPICKERCTRL]))
     Director.Spec(pkg, 'wxDirPickerCtrl', requirements: %w[wxUSE_DIRDLG wxUSE_DIRPICKERCTRL])
     Director.Spec(pkg, 'wxFilePickerCtrl', requirements: %w[wxUSE_FILEDLG wxUSE_FILEPICKERCTRL])
+    Director.Spec(pkg, 'wxFileCtrl', requirements: %w[wxUSE_FILECTRL])
+    Director.Spec(pkg, 'wxFileCtrlEvent', requirements: %w[wxUSE_FILECTRL])
     Director.Spec(pkg, 'wxProgressDialog', director: Director::Dialog)
     Director.Spec(pkg, 'wxWindowDisabler')
     Director.Spec(pkg, 'wxBusyInfo', requirements: %w[wxUSE_BUSYINFO])
@@ -176,7 +178,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxTimePickerCtrl', requirements: %w[wxUSE_TIMEPICKCTRL])
     Director.Spec(pkg, 'wxTimerEvent', director: Director::Event, requirements: %w[wxUSE_TIMER])
     Director.Spec(pkg, 'wxTimer', requirements: %w[wxUSE_TIMER])
-    Director.Spec(pkg, 'wxSashEvent', director: Director::Event, requirements: %w[wxUSE_SASH])
+    Director.Spec(pkg, 'wxSashEvent', requirements: %w[wxUSE_SASH])
     Director.Spec(pkg, 'wxSashWindow', requirements: %w[wxUSE_SASH])
     Director.Spec(pkg, 'wxSashLayoutWindow', requirements: %w[wxUSE_SASH])
     Director.Spec(pkg, 'wxQueryLayoutInfoEvent', director: Director::SashLayoutEvent)
@@ -223,6 +225,8 @@ module WXRuby3
     Director.Spec(pkg, 'wxBannerWindow', requirements: %w[wxUSE_BANNERWINDOW])
     Director.Spec(pkg, 'wxInfoBar', requirements: %w[wxUSE_INFOBAR])
     Director.Spec(pkg, 'wxFileSystem', requirements: %w[wxUSE_FILESYSTEM])
+    Director.Spec(pkg, 'wxDialUpManager', requirements: %w[wxUSE_DIALUP_MANAGER])
+    Director.Spec(pkg, 'wxDialUpEvent', requirements: %w[wxUSE_DIALUP_MANAGER])
   }
 
   Director.Package('Wx::PRT', 'wxUSE_PRINTING_ARCHITECTURE') do |pkg|

data/rakelib/lib/swig_runner.rb

@@ -224,6 +224,10 @@ module WXRuby3
               name = $1
               line['rb_funcall'] = 'wxRuby_Funcall'
               line[name] = '"%s"' % rb_method_name(name[1..-2])
+              # director output exceptions
+            when /Swig::DirectorTypeMismatchException::raise\(swig_get_self\(\),\s+\"(\w+)\"/
+              name = $1
+              line[%Q{"#{name}"}] = %Q{"#{rb_method_name(name)}"}
               # defined alias methods (original method name)
             when /rb_define_alias\s*\(.*"[_a-zA-Z0-9]+[=\?]?".*("[_a-zA-Z0-9]*[=\?\!]?")/
               name = $1
@@ -275,9 +279,6 @@ module WXRuby3
           core_name = name
           core_name = 'ruby3' if /\Awx\Z/i =~ core_name
 
-          skip_entire_method = false
-          brace_level = 0
-
           fix_enum = false
           enum_item = nil
 
@@ -288,45 +289,12 @@ module WXRuby3
               # all following fixes are applicable only before we reached the
               # Init_ function
 
-              # comment out swig_up because it is defined global in every module
-              if (line.index("bool Swig::Director::swig_up"))
-                line = "//" + line
-              end
-
-              if line =~ /char\* type_name = (RSTRING\(value\)->ptr|RSTRING_PTR\(value\));/
-                line = ""
-              end
-              # Patch submitted for SWIG 1.3.30
-              if (line.index("if (strcmp(type->name, type_name) == 0) {"))
-                line = "		if ( value != Qnil && rb_obj_is_kind_of(obj, sklass->klass) ) {"
-              end
-              #TODO 1.3.30
-              #			end
-
               # Fix the class names used to determine derived/non-derived in 'initialize' ('new')
               # wrappers
               if line =~ /const\s+char\s+\*classname\s+SWIGUNUSED\s+=\s+"Wx#{core_name}::wx(\w+)";/
                 line.sub!(/\"Wx#{core_name}::wx#{$1}/, "\"#{package.fullname}::#{$1}")
               end
 
-              # remove the UnknownExceptionHandler::handler method
-              if line.index('void UnknownExceptionHandler::handler()')
-                skip_entire_method = true
-              end
-
-              if (skip_entire_method)
-                line = "//#{line}"
-                if (line.index('{'))
-                  brace_level += 1
-                end
-                if (line.index('}'))
-                  brace_level -= 1
-                end
-                if (brace_level == 0)
-                  skip_entire_method = false
-                end
-              end
-
               # at the top of our Init_ function, make sure we only initialize
               # ourselves once
               if /void\s+Init_(wx|Wx)#{core_name}\(/ =~ line
@@ -358,20 +326,6 @@ module WXRuby3
                 line << "\n  wxRuby_SetSwigTypeForClass(#{$2}.klass, #{$1});"
               end
 
-              # TODO : can we improve this?
-              # Fix for Event.i - because it is implemented with a custom Ruby
-              # subclass, need to make this subclass SWIG info available under
-              # the normal name "SWIGTYPE_p_wxEvent" as it's referenced by many
-              # other classes.
-              if core_name == 'Event' or core_name == 'CommandEvent'
-                if line[/SWIG_TypeClientData\(SWIGTYPE_p_wxRuby(Command)?Event/]
-                  line = line +
-                    "  // Inserted by fixmodule.rb\n" +
-                    line.sub(/SWIGTYPE_p_wxRuby(Command)?Event/,
-                             "SWIGTYPE_p_wx\\1Event")
-                end
-              end
-
               # check for known enumerator constants
               if (md = /rb_define_const\s*\(([^,]+),\s*"([_a-zA-Z0-9]*)"(.*)/.match(line)) # constant definition?
                 if !fix_enum # not fixing one yet

data/rakelib/lib/typemap/common.rb

@@ -215,7 +215,7 @@ module WXRuby3
             if ( TYPE($input) == T_DATA )
             {
               void* argp$argnum;
-              SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 1 );
+              SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 0);
               $1 = reinterpret_cast< $1_basetype * >(argp$argnum);
             }
             else if ( TYPE($input) == T_ARRAY )
@@ -240,6 +240,28 @@ module WXRuby3
             __CODE
         end
 
+        map 'wxSize' => 'Array(Integer, Integer), Wx::Size',
+            'wxPoint' => 'Array(Integer, Integer), Wx::Point' do
+
+          map_directorout code: <<~__CODE
+            if (TYPE($input) == T_ARRAY && RARRAY_LEN($input) == 2)
+            {
+              $result = $1_basetype(NUM2INT( rb_ary_entry($input, 0)),
+                                    NUM2INT( rb_ary_entry($input, 1)));
+            }
+            else
+            {
+              void *ptr;
+              int res = SWIG_ConvertPtr($input, &ptr, $&1_descriptor, SWIG_POINTER_NO_NULL);
+              if (!SWIG_IsOK(res)) {
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", SWIG_ErrorType(SWIG_ArgError(res)), "in output value of type '""$1_type""'");
+              }
+              $result = *(reinterpret_cast< $1_type * >(ptr));
+            }
+            __CODE
+
+        end
+
         # Integer <> wxItemKind type mappings
 
         map 'wxItemKind' => 'Integer' do
@@ -456,12 +478,10 @@ module WXRuby3
         end
 
 
-        # Validators must be cast to correct subclass, but internal validator
-        # is a clone, and should not be freed, so disown after wrapping.
+        # Validators must be cast to correct subclass, but not owned
         map 'wxValidator*' => 'Wx::Validator' do
           map_out code: <<~__CODE
             $result = wxRuby_WrapWxObjectInRuby($1);
-            if (!NIL_P($result)) RDATA($result)->dfree = SWIG_RubyRemoveTracking;
             __CODE
         end
 
@@ -633,11 +653,6 @@ module WXRuby3
           end
         end
 
-        # special case bc SWIG causes trouble in Window.cpp
-        map 'const wxRegion&', 'const wxRegion*', as: 'Wx::Region' do
-          map_out code: '$result = wxRuby_WrapWxObjectInRuby(new wxRegion(*static_cast<const wxRegion*> ($1)));'
-        end
-
         # add type mapping for wxVariant input args
         intypes = 'nil,String,Integer,Float,Time,Wx::Font,Wx::Colour,Wx::Variant,Array<WxVariant>,Array<String>,Object'
         if Config.instance.features_set?('wxUSE_PROPGRID')

data/rakelib/lib/typemap/data_format.rb

@@ -63,7 +63,7 @@ module WXRuby3
               void* tmp;
               SWIG_ConvertPtr(rb_ary_entry(result, i),
                               &tmp,
-              SWIGTYPE_p_wxDataFormat, 0);
+                              SWIGTYPE_p_wxDataFormat, 0);
               wxDataFormat* fmt = reinterpret_cast< wxDataFormat* >(tmp);
               $1[i] = *fmt;
             }

data/rakelib/lib/typemap/data_object_data.rb

@@ -30,7 +30,7 @@ module WXRuby3
             void* argp$argnum = NULL;
             if ( TYPE($input) == T_DATA )
             {
-              if (SWIG_IsOK(SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, $argnum-1)) && argp$argnum)
+              if (SWIG_IsOK(SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 0)) && argp$argnum)
               {
                 $1 = reinterpret_cast< $1_basetype * >(argp$argnum);
               }
@@ -69,7 +69,7 @@ module WXRuby3
               }
               else
               {
-                Swig::DirectorTypeMismatchException::raise(rb_eTypeError, 
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, 
                                                            "get_data_here should return a string, or nil on failure");
               }
             }

data/rakelib/lib/typemap/pgprop_arg.rb

@@ -20,6 +20,11 @@ module WXRuby3
       define do
 
         map 'const wxPGPropArgCls&' => 'String,Wx::PG::PGProperty' do
+
+          add_header_code <<~__CODE
+            static WxRuby_ID s_pg_property_id("PGProperty");
+            __CODE
+
           map_in temp: 'wxPGPropArgCls temp = (wxPGProperty *)0', code: <<~__CODE
             if (!NIL_P($input))
             {
@@ -29,12 +34,12 @@ module WXRuby3
               }
               else if (TYPE($input) == T_DATA)
               {
-                VALUE rb_klass = rb_const_get(mWxPG, rb_intern("PGProperty"));
+                VALUE rb_klass = rb_const_get(mWxPG, s_pg_property_id());
                 if (rb_obj_is_kind_of($input, rb_klass))
                 {
                   swig_type_info* swig_type = wxRuby_GetSwigTypeForClass(rb_klass);
                   wxPGProperty *pgprop = (wxPGProperty *)0;
-                  SWIG_ConvertPtr($input, SWIG_as_voidptrptr(&pgprop), swig_type, SWIG_POINTER_DISOWN);
+                  SWIG_ConvertPtr($input, SWIG_as_voidptrptr(&pgprop), swig_type, 0);
                   temp = wxPGPropArgCls(pgprop);
                 }
                 else

data/rakelib/lib/typemap/points_list.rb

@@ -29,28 +29,26 @@ module WXRuby3
           add_header_code <<~__CODE
             static void wxRuby_PointArrayRubyToC(VALUE rb_arr, wxPoint wx_arr[]) 
             {
-              wxPoint *wx_point;
               VALUE rb_item;
               for (int i = 0; i < RARRAY_LEN(rb_arr); i++)
               {
                 rb_item = rb_ary_entry (rb_arr, i);
                 if (TYPE(rb_item) == T_DATA)
                 {
+                    wxPoint *wx_point;
                     SWIG_ConvertPtr (rb_item, (void **) &wx_point,
-                                     SWIGTYPE_p_wxPoint, 1);
+                                     SWIGTYPE_p_wxPoint, 0);
+                    wx_arr[i] = *wx_point;
                 }
                 else if (TYPE(rb_item) == T_ARRAY && RARRAY_LEN(rb_item) == 2)
                 {
-                  wx_point = new wxPoint (NUM2INT( rb_ary_entry(rb_item, 0)),
-                    NUM2INT(rb_ary_entry (rb_item, 1)));
-                  // Create a ruby object so the C++ obj is freed when GC runs
-                  SWIG_NewPointerObj (wx_point, SWIGTYPE_p_wxPoint, 1);
+                  wx_arr[i] = wxPoint (NUM2INT( rb_ary_entry(rb_item, 0)),
+                                       NUM2INT(rb_ary_entry (rb_item, 1)));
                 }
                 else
                 {
                   rb_raise(rb_eTypeError, "Wrong type for wxPoint parameter %i", i);
                 }
-                wx_arr[i] = *wx_point;
               }
             }
             __CODE

data/rakelib/lib/util/string.rb

@@ -91,14 +91,18 @@ module WXRuby3
       end
 
       def rb_constant_value(name)
-        val = name.sub(/\Awx/, 'Wx::')
-        case val
-        when /NULL|nullptr/
+        name = name.strip
+        case name
+        when /\A(null|nullptr)\Z/i
           'nil'
+        when /\A(true|false)\Z/i
+          name.downcase
         when /EmptyString/
           %q['']
+        when /\A\"/
+          name
         else
-          val
+          "#{name.start_with?('wx') ? 'Wx::' : ''}#{rb_constant_name(name)}"
         end
       end
 
@@ -110,7 +114,7 @@ module WXRuby3
           ids = idstr.split('::')
           if ids.size > 1
             is_scoped = true
-            scoped_name = rb_constant_value(ids.shift)
+            scoped_name = rb_wx_name(ids.shift)
             while ids.size > 1
               scoped_name << '::' << ids.shift
             end
@@ -127,7 +131,7 @@ module WXRuby3
               when 'wxString'
                 '('
               else
-                "#{rb_constant_value(idstr)}.new("
+                "#{idstr.start_with?('wx') ? 'Wx::' : ''}#{rb_wx_name(idstr)}.new("
               end
             end
           else
@@ -143,8 +147,6 @@ module WXRuby3
               # constant
               if /[\-\+\.\d]+/ =~ idstr
                 idstr # numeric constant
-              elsif /\A(true|false|NULL|nullptr)/ =~ idstr
-                ($1 == 'NULL' || $1 == 'nullptr') ? 'nil' : $1
               else
                 if const_xref.has_key?(rb_constant_name(idstr))
                   "#{const_xref[rb_constant_name(idstr)]['mod']}::#{rb_constant_name(idstr)}"

data/samples/text/richtext.rb

@@ -1432,36 +1432,6 @@ class MyFrame < Wx::Frame
 
   end
 
-  # Forward command events to the current rich text control, if any
-  def try_before(event)
-    if event.is_command_event && !event.is_a?(Wx::ChildFocusEvent)
-      # Problem: we can get infinite recursion because the events
-      # climb back up to this frame, and repeat.
-      # Assume that command events don't cause another command event
-      # to be called, so we can rely on inCommand not being overwritten
-
-      if MyFrame.win_id != event.id && MyFrame.event_type != event.event_type
-        MyFrame.event_type = event.event_type
-        MyFrame.win_id = event.id
-        focusWin = Wx.find_focus_descendant(self)
-        focusWin = @richTextCtrl unless focusWin
-
-        if focusWin && focusWin.get_event_handler.process_event(event)
-          MyFrame.event_type = 0
-          MyFrame.win_id = 0
-          return true
-        end
-
-        MyFrame.event_type = 0
-        MyFrame.win_id = 0
-      else
-        return false
-      end
-    end
-
-    false
-  end
-
   # Write text
   def write_initial_text
     r = @richTextCtrl

data/tests/test_app_exit_exception.rb

@@ -0,0 +1,36 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require 'test/unit'
+require 'wx'
+
+class TestApp < Test::Unit::TestCase
+
+  class TestFrame < Wx::Frame
+    def initialize
+      super(nil, -1, '')
+      evt_paint { on_paint }
+    end
+
+    def on_paint
+      paint {}
+      close
+    end
+  end
+
+  class TestApp < Wx::App
+    def on_init
+      TestFrame.new.show
+    end
+
+    def on_exit
+      raise RuntimeError, 'on_exit exception'
+    end
+  end
+
+  def test_self_closing_frame
+    assert_raise_kind_of(RuntimeError) { TestApp.run }
+  end
+
+end

data/tests/test_app_init_exception.rb

@@ -0,0 +1,20 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require 'test/unit'
+require 'wx'
+
+class AppInitExitExceptions < Test::Unit::TestCase
+
+  class TestApp < Wx::App
+    def on_init
+      raise RuntimeError, 'on_init exception'
+    end
+  end
+
+  def test_on_init_exception
+    assert_raise_kind_of(RuntimeError) { TestApp.run }
+  end
+
+end