fxruby 1.6.35-x64-mingw32 → 1.6.36-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ae09258c405f4a6457003eb889f69f530084f93
-  data.tar.gz: 3fdff3a7126dbbc442631f4ebf7905a2be79ffd9
+  metadata.gz: 3cde95f49d756372079e10771ba5d7c143edc51a
+  data.tar.gz: 942334d1a8e18419db53237d7847678332cf2324
 SHA512:
-  metadata.gz: 1d02feb8a9d184e3a3c29d5749de52ae80d212a345faa4ca29a71556c51cee80ea85de548ab37c866a8bb697bfa7ebbd8b419c7c9514054afbef9a89b1529bd0
-  data.tar.gz: fb8b7b4f3a47bf2bf02bfa4deaeccd8280a0b5a1ad035669e58eb268c16d9c0f33a90502a16624f38e7623e71b771e0654a5c06d558982be5cf79f908aa44f84
+  metadata.gz: 41e9c0a0a50324569e46bbdb89ae684ef89a1a7e11d483823d76a8a92e995b1bce0861aa2c30cd2239690248f8df75bda998b73a25649a94d842391c34664453
+  data.tar.gz: fae1628f002c90afa5ea84ab62603cdf25eb76704a639c6e872b140bdc3818b7ac6e7519536fda5d68e5208ef18982fbdb9159dea5bbc678e6eabeda079aa1b6

data/.gitignore

@@ -6,9 +6,21 @@ ext/fox16_c/*_wrap.cpp
 ext/fox16_c/*.o
 ext/fox16_c/conftest.dSYM
 ext/fox16_c/include/inlinestubs.h
+ext/fox16_c/extconf.h
 ext/fox16_c/swigruby.h
 ext/fox16_c/fox16.bundle
 ext/fox16_c/mkmf.log
 lib/fox16/kwargs.rb
+lib/[0-9].[0-9]
+lib/*.so
 fox-includes/diffs.py
 fox-includes/diffs.txt
+pkg
+tmp
+vendor
+*.orig
+*.rej
+/Gemfile.lock
+/ports
+/.bundle
+/.yardoc

data/.travis.yml

@@ -0,0 +1,45 @@
+dist: trusty
+sudo: false
+group: beta
+language: ruby
+
+addons:
+  apt:
+    packages:
+    - xpra
+    - xserver-xorg-video-dummy
+    - g++
+    - libxrandr-dev
+    - libfox-1.6-dev
+    - libfxscintilla-dev
+    - swig
+
+install:
+  - swig -version
+  - ls -l /usr/lib/libfxscintilla*
+  - bundle install
+
+before_script:
+  - "xpra --xvfb=\"Xorg +extension GLX -config `pwd`/test/dummy.xorg.conf -logfile ${HOME}/.xpra/xorg.log\"  start :9"
+
+script: bundle exec rake test DISPLAY=:9
+
+after_failure:
+  - "cat ~/.xpra/*"
+
+after_script:
+  - "xpra stop :9"
+
+rvm:
+  - "2.0.0"
+  - "2.1"
+  - "2.2"
+  - "2.3.1"
+  - "2.4.0"
+  - "ruby-head"
+  # swig compilation is sooo slow on rbx-3, that it exceeds the time limit on travis-ci
+  #- "rbx-3"
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: rbx-3

data/Gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+# Specify your gem's runtime dependencies in fxruby.gemspec
+gemspec
+
+group :development do
+  gem 'rake-compiler', '~> 1.0'
+  gem 'rake-compiler-dock', '~> 0.6.0'
+  gem 'yard', '~> 0.8'
+  gem "bundler", "~> 1.12"
+  gem "rake", "~> 12.0"
+end
+
+group :test do
+  gem 'opengl', '~> 0.8'
+  gem 'glu', '~> 8.0'
+  gem 'test-unit', '~> 3.1'
+end

data/{History.txt → History.md}

@@ -1,3 +1,13 @@
+=== 1.6.36 / 2017-06-04
+
+* Support the fxruby source gem on Windows (only RubyInstaller-2.4).
+* Replace our self-made directory search methods by pgk-config.
+* Enable the use of Win32 unicode functions. Fixes #30 and #38
+* Fix segfault in vsprintf on Windows 10.
+* Update support for RubyInstaller-2.4.1-1
+* Update to libjpeg-9b
+* More automation for gem releases
+
 === 1.6.35 / 2017-02-15
 
 * Adjust for Ruby-2.4 with unified Integers

data/Rakefile

@@ -1,107 +1,112 @@
 require 'rubygems'
-require 'hoe'
 require 'erb'
 require 'rake/extensiontask'
+require 'bundler'
+require 'bundler/gem_helper'
 require './lib/fox16/version.rb'
 
-Hoe.plugin :bundler
-
-# Use forked process for chdir'ed environment, to allow parallel execution with drake
+# Use forked process for chdir'ed environment, to allow parallel execution with rake -m
 module FileUtils
   alias unforked_fileutils_cd cd
   def cd(dir, options={}, &block)
     raise "chdir called without block" unless block_given?
-    Process.waitpid(fork{ unforked_fileutils_cd(dir, options, &block) })
+    begin
+      pid = Process.waitpid(fork{ unforked_fileutils_cd(dir, options, &block) })
+      raise "Error in subprocess" if $?.exitstatus != 0
+    rescue NotImplementedError
+      unforked_fileutils_cd(dir, options, &block)
+    end
   end
   module_function :cd
   alias chdir cd
   module_function :chdir
 end
 
-# Some constants we'll need
-PKG_VERSION = Fox.fxrubyversion
 
+class FoxGemHelper < Bundler::GemHelper
+  attr_accessor :cross_platforms
+
+  def install
+    super
+
+    task "release:guard_clean" => ["release:update_history"]
+
+    task "release:update_history" do
+      update_history
+    end
+
+    task "release:rubygem_push" => ["gem:windows"]
+  end
+
+  def hfile
+    "History.md"
+  end
+
+  def headline
+    '([^\w]*)(\d+\.\d+\.\d+)([^\w]+)([2Y][0Y][0-9Y][0-9Y]-[0-1M][0-9M]-[0-3D][0-9D])([^\w]*|$)'
+  end
+
+  def reldate
+    Time.now.strftime("%Y-%m-%d")
+  end
+
+  def update_history
+    hin = File.read(hfile)
+    hout = hin.sub(/#{headline}/) do
+      raise "#{hfile} isn't up-to-date for version #{version}" unless $2==version.to_s
+      $1 + $2 + $3 + reldate + $5
+    end
+    if hout != hin
+      Bundler.ui.confirm "Updating #{hfile} for release."
+      File.write(hfile, hout)
+      Rake::FileUtilsExt.sh "git", "commit", hfile, "-m", "Update release date in #{hfile}"
+    end
+  end
+
+  def tag_version
+    Bundler.ui.confirm "Tag release with annotation:"
+    m = File.read(hfile).match(/(?<annotation>#{headline}.*?)#{headline}/m) || raise("Unable to find release notes in #{hfile}")
+    Bundler.ui.info(m[:annotation].gsub(/^/, "    "))
+    IO.popen(["git", "tag", "--file=-", version_tag], "w") do |fd|
+      fd.write m[:annotation]
+    end
+    yield if block_given?
+  rescue
+    Bundler.ui.error "Untagging #{version_tag} due to error."
+    sh_with_code "git tag -d #{version_tag}"
+    raise
+  end
+
+  def rubygem_push(path)
+    cross_platforms.each do |ruby_platform|
+      super(path.gsub(/\.gem\z/, "-#{ruby_platform}.gem"))
+    end
+    super(path)
+  end
+end
+
+# Some constants we'll need
 LIBFXSCINTILLA_VERSION            = ENV['LIBFXSCINTILLA_VERSION'] || '2.28.0'
 LIBFXSCINTILLA_SOURCE_URI         = "http://download.savannah.gnu.org/releases/fxscintilla/fxscintilla-#{LIBFXSCINTILLA_VERSION}.tar.gz"
 
 SWIG = (RUBY_PLATFORM =~ /mingw/) ? "swig.exe" : "swig"
 SWIGFLAGS = "-c++ -ruby -nodefaultdtor -nodefaultctor -w302 -features compactdefaultargs -I../fox-includes"
-SWIG_MODULES = {
-  "core.i" => "core_wrap.cpp",
-  "dcmodule.i" => "dc_wrap.cpp",
-  "dialogs.i" => "dialogs_wrap.cpp",
-  "framesmodule.i" => "frames_wrap.cpp",
-  "iconlistmodule.i" => "iconlist_wrap.cpp",
-  "icons.i" => "icons_wrap.cpp",
-  "image.i" => "image_wrap.cpp",
-  "labelmodule.i" => "label_wrap.cpp",
-  "layout.i" => "layout_wrap.cpp",
-  "listmodule.i" => "list_wrap.cpp",
-  "mdi.i" => "mdi_wrap.cpp",
-  "menumodule.i" => "menu_wrap.cpp",
-  "fx3d.i" => "fx3d_wrap.cpp",
-  "scintilla.i" => "scintilla_wrap.cpp",
-  "table-module.i" => "table_wrap.cpp",
-  "text-module.i" => "text_wrap.cpp",
-  "treelist-module.i" => "treelist_wrap.cpp",
-  "ui.i" => "ui_wrap.cpp"
-}
-
-
-hoe = Hoe.spec "fxruby" do
-  # ... project specific data ...
-  self.blog_categories = %w{FXRuby}
-  self.clean_globs = [".config", "ext/fox16_c/Makefile", "ext/fox16_c/*.o", "ext/fox16_c/*.bundle", "ext/fox16_c/mkmf.log", "ext/fox16_c/conftest.dSYM", "ext/fox16_c/swigruby.h", "ext/fox16_c/librb.c", "ext/fox16_c/include/inlinestubs.h", "ext/fox16_c/*_wrap.cpp", "tmp", "ports/*.installed", "ports/*mingw32*"]
-  developer("Lyle Johnson", "lyle@lylejohnson.name")
-  developer("Lars Kanis", "kanis@comcard.de")
-  self.extra_rdoc_files = ["rdoc-sources", File.join("rdoc-sources", "README.rdoc")]
-  self.remote_rdoc_dir = "doc/api"
-  self.spec_extras = {
-    :description => "FXRuby is the Ruby binding to the FOX GUI toolkit.",
-    :extensions => ["ext/fox16_c/extconf.rb"],
-    :rdoc_options => ['--main', File.join('rdoc-sources', 'README.rdoc'), '--exclude', 'ext/fox16_c', '--exclude', %r{aliases|kwargs|missingdep|responder}.inspect],
-    :require_paths => ['lib'],
-    :summary => "FXRuby is the Ruby binding to the FOX GUI toolkit."
-  }
-  self.test_globs = ["test/**/TC_*.rb"]
-  self.testlib = :testunit
-  self.version = PKG_VERSION
-  self.readme_file = 'README.rdoc'
-  self.extra_rdoc_files << self.readme_file
-  self.extra_deps << ['mini_portile2', '~> 2.1']
-  self.extra_dev_deps << ['rake-compiler', '~> 1.0']
-  self.extra_dev_deps << ['rake-compiler-dock', '~> 0.6.0']
-  self.extra_dev_deps << ['opengl', '~> 0.8']
-  self.extra_dev_deps << ['glu', '~> 8.0']
-  self.extra_dev_deps << ['test-unit', '~> 3.1']
-  self.extra_dev_deps << ['yard', '~> 0.8']
-  self.extra_dev_deps << ['hoe-bundler', '~> 1.1']
-  self.license 'LGPL'
-
-  spec_extras[:files] = File.read_utf("Manifest.txt").split(/\r?\n\r?/).reject{|f| f=~/^fox-includes|^web/ }
-  spec_extras[:files] += SWIG_MODULES.values.map{|f| File.join("ext/fox16_c", f) }
-  spec_extras[:files] << 'ext/fox16_c/include/inlinestubs.h'
-  spec_extras[:files] << 'ext/fox16_c/swigruby.h'
-  spec_extras[:files] << 'doap.rdf'
-  spec_extras[:files] << 'lib/fox16/kwargs.rb'
-end
+
+CLEAN.include( ".config", "ext/fox16_c/Makefile", "ext/fox16_c/*.o", "ext/fox16_c/*.bundle", "ext/fox16_c/mkmf.log", "ext/fox16_c/conftest.dSYM", "ext/fox16_c/swigruby.h", "ext/fox16_c/librb.c", "ext/fox16_c/include/inlinestubs.h", "ext/fox16_c/*_wrap.cpp", "tmp", "ports/*.installed", "ports/*mingw32*" )
+
+CLOBBER.include( "pkg" )
 
 # Make sure extension is built before tests are run
-task :test => [:compile]
+task :test => [:compile] do
+  sh "ruby -w -W2 -Ilib test/TS_All.rb -v"
+end
 
-# The "docs" task created by Hoe assumes that we want to run RDoc
-# over everything under the "lib" and "ext" subdirectories.
-# We need to go back and tell it to skip the stuff under ext.
-# rdoc_target = Rake::Task['docs'].prerequisites.first
-# rdoc_files = Rake::Task[rdoc_target].prerequisites
-# rdoc_files.reject! {|x| x == "ext/fox16_c" }
+task :gem => [:compile, :build]
 
-# Make sure that all of the package contents exist before we try to build the package
-#Rake::Task['package'].prerequisites.unshift("swig:swig", "fxruby:setversions", "fxruby:generate_kwargs_lib")
 
-# ... project specific tasks ...
+gem_spec = Bundler.load_gemspec('fxruby.gemspec')
 
-Rake::ExtensionTask.new("fox16_c", hoe.spec) do |ext|
+Rake::ExtensionTask.new("fox16_c", gem_spec) do |ext|
   ext.cross_compile = true
   ext.cross_platform = ['x86-mingw32', 'x64-mingw32']
   # Enable FXTRACE and FXASSERT for 'rake compile'
@@ -111,9 +116,13 @@ Rake::ExtensionTask.new("fox16_c", hoe.spec) do |ext|
       "--enable-win32-cross",
       "--with-fxscintilla",
     ]
+  ext.cross_config_options << "--enable-debug" if ENV['FXRUBY_MINGW_DEBUG']
 
   # Add dependent DLLs to the cross gems
   ext.cross_compiling do |spec|
+    # The fat binary gem doesn't depend on the fox package, since it bundles the libraries.
+    spec.metadata.delete('msys2_mingw_dependencies')
+
     platform_host_map =  {
       'x86-mingw32' => ['i686-w64-mingw32'],
       'x64-mingw32' => ['x86_64-w64-mingw32'],
@@ -128,7 +137,7 @@ Rake::ExtensionTask.new("fox16_c", hoe.spec) do |ext|
       dlls += [
           "libfxscintilla-20.dll",
           "libFOX-1.6-0.dll",
-          "libjpeg-8.dll",
+          "libjpeg-9.dll",
           "libpng16-16.dll",
           "libtiff-5.dll",
           "zlib1.dll",
@@ -136,23 +145,30 @@ Rake::ExtensionTask.new("fox16_c", hoe.spec) do |ext|
 
       spec.files += dlls.map{|dll| "ports/#{host}/bin/#{dll}" }
 
-      dlls.each do |dll|
-        task "ports/#{host}/bin/#{dll}" do |t|
-          sh "x86_64-w64-mingw32-strip", t.name
+      unless ENV['FXRUBY_MINGW_DEBUG']
+        dlls.each do |dll|
+          task "ports/#{host}/bin/#{dll}" do |t|
+            sh "x86_64-w64-mingw32-strip", t.name
+          end
         end
       end
     end
   end
+
+  FoxGemHelper.install_tasks
+  Bundler::GemHelper.instance.cross_platforms = ext.cross_platform
 end
 
 # To reduce the gem file size strip mingw32 dlls before packaging
-ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
-  task "tmp/x86-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/fox16_c.so" do |t|
-    sh "i686-w64-mingw32-strip -S tmp/x86-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/fox16_c.so"
-  end
+unless ENV['FXRUBY_MINGW_DEBUG']
+  ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
+    task "tmp/x86-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/fox16_c.so" do |t|
+      sh "i686-w64-mingw32-strip -S tmp/x86-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/fox16_c.so"
+    end
 
-  task "tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/fox16_c.so" do |t|
-    sh "x86_64-w64-mingw32-strip -S tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/fox16_c.so"
+    task "tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/fox16_c.so" do |t|
+      sh "x86_64-w64-mingw32-strip -S tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/fox16_c.so"
+    end
   end
 end
 
@@ -160,11 +176,9 @@ desc "Build the windows binary gems"
 task 'gem:windows' => 'gem' do
   require 'rake_compiler_dock'
 
-  gf = "tmp/Gemfile-rcd"
-  File.write(gf, File.read("Gemfile").gsub(/.*"(glu|opengl)".*/, ""))
-
-  sh "BUNDLE_GEMFILE=#{gf} bundle package"
-  RakeCompilerDock.sh "BUNDLE_GEMFILE=#{gf} bundle --local --without=norcd && rake cross native gem MAKE=\"nice make V=1 -j `nproc`\" "
+  sh "bundle package"
+  debug = "FXRUBY_MINGW_DEBUG=#{ENV['FXRUBY_MINGW_DEBUG'].inspect}" if ENV['FXRUBY_MINGW_DEBUG']
+  RakeCompilerDock.sh "bundle --local --without=test && rake cross native gem MAKE=\"nice make V=1 -j `nproc`\" #{debug}"
 end
 
 # Set environment variable SWIG_LIB to
@@ -172,6 +186,7 @@ end
 # before running swig on MinGW.
 namespace :swig do
   def sed(wrapper_src_file_name)
+    puts "Update #{wrapper_src_file_name}"
     results = []
     IO.readlines(wrapper_src_file_name).each do |line|
       line.gsub!(/static VALUE mCore;/, "VALUE mCore;")
@@ -188,11 +203,21 @@ namespace :swig do
     end
   end
 
+  def add_with_fxscintilla_cond(file)
+    puts "Update #{file} for fxscintilla"
+    content = File.binread(file)
+    content = "#ifdef WITH_FXSCINTILLA\n" + content + "#endif /* WITH_FXSCINTILLA */\n"
+    File.binwrite(file, content)
+  end
+
   def swig(swig_interface_file_name, wrapper_src_file_name)
     cmd = "#{SWIG} #{SWIGFLAGS} -o #{wrapper_src_file_name} #{swig_interface_file_name}"
     puts cmd
     system cmd
+
+    # Do our own wrapper file modifications:
     sed wrapper_src_file_name
+    add_with_fxscintilla_cond(wrapper_src_file_name) if ["scintilla_wrap.cpp"].include?(File.basename(wrapper_src_file_name))
   end
 
   task :swigruby_h => ["ext/fox16_c/swigruby.h"]
@@ -202,7 +227,7 @@ namespace :swig do
   end
 
   desc "Run SWIG to generate the wrapper files."
-  task :swig => [:swigruby_h] + SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16_c", cppfile) }
+  multitask :swig => [:swigruby_h] + SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16_c", cppfile) }
 
   # add dependencies for compile *.i to *_wrap.cpp
   SWIG_MODULES.each do |ifile, cppfile|
@@ -262,8 +287,7 @@ namespace :fxruby do
     make_impl
   end
 
-  file "ext/fox16_c/extconf.rb" => ['ext/fox16_c/swigruby.h', 'ext/fox16_c/impl.cpp', 'ext/fox16_c/include/inlinestubs.h'] +
-      SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16_c", cppfile) }
+  file "ext/fox16_c/extconf.rb" => ['ext/fox16_c/impl.cpp', 'ext/fox16_c/include/inlinestubs.h', 'swig:swig']
 
 
   directory "ports/archives"

data/doap.rdf.erb

@@ -78,7 +78,7 @@
       <doap:Version>
         <doap:branch>fox16</doap:branch>
         <doap:created><%= Date.today %></doap:created>
-        <doap:revision><%= PKG_VERSION %></doap:revision>
+        <doap:revision><%= Fox.fxrubyversion %></doap:revision>
       </doap:Version>
     </doap:release>
 

data/ext/fox16_c/FXRbObjRegistry.cpp

@@ -0,0 +1,169 @@
+/***********************************************************************
+ * FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
+ * Copyright (c) 2017-2017 by Lyle Johnson. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * For further information please contact the author by e-mail
+ * at "lars@greiz-reinsdorf.de".
+ ***********************************************************************/
+
+#include "FXRbObjRegistry.h"
+#include "FXRbCommon.h"
+#include "swigruby.h"
+
+FXRbObjRegistry::FXRbObjRegistry(){
+  FXRuby_Objects=st_init_numtable();
+}
+
+const char * FXRbObjRegistry::safe_rb_obj_classname(VALUE obj)
+{
+  int tdata = TYPE(obj)==T_DATA;
+  if( (tdata && IsInGC(DATA_PTR(obj)))
+#ifdef HAVE_RB_DURING_GC
+      || rb_during_gc()
+#endif
+  ){
+    /* It's not safe to call rb_obj_classname() during GC.
+    * Return dummy value in this case. */
+    return "during GC";
+  } else if (tdata) {
+    return rb_obj_classname(obj);
+  } else {
+    return "no T_DATA";
+  }
+}
+
+VALUE FXRbObjRegistry::NewBorrowedObj(void *ptr,swig_type_info* ty){
+  if(ptr!=0){
+    FXASSERT(ty!=0);
+    ObjDesc *desc;
+
+    if(FXMALLOC(&desc,ObjDesc,1)){
+      VALUE obj = SWIG_Ruby_NewPointerObj(ptr,ty,1);
+      FXTRACE((1,"FXRbNewPointerObj(foxObj=%p) => rubyObj=%p (%s)\n",ptr,(void *)obj,safe_rb_obj_classname(obj)));
+      desc->obj = obj;
+      desc->type = borrowed;
+      desc->in_gc = false;
+      int overwritten = st_insert(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t>(desc));
+      FXASSERT(!overwritten);
+      return obj;
+    } else {
+      FXASSERT(FALSE);
+      return Qnil;
+    }
+  }
+  else{
+    return Qnil;
+  }
+}
+
+void FXRbObjRegistry::RegisterRubyObj(VALUE rubyObj,const void* foxObj) {
+  FXASSERT(!NIL_P(rubyObj));
+  FXASSERT(foxObj!=0);
+  ObjDesc* desc;
+  FXTRACE((1,"FXRbRegisterRubyObj(rubyObj=%p (%s),foxObj=%p)\n",(void *)rubyObj,safe_rb_obj_classname(rubyObj),foxObj));
+  if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(&desc))!=0){
+    FXASSERT(desc->type == borrowed);
+    /* There is already a Ruby object registered for this foxObj.
+     * This can happen, if libfox calls methods out of the C++ object constructor,
+     * that can be overwritten in Ruby (like changeFocus) with the object as
+     * parameter. FXFileSelector is one example.
+     * To avoid double references to the same foxObj from different Ruby objects,
+     * we decouple the foxObj from previoius ruby object and point to the new one.
+     */
+    DATA_PTR(desc->obj) = 0;
+    desc->obj = rubyObj;
+    desc->type = own;
+  } else {
+    if(FXMALLOC(&desc,ObjDesc,1)){
+      desc->obj = rubyObj;
+      desc->type = own;
+      desc->in_gc = false;
+      int overwritten = st_insert(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t>(desc));
+      FXASSERT(!overwritten);
+    } else {
+      FXASSERT(FALSE);
+    }
+  }
+  FXASSERT(GetRubyObj(foxObj,false)==rubyObj);
+}
+
+void FXRbObjRegistry::UnregisterRubyObj(const void* foxObj, bool alsoOwned){
+  if(foxObj!=0){
+    ObjDesc* desc;
+    if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(&desc))!=0){
+      if( !alsoOwned && desc->type!=borrowed ) return;
+      FXTRACE((1,"FXRbUnregisterRubyObj(rubyObj=%p (%s),foxObj=%p)\n",(void *)desc->obj,safe_rb_obj_classname(desc->obj),foxObj));
+      DATA_PTR(desc->obj)=0;
+      FXFREE(&desc);
+      st_delete(FXRuby_Objects,reinterpret_cast<st_data_t *>(const_cast<void**>(&foxObj)),reinterpret_cast<st_data_t *>(0));
+      FXASSERT(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(0))==0);
+    }
+  }
+}
+
+
+VALUE FXRbObjRegistry::GetRubyObj(const void *foxObj,bool alsoBorrowed, bool in_gc_mark){
+  ObjDesc* desc;
+  if(foxObj!=0 && st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(&desc))!=0){
+    FXASSERT(desc!=0);
+    if(alsoBorrowed || desc->type!=borrowed){
+      const char *classname = in_gc_mark ? "in GC" : safe_rb_obj_classname(desc->obj);
+      FXTRACE((2,"%s(foxObj=%p) => rubyObj=%p (%s)\n", in_gc_mark ? "FXRbGcMark" : "FXRbGetRubyObj", foxObj, (void *)desc->obj, classname));
+      return desc->obj;
+    }
+  }
+  return Qnil;
+}
+
+
+bool FXRbObjRegistry::IsBorrowed(void* ptr){
+  FXASSERT(ptr!=0);
+  ObjDesc *desc;
+  if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t *>(&desc))!=0){
+    return desc->type == borrowed;
+  }
+  else{
+    return true;
+  }
+}
+
+bool FXRbObjRegistry::SetInGC(const void* ptr, bool enabled){
+  FXASSERT(ptr!=0);
+  ObjDesc *desc;
+  if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t *>(&desc))!=0){
+    desc->in_gc=enabled;
+    return enabled;
+  }
+  return false;
+}
+
+bool FXRbObjRegistry::IsInGC(const void* ptr){
+  FXASSERT(ptr!=0);
+  ObjDesc *desc;
+
+#ifdef HAVE_RB_DURING_GC
+  if( rb_during_gc() ){
+    return true;
+  }
+#endif
+  if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t *>(&desc))!=0){
+    return desc->in_gc;
+  }
+  return false;
+}
+
+FXRbObjRegistry FXRbObjRegistry::main;