wxruby3 0.9.7 → 1.0.0

data/rakelib/lib/generate/doc.rb

@@ -494,9 +494,10 @@ module WXRuby3
             when /The following event handler macros redirect.*(\{.*})/
               event_ref = $1
               "The following event-handler methods redirect the events to member method or handler blocks for #{event_ref} events."
-            when /\AEVT_[A-Z]+/
-              if event_list? && /\A(EVT_[_A-Z]+)\((.*,)\s+\w+\):(.*)/ =~ para
+            when /\AEVT_[_A-Z0-9]+/
+              if event_list? && /\A(EVT_[_A-Z0-9]+)\((.*,)\s+\w+\):(.*)/ =~ para
                 evthnd_name = $1.downcase
+                docstr = $3.lstrip
                 if override_spec = get_event_override(evthnd_name)
                   evthnd_name, evt_type, evt_arity, evt_klass = override_spec
                   idarg = case evt_arity
@@ -511,10 +512,9 @@ module WXRuby3
                 else
                   arglist = "#{$2} meth = nil, &block"
                 end
-                docstr = $3.lstrip
                 package.event_docs[evthnd_name] = [arglist, docstr.dup] # register for eventlist doc gen
                 "{Wx::EvtHandler\##{evthnd_name}}(#{arglist}): #{docstr}"
-              elsif event_list? && /\A(EVT_[_A-Z]+)(\*)?\(\w+\):(.*)/ =~ para
+              elsif event_list? && /\A(EVT_[_A-Z0-9]+)(\*)?\(\w+\):(.*)/ =~ para
                 wildcard = ($2 == '*')
                 evthnd_name = $1.downcase
                 arglist = "meth = nil, &block"
@@ -713,9 +713,9 @@ module WXRuby3
           gen_class_doc(fdoc) unless no_gen?(:classes)
         end
         package.all_modules.each do |_|
+          mod_indent -= 1
           fdoc.puts
           fdoc.iputs('end', mod_indent)
-          mod_indent -= 1
         end
       end
     end

data/rakelib/lib/generate/interface.rb

@@ -511,7 +511,7 @@ module WXRuby3
 
     def gen_interface_enum(fout, member, classdef)
       fout.puts "  // from #{classdef.name}::#{member.name}"
-      fout.puts "  enum #{member.is_anonymous ? '' : member.name} {"
+      fout.puts "  enum #{member.strong ? 'class ' : ''}#{member.is_anonymous ? '' : member.name} {"
       enum_size = member.items.size
       member.items.each_with_index do |e, i|
         fout.puts "    #{e.name}#{(i+1)<enum_size ? ',' : ''}" unless e.ignored

data/rakelib/lib/specs/interfaces.rb

@@ -233,6 +233,10 @@ module WXRuby3
     Director.Spec(pkg, 'wxPersistenceManager', requirements: %w[USE_CONFIG])
     Director.Spec(pkg, 'wxPersistentObject', requirements: %w[USE_CONFIG])
     Director.Spec(pkg, 'wxPersistentWindow', requirements: %w[USE_CONFIG])
+    Director.Spec(pkg, 'wxSecretStore', requirements: %w[USE_SECRETSTORE])
+    Director.Spec(pkg, 'wxDCOverlay', director: Director::DerivedDC)
+    Director.Spec(pkg, 'wxGeometry', requirements: %w[USE_GEOMETRY])
+    Director.Spec(pkg, 'wxAffineMatrix2D', requirements: %w[USE_GEOMETRY])
   }
 
   Director.Package('Wx::PRT', 'USE_PRINTING_ARCHITECTURE') do |pkg|

data/rakelib/lib/swig_runner.rb

@@ -264,8 +264,13 @@ module WXRuby3
             when Extractor::EnumDef
               item.items.each { |e| enumerators["#{rb_wx_name(item.name)}_#{e.name}"] = item } if item.is_type
             when Extractor::ClassDef
-              item.items.select { |itm| Extractor::EnumDef === itm }.each do |enum|
-                enum.items.each { |e| enumerators[rb_wx_name(e.name)] = enum } if enum.is_type
+              item.items.select { |itm| Extractor::EnumDef === itm && itm.is_type }.each do |enum|
+                if enum.strong
+                  enum_pfx = rb_wx_name(enum.name)
+                  enum.items.each { |e| enumerators["#{enum_pfx}_#{rb_wx_name(e.name)}"] = enum }
+                else
+                  enum.items.each { |e| enumerators[rb_wx_name(e.name)] = enum }
+                end
               end
             end
           end
@@ -295,9 +300,25 @@ module WXRuby3
                 line.sub!(/\"Wx#{core_name}::wx#{$1}/, "\"#{package.fullname}::#{$1}")
               end
 
+              # check for default reference value initializations based on temporary objects
+              # (prevent dangling references)
+              if line =~ /^(\s+)(wx\w+)\s+const\s+\&(\w+_defvalue)\s+=\s+(.*);$/
+
+                def_pfx = $1
+                def_type = $2
+                def_var = $3
+                def_val = $4.strip
+                if def_type == 'wxString'
+                  if def_val =~ /(wxString|_|wxGetTranslation)?\(?\"[^\"]*\"\)?/
+                    line = "#{def_pfx}#{def_type} #{def_var} = #{def_val};"
+                  end
+                elsif def_val =~ /^#{def_type}\(.*\)/
+                  line = "#{def_pfx}#{def_type} #{def_var} = #{def_val};"
+                end
+
               # at the top of our Init_ function, make sure we only initialize
               # ourselves once
-              if /void\s+Init_(wx|Wx)#{core_name}\(/ =~ line
+              elsif /void\s+Init_(wx|Wx)#{core_name}\(/ =~ line
                 line += "\n  static bool initialized;\n"
                 line += "  if(initialized) return;\n"
                 line += "  initialized = true;\n"

data/rakelib/lib/typemap/common.rb

@@ -262,6 +262,16 @@ module WXRuby3
 
         end
 
+        # output typemaps for common value objects like wxPoint, wxSize, wxRect and wxRealPoint,
+        # making sure to ALWAYS create managed copies
+        %w[Point Size Rect RealPoint].each do |klass|
+          map "const wx#{klass}&", "const wx#{klass}*", as: "Wx::#{klass}" do
+            map_out code: <<~__CODE
+              $result = SWIG_NewPointerObj((new wx#{klass}(*static_cast< const wx#{klass}* >($1))), SWIGTYPE_p_wx#{klass}, SWIG_POINTER_OWN);
+              __CODE
+          end
+        end
+
         # Integer <> wxItemKind type mappings
 
         map 'wxItemKind' => 'Integer' do

data/rakelib/lib/typemap/points_list.rb

@@ -47,7 +47,8 @@ module WXRuby3
                 }
                 else
                 {
-                  rb_raise(rb_eTypeError, "Wrong type for wxPoint parameter %i", i);
+                  VALUE str = rb_inspect(rb_item);
+                  rb_raise(rb_eTypeError, "Wrong type for wxPoint parameter %i (%s)", i, StringValuePtr(str));
                 }
               }
             }
@@ -101,7 +102,12 @@ module WXRuby3
               // array of all the points
               VALUE all_points = rb_funcall($input, rb_intern("flatten"), 0);
               point_arr = std::make_unique<wxPoint[]>(RARRAY_LEN(all_points));
-              wxRuby_PointArrayRubyToC(all_points, point_arr.get());
+              wxPoint* point_ptr = point_arr.get();
+              for ( int i = 0; i < RARRAY_LEN($input); i++ )
+              {
+                wxRuby_PointArrayRubyToC(rb_ary_entry($input, i), point_ptr);
+                point_ptr += count_arr[i];
+              }
               $3 = point_arr.get();
             }
             __CODE

data/rakelib/lib/typemap/richtext.rb

@@ -23,6 +23,23 @@ module WXRuby3
         # ranges of text selections with a special class. It doesn't add
         # anything much that Ruby's own range class doesn't, so deal with using
         # typemaps
+        map 'const wxRichTextRange&' => 'Range' do
+
+          map_in temp: 'wxRichTextRange rng', code: <<~__CODE
+            int start = NUM2INT( rb_funcall( $input, rb_intern("begin"), 0));
+            int end   = NUM2INT( rb_funcall( $input, rb_intern("end"), 0));
+            rng = wxRichTextRange(start, end);
+            $1 = &rng;
+            __CODE
+
+          map_typecheck precedence: 1, code: '$1 = ( CLASS_OF($input) == rb_cRange );'
+
+          map_out code: '$result = rb_range_new (LONG2NUM($1->GetStart()),LONG2NUM($1->GetEnd()),0);'
+
+          map_directorin code: '$input = rb_range_new (LONG2NUM($1.GetStart()),LONG2NUM($1.GetEnd()),0);'
+
+        end
+
         map 'wxRichTextRange&' => 'Range' do
 
           map_in temp: 'wxRichTextRange rng', code: <<~__CODE

data/rakelib/prepost.rake

@@ -29,14 +29,21 @@ namespace 'wxruby' do
       $stdout.puts 'done!' if WXRuby3.config.run_silent?
       # cleanup
       rm_rf('rakelib', verbose: !WXRuby3.config.run_silent?)
+      rm_f('Rakefile', verbose: !WXRuby3.config.run_silent?)
+      rm_f('ext/mkrf_conf_ext.rb', verbose: !WXRuby3.config.run_silent?)
       rm_rf('ext/wxruby3', verbose: !WXRuby3.config.run_silent?)
       WXRuby3.config.cleanup_bootstrap
       File.open(File.join(WXRuby3::Config.wxruby_root, 'ext', 'wxruby.setup.done'), 'w') { |f| f << '1' }
     end
 
-    task :bingem => 'gem:install' do
+    task :binpkg => 'gem:install' do
       # cleanup
       rm_rf('rakelib')
+      rm_f('Rakefile')
+      rm_f('ext/mkrf_conf_ext.rb')
+      rm_rf('ext/wxruby3')
+      rm_f('*.pkg')
+      rm_f('*.sha')
       File.open(File.join(WXRuby3::Config.wxruby_root, 'ext', 'wxruby.setup.done'), 'w') { |f| f << '1' }
     end
 

data/rakelib/yard/templates/default/fulldoc/html/css/wxruby3.css

@@ -90,4 +90,8 @@ div.wxrb-logo table td {
 
 #toc {
     position: fixed;
+    overflow-y: scroll;
+    overflow-x: hidden;
+    top: 1em;
+    bottom: 0;
 }

data/rakelib/yard/templates/default/fulldoc/html/setup.rb

@@ -4,16 +4,16 @@ def init
   # It seems YARD messes things up so that a lot of classes, modules and constants are not properly
   # registered in their enclosing namespaces.
   # This hack makes sure that if that is the case we fix that here.
-  all_objects = Registry.all(:class, :constant, :module)
+  all_objects = Registry.all(:class, :constant, :module, :method)
   all_objects.each do |c|
     if (ns = c.namespace)
       unless ns.children.any? { |nsc| nsc.path == c.path }
-        ns.children << c # class/module/constant missing from child list of enclosing namespace -> add here
+        ns.children << c # class/module/constant/method missing from child list of enclosing namespace -> add here
       end
     end
     if (ns = Registry[c.namespace.path])
       unless ns.children.any? { |nsc| nsc.path == c.path }
-        ns.children << c # class/module/constant missing from child list of enclosing namespace -> add here
+        ns.children << c # class/module/constant/method missing from child list of enclosing namespace -> add here
       end
     end
   end

data/samples/dialogs/wizard.rb

@@ -32,25 +32,26 @@ module Wizard
       evt_menu Wx::ID_EXIT, :on_quit
       evt_menu Wx::ID_ABOUT, :on_about
 
-      w = Wx::Wizard.new(self, :title => 'The WxRuby Wizard')
-      p1 = Wx::WizardPageSimple.new(w)
-      s = Wx::StaticText.new(p1, :label => 'This is the first page')
-
-      p2 = Wx::WizardPageSimple.new(w, p1)
-      p1.set_next(p2)
-      s = Wx::StaticText.new(p2, :label => 'This is the second page')
-
-      p3 = Wx::WizardPageSimple.new(w, p2)
-      p2.set_next(p3)
-      s = Wx::StaticText.new(p3, :label => 'This is the final page')
-
-      evt_wizard_page_changed(w) { p "page changed" }
-      evt_wizard_page_changing(w) { p "page changing" }
-      evt_wizard_help(w) { p "wizard help" }
-      evt_wizard_cancel(w) { p "wizard cancelled" }
-      evt_wizard_finished(w) { p "wizard finished" }
-
-      w.run_wizard(p1)
+      Wx.Wizard(self, :title => 'The WxRuby Wizard') do |w|
+        p1 = Wx::WizardPageSimple.new(w)
+        s = Wx::StaticText.new(p1, :label => 'This is the first page')
+
+        p2 = Wx::WizardPageSimple.new(w, p1)
+        p1.set_next(p2)
+        s = Wx::StaticText.new(p2, :label => 'This is the second page')
+
+        p3 = Wx::WizardPageSimple.new(w, p2)
+        p2.set_next(p3)
+        s = Wx::StaticText.new(p3, :label => 'This is the final page')
+
+        evt_wizard_page_changed(w) { p "page changed" }
+        evt_wizard_page_changing(w) { p "page changing" }
+        evt_wizard_help(w) { p "wizard help" }
+        evt_wizard_cancel(w) { p "wizard cancelled" }
+        evt_wizard_finished(w) { p "wizard finished" }
+
+        w.run_wizard(p1)
+      end
     end
 
     def on_quit

data/samples/drawing/art/drawing/smile.xpm

@@ -0,0 +1,42 @@
+/* XPM */
+static const char *const smile_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 4 1",
+". c Black",
+"X c #FFFF00",
+"  c None",
+"o c #C00000",
+/* pixels */
+"                                ",
+"             .....              ",
+"          ...XXXXX...           ",
+"        ..XXXXXXXXXXX..         ",
+"       .XXXXXXXXXXXXXXX.        ",
+"     ..XXXXXXXXXXXXXXXXX..      ",
+"     .XXXXXXXXXXXXXXXXXXXX.     ",
+"    .XXXXXX.XXXXXXX.XXXXXX.     ",
+"   .XXXXXX.X.XXXXX.X.XXXXXX.    ",
+"   .XXXXX.XXX.XXX.XXX.XXXXXX.   ",
+"  .XXXXX.XXXXXXXXXXXXX.XXXXX.   ",
+"  .XXXXXXXX.XXXXXXX.XXXXXXXX.   ",
+"  .XXXXXXXX.XXXXXXX.XXXXXXXX.   ",
+" .XXXXXXXXXXXXXXXXXXXXXXXXXXX.  ",
+" .XXXXXXXXXXXXXXXXXXXXXXXXXXX.  ",
+" .XXXXXXXXXXXXXXXXXXXXXXXXXXX.  ",
+" .XXXXXXXXXXXXXXXXXXXXXXXXXXX.  ",
+" .XXXXXXX.XXXXXXXXXXX.XXXXXXX.  ",
+"  .XXXXXX...XXXXXXX...XXXXXX.   ",
+"  .XXXXXX.oo..XXX..oo.XXXXXX.   ",
+"  .XXXXXXX.ooo...ooo.XXXXXXX.   ",
+"   .XXXXXXX.ooooooo.XXXXXXXX.   ",
+"   .XXXXXXXX..ooo..XXXXXXXX.    ",
+"    .XXXXXXXXX...XXXXXXXXX.     ",
+"     .XXXXXXXXXXXXXXXXXXXX.     ",
+"     ..XXXXXXXXXXXXXXXXX..      ",
+"       .XXXXXXXXXXXXXXX.        ",
+"        ..XXXXXXXXXXX..         ",
+"          ...XXXXX...           ",
+"             .....              ",
+"                                ",
+"                                "
+};