wxruby3 0.9.5-x64-mingw-ucrt → 0.9.7-x64-mingw-ucrt

data/lib/wx/doc/gen/std_dialog_button_sizer.rb

@@ -86,4 +86,4 @@ module Wx
   end # StdDialogButtonSizer
   
 
-end
+  end

data/lib/wx/doc/gen/svg_file_dc.rb

@@ -157,4 +157,4 @@ module Wx
   end # SVGBitmapEmbedHandler
   
 
-end
+  end

data/lib/wx/doc/gen/system_options.rb

@@ -124,4 +124,4 @@ module Wx
   end # SystemOptions
   
 
-end
+  end

data/lib/wx/doc/gen/system_settings.rb

@@ -484,4 +484,4 @@ module Wx
   end # SystemSettings
   
 
-end
+  end

data/lib/wx/doc/gen/task_bar_button.rb

@@ -321,4 +321,4 @@ module Wx
   end # ThumbBarButton
   
 
-end
+  end

data/lib/wx/doc/gen/task_bar_icon.rb

@@ -116,4 +116,4 @@ module Wx
   end # TaskBarIcon
   
 
-end
+  end

data/lib/wx/doc/gen/task_bar_icon_event.rb

@@ -85,4 +85,4 @@ module Wx
   end # TaskBarIconEvent
   
 
-end
+  end

data/lib/wx/doc/gen/text_attr.rb

@@ -690,4 +690,4 @@ module Wx
   end # TextAttr
   
 
-end
+  end

data/lib/wx/doc/gen/text_ctrl.rb

@@ -874,4 +874,4 @@ module Wx
   end # TextCtrl
   
 
-end
+  end

data/lib/wx/doc/gen/text_entry.rb

@@ -433,4 +433,4 @@ module Wx
   end # TextCompleterSimple
   
 
-end
+  end

data/lib/wx/doc/gen/text_entry_dialog.rb

@@ -179,4 +179,4 @@ module Wx
   end # PasswordEntryDialog
   
 
-end
+  end

data/lib/wx/doc/gen/text_validator.rb

@@ -242,4 +242,4 @@ module Wx
   end # TextValidator
   
 
-end
+  end

data/lib/wx/doc/gen/time_picker_ctrl.rb

@@ -106,4 +106,4 @@ module Wx
   end # TimePickerCtrl
   
 
-end
+  end

data/lib/wx/doc/gen/timer.rb

@@ -116,4 +116,4 @@ module Wx
   end # Timer
   
 
-end
+  end

data/lib/wx/doc/gen/timer_event.rb

@@ -65,4 +65,4 @@ module Wx
   end # TimerEvent
   
 
-end
+  end

data/lib/wx/doc/gen/tip_provider.rb

@@ -60,4 +60,4 @@ module Wx
   end # TipProvider
   
 
-end
+  end

data/lib/wx/doc/gen/toggle_button.rb

@@ -149,4 +149,4 @@ module Wx
   end # BitmapToggleButton
   
 
-end
+  end

data/lib/wx/doc/gen/tool_bar.rb

@@ -871,4 +871,4 @@ module Wx
   end # ToolBarToolBase
   
 
-end
+  end

data/lib/wx/doc/gen/tool_tip.rb

@@ -98,4 +98,4 @@ module Wx
   end # ToolTip
   
 
-end
+  end

data/lib/wx/doc/gen/toolbook.rb

@@ -105,4 +105,4 @@ module Wx
   end # Toolbook
   
 
-end
+  end

data/lib/wx/doc/gen/top_level_window.rb

@@ -479,4 +479,4 @@ module Wx
   end # TopLevelWindow
   
 
-end
+  end

data/lib/wx/doc/gen/tree_ctrl.rb

@@ -975,4 +975,4 @@ module Wx
   end # TreeCtrl
   
 
-end
+  end

data/lib/wx/doc/gen/tree_event.rb

@@ -124,4 +124,4 @@ module Wx
   end # TreeEvent
   
 
-end
+  end

data/lib/wx/doc/gen/treebook.rb

@@ -167,4 +167,4 @@ module Wx
   end # Treebook
   
 
-end
+  end

data/lib/wx/doc/gen/ui_action_simulator.rb

@@ -106,4 +106,4 @@ module Wx
   end # UIActionSimulator
   
 
-end
+  end

data/lib/wx/doc/gen/utils.rb

@@ -294,4 +294,4 @@ module Wx
   def self.shutdown(flags=Wx::SHUTDOWN_POWEROFF) end
   
 
-end
+  end

data/lib/wx/doc/gen/v_list_box.rb

@@ -256,4 +256,4 @@ module Wx
   end # VListBox
   
 
-end
+  end

data/lib/wx/doc/gen/v_scrolled_window.rb

@@ -237,4 +237,4 @@ module Wx
   end # VScrolledWindow
   
 
-end
+  end

data/lib/wx/doc/gen/validator.rb

@@ -69,4 +69,4 @@ module Wx
   end # Validator
   
 
-end
+  end

data/lib/wx/doc/gen/variant.rb

@@ -291,4 +291,4 @@ module Wx
   end # Variant
   
 
-end
+  end

data/lib/wx/doc/gen/window.rb

@@ -2875,4 +2875,4 @@ module Wx
   end # VisualAttributes
   
 
-end
+  end

data/lib/wx/doc/gen/window_dc.rb

@@ -35,4 +35,4 @@ module Wx
   end # WindowDC
   
 
-end
+  end

data/lib/wx/doc/gen/window_disabler.rb

@@ -27,4 +27,4 @@ module Wx
   end # WindowDisabler
   
 
-end
+  end

data/lib/wx/doc/gen/with_images.rb

@@ -81,4 +81,4 @@ module Wx
   end # WithImages
   
 
-end
+  end

data/lib/wx/doc/gen/wizard.rb

@@ -224,4 +224,4 @@ module Wx
   end # Wizard
   
 
-end
+  end

data/lib/wx/doc/gen/wizard_event.rb

@@ -110,4 +110,4 @@ module Wx
   end # WizardEvent
   
 
-end
+  end

data/lib/wx/doc/gen/wizard_page.rb

@@ -62,4 +62,4 @@ module Wx
   end # WizardPage
   
 
-end
+  end

data/lib/wx/doc/gen/wizard_page_simple.rb

@@ -75,4 +75,4 @@ module Wx
   end # WizardPageSimple
   
 
-end
+  end

data/lib/wx/doc/gen/wrap_sizer.rb

@@ -66,4 +66,4 @@ module Wx
   end # WrapSizer
   
 
-end
+  end

data/lib/wx/doc/gen/xml_node.rb

@@ -314,4 +314,4 @@ module Wx
   end # XmlNode
   
 
-end
+  end

data/lib/wx/doc/gen/xml_resource.rb

@@ -342,4 +342,4 @@ module Wx
   end # XmlResource
   
 
-end
+  end

data/lib/wx/rtc/ext/rich_text_ctrl.rb

@@ -10,15 +10,15 @@ module Wx
 
   RICHTEXT_DEFAULT_IMAGE_SIZE = Wx::Size.new(80, 80)
 
-  Wx.add_delayed_constant(self, :RICHTEXT_DEFAULT_UNFOCUSSED_BACKGROUND) { Wx::Colour.new(175, 175, 175) }
+  Wx.add_delayed_constant(self, :RICHTEXT_DEFAULT_UNFOCUSSED_BACKGROUND, 'Wx::Colour.new(175, 175, 175)') { Wx::Colour.new(175, 175, 175) }
 
-  Wx.add_delayed_constant(self, :RICHTEXT_DEFAULT_FOCUSSED_BACKGROUND) { Wx::Colour.new(140, 140, 140) }
+  Wx.add_delayed_constant(self, :RICHTEXT_DEFAULT_FOCUSSED_BACKGROUND, 'Wx::Colour.new(140, 140, 140)') { Wx::Colour.new(140, 140, 140) }
 
-  Wx.add_delayed_constant(self, :RICHTEXT_DEFAULT_UNSELECTED_BACKGROUND) { Wx::SystemSettings.get_colour(Wx::SYS_COLOUR_3DFACE) }
+  Wx.add_delayed_constant(self, :RICHTEXT_DEFAULT_UNSELECTED_BACKGROUND, 'Wx::SystemSettings.get_colour(Wx::SYS_COLOUR_3DFACE)') { Wx::SystemSettings.get_colour(Wx::SYS_COLOUR_3DFACE) }
 
-  Wx.add_delayed_constant(self, :RICHTEXT_DEFAULT_TYPE_COLOUR) { Wx::Colour.new(0, 0, 200) }
+  Wx.add_delayed_constant(self, :RICHTEXT_DEFAULT_TYPE_COLOUR, 'Wx::Colour.new(0, 0, 200)') { Wx::Colour.new(0, 0, 200) }
 
-  Wx.add_delayed_constant(self, :RICHTEXT_DEFAULT_FOCUS_RECT_COLOUR) { Wx::Colour.new(100, 80, 80) }
+  Wx.add_delayed_constant(self, :RICHTEXT_DEFAULT_FOCUS_RECT_COLOUR, 'Wx::Colour.new(100, 80, 80)') { Wx::Colour.new(100, 80, 80) }
 
   end
 end

data/lib/wx/version.rb

@@ -3,5 +3,5 @@
 # This software is released under the MIT license.
 
 module Wx
-  WXRUBY_VERSION    = '0.9.5'
+  WXRUBY_VERSION    = '0.9.7'
 end

data/lib/wx/wxruby/base.rb

@@ -25,12 +25,15 @@ module WxRuby
       end
       private :commands
 
+      def setup_done?
+        File.exist?(File.join(WxRuby::ROOT, 'ext', 'wxruby.setup.done'))
+      end
+
       def options
         @options ||= {
           :verbose => false
         }
       end
-      private :options
 
       def register(cmdid, cmdhandler)
         commands[cmdid.to_s] = case
@@ -59,7 +62,7 @@ module WxRuby
       def parse_args(args)
         opts = OptionParser.new
         opts.banner = "Usage: wxruby [global options] COMMAND [arguments]\n\n" +
-            "    COMMAND\t\t\tSpecifies wxruby command to execute."
+            "    COMMAND\t\t\t\tSpecifies wxruby command to execute."
         opts.separator ''
         opts.on('-v', '--verbose',
                 'Show verbose output') { |v| ::WxRuby::Commands.options[:verbose] = true }
@@ -70,8 +73,7 @@ module WxRuby
           describe_all
           exit(0)
         end
-        opts.raise_unknown = false
-        opts.parse!(args)
+        opts.order!(args)
       end
     end
   end

data/lib/wx/wxruby/cmd/sampler.rb

@@ -10,44 +10,54 @@ require 'fileutils'
 module WxRuby
   module Commands
     class Sampler
-      OPTIONS = {
-        save_path: nil
-      }
+
+      DESC = 'Run wxRuby3 Sampler application (or copy samples).'
 
       def self.description
-        "    sampler [help]|[copy DEST]\tRun wxRuby3 Sampler application (or copy samples)."
+        "    sampler -h|[options]\t\t#{DESC}"
+      end
+
+      def self.options
+        Commands.options['sampler'] ||= { verbose: Commands.options[:verbose] }
+      end
+
+      def self.parse_args(args)
+        opts = OptionParser.new
+        opts.banner = "#{DESC}\n\nUsage: wxruby sampler -h|--help OR wxruby sampler [options]\n\n" +
+          "Runs the sampler application if no options specified.\n\n"
+        opts.separator ''
+        opts.on('--copy=DEST',
+                'Copies the included wxRuby sample folders under the directory indicated by DEST (MUST exist)')  {|v| Sampler.options[:copy] << v }
+        opts.on('-h', '--help',
+                'Show this message.') do |v|
+          puts opts
+          puts
+          exit(0)
+        end
+        opts.parse!(args)
       end
 
       def self.run(argv)
-        if argv == :describe
-          description
-        else
-          if argv.empty?
-            exec(RUBY, File.join(WxRuby::ROOT, 'samples', 'sampler.rb'))
-          else
-            arg = argv.shift
-            if arg == 'help'
-              puts 'Usage: wxruby [global options] sampler [help]|[copy DEST]'
-              puts
-              puts '    Starts the sampler application if called without arguments.'
-              puts '    Otherwise shows this help for argument "help" or copies the included wxRuby'
-              puts '    sample folders under the directory indicated by DEST for argument "copy DEST".'
-              puts '    The directory indicated by DEST *must* already exist.'
-              puts
-            elsif arg == 'copy'
-              unless File.directory?(dest = argv.shift)
-                STDERR.puts "ERROR: Invalid destination folder #{dest}"
-                exit(1)
-              end
-              Dir[File.join(WxRuby::ROOT, 'samples', '*')].each do |fp|
-                FileUtils.cp_r(fp, dest, verbose: true)
-              end
-            end
+        return description if argv == :describe
+
+        parse_args(argv)
+
+        if options[:copy]
+          unless File.directory?(dest = options[:copy])
+            $stderr.puts "ERROR: Invalid destination folder #{dest}"
+            exit(1)
           end
+          Dir[File.join(WxRuby::ROOT, 'samples', '*')].each do |fp|
+            FileUtils.cp_r(fp, dest, verbose: true)
+          end
+        else
+          exec(RUBY, File.join(WxRuby::ROOT, 'samples', 'sampler.rb'))
         end
       end
     end
 
-    self.register('sampler', Sampler)
+    if self.setup_done?
+      self.register('sampler', Sampler)
+    end
   end
 end

data/lib/wx/wxruby/cmd/setup.rb

@@ -0,0 +1,122 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+# wxruby setup command handler
+#--------------------------------------------------------------------
+
+require 'fileutils'
+
+module WxRuby
+  module Commands
+    class Setup
+
+      DESC = 'Run wxRuby3 post-install setup.'
+
+      def self.description
+        "    setup -h|[options]\t\t#{DESC}"
+      end
+
+      def self.options
+        Commands.options['setup'] ||= { verbose: Commands.options[:verbose] }
+      end
+
+      def self.parse_args(args)
+        opts = OptionParser.new
+        opts.banner = "#{DESC}\n\nUsage: wxruby setup -h|--help OR wxruby setup [options]\n\n"
+        opts.separator ''
+        opts.on('--wxwin=path',
+                "the installation root for the wxWidgets libraries and headers if not using the system default")  {|v| Setup.options['wxwin'] = File.expand_path(v)}
+        opts.on('--wxxml=path',
+                "the path to the doxygen generated wxWidgets XML interface specs if not using bootstrap")  {|v| Setup.options['wxxml'] = File.expand_path(v)}
+        opts.on('--with-wxwin',
+                "build a local copy of wxWidgets for use with wxRuby [false]")  {|v| Setup.options['with-wxwin'] = true}
+        opts.on('--swig=path',
+                "the path to swig executable [swig]")  {|v| Setup.options['swig'] = v}
+        opts.on('--doxygen=path',
+                "the path to doxygen executable [doxygen]")  {|v| Setup.options['doxygen'] = v}
+        opts.on('--git=path',
+                "the path to git executable [git]")  {|v| Setup.options['git'] = v}
+        opts.on('--[no-]autoinstall',
+                "do (not) attempt to automatically install any required packages")  {|v| Setup.options['autoinstall'] = !!v }
+        opts.on('--log=PATH',
+                "write log to PATH/setup.log (PATH must exist) and do not remove when finished")  {|v| Setup.options['log'] = v }
+        opts.on('-h', '--help',
+                'Show this message.') do |v|
+          puts opts
+          puts
+          exit(0)
+        end
+        opts.parse!(args)
+      end
+
+      def self.run(argv)
+        return description if argv == :describe
+
+        parse_args(argv)
+
+        cfg_args = []
+        cfg_args << "--wxwin=#{Setup.options['wxwin']}" if Setup.options['wxwin']
+        cfg_args << "--wxxml=#{Setup.options['wxxml']}" if Setup.options['wxxml']
+        cfg_args << '--with-wxwin' if Setup.options['with-wxwin']
+        cfg_args << "--swig=#{Setup.options['swig']}" if Setup.options['swig']
+        cfg_args << "--doxygen=#{Setup.options['doxygen']}" if Setup.options['doxygen']
+        cfg_args << "--git=#{Setup.options['git']}" if Setup.options['git']
+        unless Setup.options['autoinstall'].nil?
+          cfg_args << (Setup.options['autoinstall'] ? '--autoinstall' : '--no-autoinstall')
+        end
+        cfg_cmd = 'rake configure'
+        cfg_cmd << "[#{cfg_args.join(',')}]" unless cfg_args.empty?
+
+        result = false
+        FileUtils.chdir(WxRuby::ROOT) do
+          steps = 0
+          actions_txt = if Setup.options['autoinstall'] != false
+                          steps = 1
+                          '(possibly) install required software'
+                        else
+                          ''
+                        end
+          if Setup.options['with-wxwin'] || Setup.options['wxwin'].nil?
+            actions_txt << ', ' if steps>0
+            actions_txt << 'build the wxWidgets libraries (if needed), '
+            actions_txt << "\n" if steps>0
+            steps += 1
+          else
+            actions_txt << ',' if steps>0
+          end
+          actions_txt << 'build the native wxRuby3 extensions '
+          actions_txt << "\n" if steps==1
+          actions_txt << 'and generate the wxRuby3 reference documentation.'
+          $stdout.puts <<~__INFO_TXT
+
+            ---            
+            Now running wxRuby3 post-install setup.
+            This will #{actions_txt}
+            Please be patient as this may take quite a while depending on your system.
+            ---
+
+            __INFO_TXT
+          log_file = File.join(WxRuby::ROOT, 'setup.log')
+          if Setup.options['log']
+            if File.directory?(Setup.options['log']) && File.writable?(Setup.options['log'])
+              log_file = File.join(Setup.options['log'], 'setup.log')
+            else
+              $stderr.puts "ERROR: cannot write log to #{Setup.options['log']}. Log path must exist and be writable."
+              exit(1)
+            end
+          end
+          run_env = {'WXRUBY_RUN_SILENT' => "#{log_file}"}
+          run_env['WXRUBY_VERBOSE'] = '1' if Setup.options[:verbose]
+          # can't rely on FileUtils#chdir returning the block result (bug in older Rubies) so assign result here
+          result = system(run_env, "#{cfg_cmd} && rake -m wxruby:gem:setup#{Setup.options['log'] ? '[:keep_log]' : ''} && gem rdoc wxruby3 --overwrite")
+        end
+        exit(result ? 0 : 1)
+      end
+    end
+
+    unless self.setup_done?
+      self.register('setup', Setup)
+    end
+  end
+end

data/lib/wx/wxruby/cmd/test.rb

@@ -10,21 +10,71 @@ require 'fileutils'
 module WxRuby
   module Commands
     class Test
+
+      DESC = 'Run wxRuby3 regression tests.'
+
       def self.description
-        "    test\t\t\tRun wxRuby3 regression tests."
+        "    test -h|[options] [TEST [...]]\t#{DESC}"
+      end
+
+      def self.options
+        Commands.options['test'] ||= { verbose: Commands.options[:verbose], excludes: [] }
+      end
+
+      def self.parse_args(args)
+        opts = OptionParser.new
+        opts.banner = "#{DESC}\n\nUsage: wxruby test -h|--help OR wxruby test [options] [TEST [...]]\n\n" +
+          "TEST == test name\n" +
+          "Runs all tests (except any specified to exclude) if no test specified.\n\n"
+        opts.separator ''
+        opts.on('--list',
+                "display the list of names of the installed tests")  do |v|
+          tests = Dir[File.join(WxRuby::ROOT, 'tests', '*.rb')].collect { |t| File.basename(t, '.*') }
+          $stdout.puts <<~__INFO
+            Installed wxRuby tests:
+              #{tests.join(', ')}
+
+            __INFO
+          exit(0)
+        end
+        opts.on('--exclude=TEST',
+                "exclude the specified test from running")  {|v| Test.options[:excludes] << v }
+        opts.on('-h', '--help',
+                'Show this message.') do |v|
+          puts opts
+          puts
+          exit(0)
+        end
+        opts.parse!(args)
       end
 
       def self.run(argv)
-        if argv == :describe
-          description
-        else
-          Dir[File.join(WxRuby::ROOT, 'tests', '*.rb')].each do |test|
+        return description if argv == :describe
+
+        parse_args(argv)
+
+        tests = if argv.empty?
+                  Dir[File.join(WxRuby::ROOT, 'tests', '*.rb')]
+                else
+                  argv.collect do |a|
+                    fn = File.join(WxRuby::ROOT, 'tests', a+'.rb')
+                    unless File.file?(fn)
+                      $stderr.puts "ERROR: Invalid test [#{a}] specified."
+                      exit(1)
+                    end
+                    fn
+                  end
+                end
+        tests.each do |test|
+          unless Test.options[:excludes].include?(File.basename(test, '.*'))
             exit(1) unless system(RUBY, test)
           end
         end
       end
     end
 
-    self.register('test', Test)
+    if self.setup_done?
+      self.register('test', Test)
+    end
   end
 end