wxruby3 0.9.0.pre.rc.1 → 0.9.0.pre.rc.3

data/rakelib/lib/generate/interface.rb

@@ -99,18 +99,19 @@ module WXRuby3
       __HEREDOC
     end
 
-    def gen_mixin_convert_code(fout, cls, mod)
+    def gen_mixin_convert_code(fout, cls, mod, ctype)
       rb_mod_name = mod.split('::').last
+      ctype ||= "wx#{rb_mod_name}"
       decl_flag = (mod.start_with?(package.fullname) ? 'WXRB_EXPORT_FLAG' : 'WXRB_IMPORT_FLAG') # same package (dll) or import?
       fout.puts
       fout << <<~__HEREDOC
-          // Mixin converter for wx#{rb_mod_name} included in #{cls} 
-          typedef wx#{rb_mod_name}* (*wx_#{underscore(rb_mod_name)}_convert_fn)(void*); 
+          // Mixin converter for #{ctype} (#{mod}) included in #{cls} 
+          typedef #{ctype}* (*wx_#{underscore(rb_mod_name)}_convert_fn)(void*); 
           #{decl_flag} void wxRuby_Register_#{rb_mod_name}_Include(swig_class* cls_info, 
                                                                               wx_#{underscore(rb_mod_name)}_convert_fn converter);
-          static wx#{rb_mod_name}* wxRuby_ConvertTo_#{rb_mod_name}(void* ptr)
+          static #{ctype}* wxRuby_ConvertTo_#{rb_mod_name}(void* ptr)
           {
-            return ((wx#{rb_mod_name}*) static_cast<#{cls}*> (ptr));
+            return ((#{ctype}*) static_cast<#{cls}*> (ptr));
           }
       __HEREDOC
     end
@@ -147,7 +148,7 @@ module WXRuby3
           mixins.each { |name| gen_mixin_code(fout, name) }
         end
         unless included_mixins.empty?
-          included_mixins.each_pair {|cls, mods| mods.each { |mod| gen_mixin_convert_code(fout, cls, mod) } }
+          included_mixins.each_pair {|cls, mods| mods.each_pair { |mod, ctype| gen_mixin_convert_code(fout, cls, mod, ctype) } }
         end
         fout.puts "%}"
       end
@@ -215,8 +216,8 @@ module WXRuby3
       end
       unless included_mixins.empty?
         fout.puts
-        included_mixins.each_pair do |cls, module_names|
-          module_names.each { |m| fout.puts %Q{%mixin #{cls} "#{m}";} }
+        included_mixins.each_pair do |cls, modules|
+          modules.keys.each { |m| fout.puts %Q{%mixin #{cls} "#{m}";} }
         end
       end
     end
@@ -240,8 +241,8 @@ module WXRuby3
         end
         unless included_mixins.empty?
           fout.puts
-          included_mixins.each_pair do |cls, module_names|
-            module_names.each do |modname|
+          included_mixins.each_pair do |cls, modules|
+            modules.keys.each do |modname|
               m = modname.split('::').last
               fout.puts %Q{wxRuby_Register_#{m}_Include(&SwigClassWx#{rb_wx_name(cls)}, wxRuby_ConvertTo_#{m});}
             end

data/rakelib/lib/specs/interfaces.rb

@@ -17,6 +17,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxEvtHandler')
     Director.Spec(pkg, 'wxEvents')
     Director.Spec(pkg, 'wxEventFilter')
+    Director.Spec(pkg, 'wxGUIEventLoop')
     Director.Spec(pkg, 'wxApp')
     Director.Spec(pkg, 'wxDC')
     Director.Spec(pkg, 'wxWindowDC', director: Director::DerivedDC)
@@ -177,7 +178,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxDataObjectSimpleBase', requirements: %w[wxUSE_CLIPBOARD])
     Director.Spec(pkg, 'wxClipboard', requirements: %w[wxUSE_CLIPBOARD])
     Director.Spec(pkg, 'wxDragDrop', requirements: %w[wxUSE_DRAG_AND_DROP])
-    Director.Spec(pkg, 'wxContextHelpButton', director: Director::Button, requirements: %w[wxUSE_HELP])
+    Director.Spec(pkg, 'wxContextHelpButton', requirements: %w[wxUSE_HELP])
     Director.Spec(pkg, 'wxHelpProvider', requirements: %w[wxUSE_HELP])
     Director.Spec(pkg, 'wxHelpController', requirements: %w[wxUSE_HELP])
     Director.Spec(pkg, 'wxExtHelpController', director: Director::HelpController, requirements: %w[wxUSE_HELP])
@@ -200,6 +201,9 @@ module WXRuby3
     Director.Spec(pkg, 'wxPlatformInfo')
     Director.Spec(pkg, 'wxSplashScreen', requirements: %w[wxUSE_SPLASH])
     Director.Spec(pkg, 'wxUIActionSimulator', requirements: %w[wxUSE_UIACTIONSIMULATOR])
+    Director.Spec(pkg, 'wxActivityIndicator', director: Director::Window, requirements: %w[wxUSE_ACTIVITYINDICATOR])
+    Director.Spec(pkg, 'wxHyperlinkCtrl', director: Director::Window, requirements: %w[wxUSE_HYPERLINKCTRL])
+    Director.Spec(pkg, 'wxHyperlinkEvent', requirements: %w[wxUSE_HYPERLINKCTRL])
   }
 
   Director.Package('Wx::PRT', 'wxUSE_PRINTING_ARCHITECTURE') do |pkg|

data/rakelib/lib/swig_runner.rb

@@ -481,6 +481,43 @@ module WXRuby3
         end
       end
 
+      # Updates SWIG generated wrapper code for disowned allocation modules.
+      class FixDisownedAlloc < Processor
+
+        def run
+          # get the generated (class) items which have been defined to need disowned allocation
+          class_list = def_items.select { |itm| Extractor::ClassDef === itm && allocate_disowned?(itm) }
+          # setup a table with the required tracking methods for each class
+          track_table = class_list.inject({}) do |tbl, clsdef|
+            tbl[clsdef.name] = (gc_type(clsdef) == :GC_MANAGE_AS_UNTRACKED) ? '0' : 'SWIG_RubyRemoveTracking'
+            tbl
+          end
+          # create re match list for class names
+          cls_re_txt = class_list.collect { |clsdef| clsdef.name }.join('|')
+          # updating any matching alloc functions in generated SWIG sourcecode
+          # create regexp for 'initialize' wrappers (due to overloads this could be more than one per class)
+          alloc_re = /_wrap_(#{cls_re_txt})_allocate\(int\s+argc.*\)/
+          found_alloc = false
+          cpp_class = nil
+          update_source do |line|
+            if found_alloc # inside 'xxx_allocate' wrapper?
+              if line =~ /\A(\s*)return\s+vresult;/
+                # insert an override for the free method to disown the new instance
+                line = "#{$1}RDATA(vresult)->dfree = #{track_table[cpp_class]};\n#{line}"
+              elsif /\A}/ =~ line # end of wrapper function?
+                # stop matching
+                found_alloc = false
+              end
+            elsif alloc_re =~ line # are we at an 'xxx_allocate' wrapper?
+              found_alloc = true
+              cpp_class = $1
+            end
+            line
+          end
+        end
+
+      end
+
       # Updates SWIG generated wrapper code for Mixin modules.
       class FixInterfaceMixin < Processor