wxruby3 0.9.5 → 0.9.8

data/rakelib/lib/director/dialog.rb

@@ -212,6 +212,14 @@ module WXRuby3
                 return Qfalse;
             }
             __HEREDOC
+        when 'wxSymbolPickerDialog'
+          # redefine these to prevent problematic handling of title/caption defaults
+          spec.ignore 'wxSymbolPickerDialog::wxSymbolPickerDialog(const wxString &, const wxString &, const wxString &, wxWindow *, wxWindowID, const wxString &, const wxPoint &, const wxSize &, long)',
+                      'wxSymbolPickerDialog::Create',
+                      ignore_doc: false
+          spec.extend_interface 'wxSymbolPickerDialog',
+                                'wxSymbolPickerDialog(const wxString &symbol, const wxString &initialFont, const wxString &normalTextFont, wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, long style)',
+                                'bool Create(const wxString &symbol, const wxString &initialFont, const wxString &normalTextFont, wxWindow *parent, wxWindowID id, const wxString &caption, const wxPoint &pos, const wxSize &size, long style)'
         when 'wxWizard'
           # special handling
           spec.ignore 'wxWizard::GetBitmap'

data/rakelib/lib/director/gdicommon.rb

@@ -52,8 +52,7 @@ module WXRuby3
         if Config.instance.wx_version >= '3.3.0'
           # ignore these as they are supposed to specify unary minus but confuse
           # SWIG
-          spec.ignore 'wxPoint::operator-(const wxPoint&)',
-                      'wxRealPoint::operator-(const wxRealPoint&)'
+          spec.ignore 'wxPoint::operator-(const wxPoint&)'
         end
         spec.regard 'wxRect::Offset', regard_doc: false
         # overrule common wxPoint mapping for wxRect ctor to fix ctor ambiguities here wrt wxSize

data/rakelib/lib/director/grid_ctrl.rb

@@ -237,9 +237,9 @@ module WXRuby3
           static const rb_data_type_t __wxGridWindow_type = {
             "GridWindow",
           #if RUBY_API_VERSION_MAJOR >= 3
-            { NULL, NULL, __wxGridWindow_size, 0, 0},
+            { NULL, NULL, __wxGridWindow_size, 0, {}},
           #else
-            { NULL, NULL, __wxGridWindow_size, 0},
+            { NULL, NULL, __wxGridWindow_size, {}},
           #endif 
             NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
           };

data/rakelib/lib/director/richtext_composite_object.rb

@@ -93,9 +93,9 @@ module WXRuby3
             static const rb_data_type_t __wxRichTextFloatCollector_type = {
               "RichTextFloatCollector",
             #if RUBY_API_VERSION_MAJOR >= 3
-              { NULL, NULL, __wxRichTextFloatCollector_size, 0, 0},
+              { NULL, NULL, __wxRichTextFloatCollector_size, 0, {}},
             #else
-              { NULL, NULL, __wxRichTextFloatCollector_size, 0},
+              { NULL, NULL, __wxRichTextFloatCollector_size, {}},
             #endif 
               NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
             };
@@ -177,12 +177,10 @@ module WXRuby3
             {
               VALUE rc = Qnil;
               const wxRichTextLineVector &lines = $self->GetLines();
-              int lnr = 0;
               for (const wxRichTextLine* line : lines)
               {
                 VALUE rb_ln = SWIG_NewPointerObj(SWIG_as_voidptr(const_cast<wxRichTextLine*> (line)), SWIGTYPE_p_wxRichTextLine, 0);
                 rc = rb_yield(rb_ln);
-                ++lnr;
               }
               return rc;
             }

data/rakelib/lib/director/secret_store.rb

@@ -0,0 +1,117 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+module WXRuby3
+
+  class Director
+
+    class SecretStore < Director
+
+      def setup
+        super
+        spec.items << 'wxSecretValue'
+        spec.gc_as_untracked # don't even track SecretStore and SecretValue objects
+        # there is no possibility of SecretStore derivatives
+        # not least because wxRuby only ever allows a single global SecretStore
+        spec.disable_proxies
+        spec.make_abstract 'wxSecretStore'
+
+        spec.include 'ruby/encoding.h'
+
+        spec.ignore 'wxSecretValue::GetAsString',
+                    'wxSecretValue::GetSize',
+                    'wxSecretValue::GetData',
+                    'wxSecretValue::Wipe',
+                    'wxSecretValue::WipeString',
+                    'wxSecretValue::wxSecretValue(const wxString&)',
+                    'wxSecretValue::wxSecretValue(size_t, const void *)'
+        spec.regard 'wxSecretValue::wxSecretValue()',
+                    'wxSecretValue::wxSecretValue(const wxSecretValue&)',
+                    regard_doc: false
+        # customize string arg ctor
+        spec.add_extend_code 'wxSecretValue', <<~__HEREDOC
+          wxSecretValue(VALUE secret_string)
+          {
+            if (RTEST(secret_string) && TYPE(secret_string) == T_STRING)
+            {
+              if (ENCODING_GET(secret_string) == rb_utf8_encindex())
+              {
+                return new wxSecretValue(RSTR_TO_WXSTR(secret_string));
+              }
+              else
+              {
+                return new wxSecretValue(RSTRING_LEN(secret_string), (void*)StringValuePtr(secret_string));
+              }
+            }
+            else
+            {
+              rb_raise(rb_eArgError, "Expected String or Wx::SecretValue for #0");
+            }
+          } 
+          __HEREDOC
+
+        # customize GetData
+        spec.map 'const void*' => 'String', swig: false do
+          map_out code: ''
+        end
+        spec.add_extend_code 'wxSecretValue', <<~__HEREDOC
+          VALUE get_data() 
+          {
+            size_t sz = $self->GetSize();
+            const void* data = $self->GetData();
+            return rb_enc_str_new(static_cast<const char*>(data), sz, rb_ascii8bit_encoding());
+          }
+
+          VALUE get_as_string() 
+          {
+            size_t sz = $self->GetSize();
+            const void* data = $self->GetData();
+            return rb_utf8_str_new(static_cast<const char*>(data), sz);
+          }
+          __HEREDOC
+
+        # customize GetDefault
+        spec.ignore 'wxSecretStore::GetDefault', ignore_doc: false
+        spec.add_extend_code 'wxSecretStore', <<~__HEREDOC
+          static VALUE get_default() 
+          {
+            wxSecretStore* result = new wxSecretStore(wxSecretStore::GetDefault());
+            return SWIG_NewPointerObj(result, SWIGTYPE_p_wxSecretStore, SWIG_POINTER_OWN);
+          }
+          __HEREDOC
+        spec.map 'wxString *errmsg' => 'String' do
+          map_in ignore: true, temp: 'wxString tmp', code: '$1 = &tmp;'
+          map_argout code: <<~__CODE
+            if ($result == Qfalse)
+            {
+              $result = SWIG_Ruby_AppendOutput($result, WXSTR_TO_RSTR(tmp$argnum));
+            }
+            __CODE
+        end
+        spec.map 'wxString& username' => 'String' do
+          map_in ignore: true, temp: 'wxString tmp', code: '$1 = &tmp;'
+          map_argout code: <<~__CODE
+            if ($result == Qtrue)
+            {
+              $result = SWIG_Ruby_AppendOutput($result, WXSTR_TO_RSTR(tmp$argnum));
+            }
+            __CODE
+        end
+        # the type matching of the username argument is tricky here since there only is the const difference
+        # have to explicitly overrule here for Save() incl. explicitly negating the argout mapping
+        spec.map 'const wxString& username' => 'String' do
+          map_in temp: 'wxString tmp', code: 'tmp = RSTR_TO_WXSTR($input); $1 = &tmp;'
+          map_argout by_ref: true
+        end
+      end
+
+    end # class SecretStore
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/tree_event.rb

@@ -55,9 +55,9 @@ module WXRuby3
           static const rb_data_type_t __wxTreeItemId_type = {
             "TreeItemId",
           #if RUBY_API_VERSION_MAJOR >= 3
-            { NULL, NULL, __wxTreeItemId_size, 0, 0},
+            { NULL, NULL, __wxTreeItemId_size, 0, {}},
           #else
-            { NULL, NULL, __wxTreeItemId_size, 0},
+            { NULL, NULL, __wxTreeItemId_size, {}},
           #endif 
             NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
           };

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

@@ -0,0 +1,55 @@
+---
+:wxSecretStore:
+  :detail:
+    :pre:
+      :programlisting:
+        - :pattern: !ruby/regexp /\!store\..*Save.*username.*password\)/
+          :replace: |
+            
+            ```ruby
+              store = Wx::SecretStore.get_default
+              rc, err = store.ok?
+              if rc
+                unless store.save('MyApp/MyService', username, password)
+                  Wx.log_warning('Failed to save credentials to the system secret store.')
+                end
+              else
+                Wx.log_warning("This system doesn't support storing passwords securely (#{err}).")
+              end
+            ```
+        - :pattern: !ruby/regexp /store\..*Load.*username.*password\)/
+          :replace: |
+            
+            ```ruby
+              store = Wx::SecretStore.get_default
+              rc, _ = store.ok?
+              if rc
+                password = Wx::SecretValue.new
+                rc, username = store.load('MyApp/MyService', password)
+                if rc
+                  # ... use the password ... 
+                end
+              end
+            ```
+:wxSecretStore.IsOk:
+  :brief:
+    :replace:
+      :text: |
+        Check if this object can actually be used.
+        Returns true if the object can be used.
+        Returns false and an error message describing the reason if not.
+
+:wxSecretStore.Load:
+  :detail:
+    :post:
+      - :pattern: !ruby/regexp /Otherwise\s+the\s+function.*arguments\./
+        :subst: |
+          Otherwise the function returns true and the username and updates the provided password argument.
+
+:wxSecretValue:
+  :detail:
+    :post:
+      - :pattern: !ruby/regexp /\s+\Z/
+        :subst: |
+          
+          @note Due to a bug using binary secrets will not work for WXGTK wxWidgets<=3.2.4 (WXOSX and WXMSW work fine). This has been fixed for later versions.

data/rakelib/lib/generate/doc.rb

@@ -26,22 +26,30 @@ module WXRuby3
           WX_GLOBAL_CONSTANTS=false
           require 'wx'
           def handle_module(mod, table)
+            Wx.delayed_constants_for(mod).each do |key, delayed_const|
+              table[key.sym.to_s] = { type: true, value: delayed_const.to_s }
+            end
             mod.constants.each do |c|
               a_const = mod.const_get(c)
               if (::Module === a_const || ::Class === a_const) && a_const.name.start_with?('Wx::')  # Wx:: Package submodule or Class (possibly Enum)
                 handle_module(a_const, table[c.to_s] = {})
               elsif Wx::Enum === a_const
-                table[c.to_s] = { type: a_const.class.name.split('::').last, value: "\#{a_const.class}.new(\#{a_const.to_i})" } 
-              elsif !(::Hash === a_const || ::Array === a_const) 
-                table[c.to_s] = { type: a_const.class.name.split('::').last, value: a_const } unless c == :THE_APP
+                table[c.to_s] = { type: true, value: "\#{a_const.class}.new(\#{a_const.to_i})" } 
+              elsif !(::Hash === a_const || ::Array === a_const)
+                case a_const
+                when Wx::Size
+                  table[c.to_s] = { type: true, value: "Wx::Size.new(\#{a_const.width}, \#{a_const.height})" }
+                when Wx::Point
+                  table[c.to_s] = { type: true, value: "Wx::Point.new(\#{a_const.x}, \#{a_const.y})" }
+                else 
+                  table[c.to_s] = { type: true, value: a_const } unless c == :THE_APP
+                end
               end
             end
           end
-          Wx::App.run do 
-            table = { 'Wx' => {}}
-            handle_module(Wx, table['Wx'])
-            STDOUT.puts JSON.dump(table)
-          end
+          table = { 'Wx' => {}}
+          handle_module(Wx, table['Wx'])
+          STDOUT.puts JSON.dump(table)
         __SCRIPT
         STDERR.puts "* executing constants collection script:\n#{script}" if Director.trace?
         begin
@@ -693,15 +701,22 @@ module WXRuby3
         # at least 2 newlines to make Yard skip/forget the header comment
         fdoc.puts
         fdoc.puts
-        fdoc.puts "module #{package.fullname}"
-        fdoc.puts
-        fdoc.indent do
+        mod_indent = 0
+        package.all_modules.each do |modnm|
+          fdoc.iputs("module #{package.fullname}", mod_indent)
+          fdoc.puts
+          mod_indent += 1
+        end
+        fdoc.indent(mod_indent) do
           gen_constants_doc(fdoc)
           gen_functions_doc(fdoc) unless no_gen?(:functions)
           gen_class_doc(fdoc) unless no_gen?(:classes)
         end
-        fdoc.puts
-        fdoc.puts 'end'
+        package.all_modules.each do |_|
+          mod_indent -= 1
+          fdoc.puts
+          fdoc.iputs('end', mod_indent)
+        end
       end
     end
 
@@ -742,7 +757,7 @@ module WXRuby3
     end
 
     def gen_constant_value(val)
-      if ::String === val && /\A(#<(.*)>|[\w:]+\.new\(.*\))\Z/ =~ val
+      if ::String === val && /\A(#<(.*)>|[\w:]+\.\w+\(.*\))\Z/ =~ val
         if $2
           valstr = $2
           if /\Awx/ =~ valstr

data/rakelib/lib/generate/interface.rb

@@ -603,7 +603,8 @@ module WXRuby3
         elsif item.value =~ /wx(Colour|Font)(\(.*\))/
           frbext = init_rb_ext_file unless frbext
           frbext.indent do
-            frbext.puts "Wx.add_delayed_constant(self, :#{rb_constant_name(item.name)}) { Wx::#{$1}.new#{$2} }"
+            code = "Wx::#{$1}.new#{$2}"
+            frbext.puts "Wx.add_delayed_constant(self, :#{rb_constant_name(item.name)}, '#{code}') { #{code} }"
           end
           frbext.puts
         elsif item.value =~ /wxSystemSettings::(\w+)\((.*)\)/
@@ -611,7 +612,8 @@ module WXRuby3
           setting_mtd = $1
           args = $2.split(',').collect {|a| rb_constant_value(a) }.join(', ')
           frbext.indent do
-            frbext.puts "Wx.add_delayed_constant(self, :#{rb_constant_name(item.name)}) { Wx::SystemSettings.#{rb_method_name(setting_mtd)}(#{args}) }"
+            code = "Wx::SystemSettings.#{rb_method_name(setting_mtd)}(#{args})"
+            frbext.puts "Wx.add_delayed_constant(self, :#{rb_constant_name(item.name)}, '#{code}') { #{code} }"
           end
           frbext.puts
         else

data/rakelib/lib/specs/interfaces.rb

@@ -233,6 +233,7 @@ 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.Package('Wx::PRT', 'USE_PRINTING_ARCHITECTURE') do |pkg|

data/rakelib/lib/swig_runner.rb

@@ -43,24 +43,23 @@ module WXRuby3
         @swig_version
       end
 
-
       def check_swig
         begin
           @swig_version = `#{WXRuby3::Config.get_config('swig')} -version`[/\d+\.\d+\.\d+/]
         rescue Exception
-          STDERR.puts "ERROR: Could not run SWIG (#{WXRuby3::Config.get_config('swig')})"
+          $stderr.puts "ERROR: Could not run SWIG (#{WXRuby3::Config.get_config('swig')})"
           exit(1)
         end
 
-        # Very old versions put --version on STDERR, not STDOUT
+        # Very old versions put --version on $stderr, not $stdout
         unless @swig_version
-          STDERR.puts "Could not get version info from SWIG; " +
+          $stderr.puts "Could not get version info from SWIG; " +
                         "is a very old version installed?.\n"
           exit(1)
         end
 
         if @swig_version < SWIG_MINIMUM_VERSION
-          STDERR.puts "SWIG version #{@swig_version} is installed, " +
+          $stderr.puts "SWIG version #{@swig_version} is installed, " +
                         "minimum version required is #{SWIG_MINIMUM_VERSION}.\n"
           exit(1)
         end
@@ -72,11 +71,12 @@ module WXRuby3
         check_swig unless swig_state
         inc_paths = "-I#{config.wxruby_dir} -I#{config.swig_dir}/custom"
         inc_paths << " -I#{config.swig_dir}/custom/swig#{swig_major}"
-        sh "#{config.get_config('swig')} #{config.wx_cppflags.join(' ')} " +
-             "#{config.extra_cppflags.join(' ')} #{config.verbose_flag} #{inc_paths} " +
-             #"-w401 -w801 -w515 -c++ -ruby " +
-             "-w801 -c++ -ruby " +
-             "-o #{target} #{source}"
+        WXRuby3.config.sh "#{config.get_config('swig')} #{config.wx_cppflags.join(' ')} " +
+                            "#{config.extra_cppflags.join(' ')} #{config.verbose_flag} #{inc_paths} " +
+                            #"-w401 -w801 -w515 -c++ -ruby " +
+                            "-w801 -c++ -ruby " +
+                            "-o #{target} #{source}",
+                          fail_on_error: true
       end
 
     end
@@ -205,7 +205,7 @@ module WXRuby3
       end
 
       def self.run(pid, director, target)
-        puts "Processor.#{pid}: #{target}"
+        Config.instance.log_progress("Processor.#{pid}: #{target}")
         const_get(camelize(pid.to_s)).new(director, target).run
       end
 

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/prepost.rake

@@ -23,16 +23,28 @@ namespace 'wxruby' do
 
   namespace 'post' do
 
-    task :srcgem => %w[gem:wxwin gem:install wxruby:doc] do
+    task :srcgem => %w[gem:wxwin gem:install] do
+      $stdout.print "Generating wxRuby3 reference documentation..." if WXRuby3.config.run_silent?
+      Rake::Task['wxruby:doc'].invoke
+      $stdout.puts 'done!' if WXRuby3.config.run_silent?
       # cleanup
-      rm_rf('rakelib')
-      rm_rf('ext/wxruby3')
-      rm_rf('ext/wxWidgets') if File.exist?('ext/wxWidgets')
+      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
 
     namespace 'gem' do

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

@@ -77,3 +77,21 @@ div.wxrb-logo table td {
     font-weight: bold;
     font-size: 0.9em;
 }
+
+#filecontents {
+    margin-right: 340px;
+}
+
+#filecontents blockquote {
+    border-left: .5em solid #e0e0e0;
+    margin: 10px;
+    padding-left: 10px;
+}
+
+#toc {
+    position: fixed;
+    overflow-y: scroll;
+    overflow-x: hidden;
+    top: 1em;
+    bottom: 0;
+}

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

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
 def init
-  # It seems YARD messes things up so that a number of classes are not properly
+  # 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_classes = Registry.all(:class)
-  all_classes.each do |c|
+  all_objects = Registry.all(:class, :constant, :module)
+  all_objects.each do |c|
     if (ns = c.namespace)
       unless ns.children.any? { |nsc| nsc.path == c.path }
-        ns.children << c # class missing from child list of enclosing namespace -> add here
+        ns.children << c # class/module/constant 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 missing from child list of enclosing namespace -> add here
+        ns.children << c # class/module/constant missing from child list of enclosing namespace -> add here
       end
     end
   end

data/rakelib/yard/yard/relative_markdown_links.rb

@@ -31,12 +31,18 @@ module YARD # rubocop:disable Style/Documentation
           if fnames.include?(href.path)
             link.replace "{file:#{href} #{link.inner_html}}"
           elsif href.path.end_with?('_md.html') && (fname = fnames.find {|fnm| fnm.end_with?(href.path.sub(/_md.html\Z/, '.md')) })
-            link.replace "{file:#{fname} #{link.inner_html}}"
+            link.replace "{file:#{fname}#{href.fragment ? "##{fragment_to_yard(href.fragment)}" : ''} #{link.inner_html}}"
           end
         end
       end
       super(html.to_s)
     end
+
+    # this does not work with mixed case labels but is good enough for us
+    def fragment_to_yard(s)
+      s.start_with?('label-') ? s : "label-#{s.gsub('-', '+').capitalize}"
+    end
+
   end
 
   Templates::Template.extra_includes << RelativeMarkdownLinks

data/samples/sampler/sample.rb

@@ -6,6 +6,8 @@
 # wxRuby3 sampler application
 ###
 
+require 'set'
+
 module WxRuby
 
   ART_FOLDER = File.join(__dir__, '..', 'art')

data/tests/lib/wxapp_runner.rb

@@ -67,7 +67,7 @@ module Test
     class TestCase
 
       def self.is_ci_build?
-        !!ENV['GITHUB_ACTION']
+        (ENV['GITHUB_ACTION'] || ENV['CI'])
       end
 
       def is_ci_build?

data/tests/test_config.rb

@@ -203,13 +203,16 @@ class TestConfig < Test::Unit::TestCase
   def run_env_var_tests(cfg)
     # by default expansion is on
 
+    # Cirrus CI Linux builds run in privileged container without proper user env
+    has_user = Wx::PLATFORM == 'WXMSW' || ENV['USER']
+
     # add a number of entries for env var in new group 'Environment'
     cfg['/Environment/HOME'] = '$HOME'
-    cfg['Environment'].USER = Wx::PLATFORM == 'WXMSW' ? '%USERNAME%' : '${USER}'
+    cfg['Environment'].USER = Wx::PLATFORM == 'WXMSW' ? '%USERNAME%' : '${USER}' if has_user
     cfg['/Environment/PATH'] = '$(PATH)'
 
     assert_equal(ENV['HOME'], cfg.Environment['HOME'])
-    assert_equal(ENV[Wx::PLATFORM == 'WXMSW' ?  'USERNAME' : 'USER'], cfg['/Environment/USER'])
+    assert_equal(ENV[Wx::PLATFORM == 'WXMSW' ?  'USERNAME' : 'USER'], cfg['/Environment/USER']) if has_user
     assert_equal(ENV['PATH'], cfg.Environment.PATH)
 
     # test escaping
@@ -225,9 +228,9 @@ class TestConfig < Test::Unit::TestCase
 
     assert_equal('${NonExistingLongNonsenseVariable}', cfg.Environment['NONSENSE'])
 
-    cfg['/Environment/MULTIPLE'] = "$HOME / #{Wx::PLATFORM == 'WXMSW' ? '%USERNAME%' : '${USER}'}"
+    cfg['/Environment/MULTIPLE'] = "$HOME / #{Wx::PLATFORM == 'WXMSW' ? '%USERNAME%' : '${USER}'}" if has_user
 
-    assert_equal("#{ENV['HOME']} / #{Wx::PLATFORM == 'WXMSW' ? ENV['USERNAME'] : ENV['USER']}", cfg.Environment['MULTIPLE'])
+    assert_equal("#{ENV['HOME']} / #{Wx::PLATFORM == 'WXMSW' ? ENV['USERNAME'] : ENV['USER']}", cfg.Environment['MULTIPLE']) if has_user
 
     # disable env var expansion
     cfg.expand_env_vars = false