fxruby 1.6.29-x64-mingw32 → 1.6.30-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62ea05a13170399b0045b4f1b8dc4676e6406e99
-  data.tar.gz: 31ce6631312ea1da5af8f6ba9364ed66f24834df
+  metadata.gz: f0bf4b64f57d2446d2c482c5ede727e3f5309d1c
+  data.tar.gz: 9cd6ad3dc5da44c86521d8e4c6411f3b4aff4309
 SHA512:
-  metadata.gz: eea35082e677a3c2474d8e96859b16b731b9d097e25280476e13f7501cc5cd7fd644c015463a3dcbe142002539352918126510292bca7609b76a672292ee18ef
-  data.tar.gz: 97c99cf164f67bd0dd8ddb20fa30724b3dfd7c58b57538fe4467bc94c38a64fa46d69f2766e365461c1afecdf5a8ba4b0ca683a89d3e609341a0f9038ba9eb66
+  metadata.gz: 863622f0b1f4ecfda39f3b20e2de8ff82aa00c0aedffa7d63f2561ea1d9ba6e3e5f82c1208207c85a280a0095a03f2f2aa5d23c9718f00e0243ead9794013e72
+  data.tar.gz: c90aa625b0ecf622a93bc89b953510ec362bab6a5c65815c50e05ed1b530e1f3b4b5155524621ed24b52422e1f1b7a3c9399af871060db7140af4940624e830d

data/History.txt

@@ -1,3 +1,14 @@
+=== 1.6.30 / 2015-07-07
+
+* Fix crashes in rb_gc_mark(): 0x00000003f54af8 is T_ZOMBIE / T_NONE
+* Release Ruby's GVL while calls to FXImage#savePixels, #loadPixels
+  and FXApp#run* methods.
+* Add a working version for FXApp#addInput event handling on Windows.
+  This works for sockets only for now.
+* Add FXApp#runOnUiThread and FXId#runOnUiThread .
+  This allows to safely execute GUI code from other threads.
+* Use rake-compiler-dock for building windows binary gems.
+
 === 1.6.29 / 2015-02-17
 
 * Add Windows binaries for Ruby-2.1 and 2.2.

data/Manifest.txt

@@ -128,6 +128,7 @@ examples/textedit/commands.rb
 examples/textedit/helpwindow.rb
 examples/textedit/prefdialog.rb
 examples/textedit/textedit.rb
+examples/thread.rb
 examples/unicode.rb
 ext/fox16_c/FXRbApp.cpp
 ext/fox16_c/FXRbDataTarget.cpp
@@ -135,6 +136,7 @@ ext/fox16_c/FXRbGLViewer.cpp
 ext/fox16_c/FXRuby.cpp
 ext/fox16_c/MANIFEST
 ext/fox16_c/extconf.rb
+ext/fox16_c/gvl_wrappers.cpp
 ext/fox16_c/impl.cpp
 ext/fox16_c/include/FXMemoryBuffer.h
 ext/fox16_c/include/FXRb4Splitter.h
@@ -357,6 +359,7 @@ ext/fox16_c/include/FXRbXBMImage.h
 ext/fox16_c/include/FXRbXPMIcon.h
 ext/fox16_c/include/FXRbXPMImage.h
 ext/fox16_c/include/FXRuby.h
+ext/fox16_c/include/gvl_wrappers.h
 ext/fox16_c/include/impl.h
 ext/fox16_c/make_impl.rb
 ext/fox16_c/markfuncs.cpp
@@ -675,6 +678,7 @@ lib/fox16/scintilla.rb
 lib/fox16/settings.rb
 lib/fox16/signal.rb
 lib/fox16/splashscreen.rb
+lib/fox16/thread.rb
 lib/fox16/timeout.rb
 lib/fox16/tkcompat.rb
 lib/fox16/undolist.rb
@@ -1142,6 +1146,7 @@ test/TC_FXIconDict.rb
 test/TC_FXIconList.rb
 test/TC_FXId.rb
 test/TC_FXImage.rb
+test/TC_FXJPGImage.rb
 test/TC_FXLight.rb
 test/TC_FXList.rb
 test/TC_FXListBox.rb

data/Rakefile

@@ -21,7 +21,6 @@ PKG_VERSION = Fox.fxrubyversion
 
 SWIG = (RUBY_PLATFORM =~ /mingw/) ? "swig.exe" : "swig"
 SWIGFLAGS = "-c++ -ruby -nodefaultdtor -nodefaultctor -w302 -features compactdefaultargs -I../fox-includes"
-SWIG_LIB = `#{SWIG} -swiglib`.chomp
 SWIG_MODULES = {
   "core.i" => "core_wrap.cpp",
   "dcmodule.i" => "dc_wrap.cpp",
@@ -47,7 +46,7 @@ SWIG_MODULES = {
 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/include/swigrubyrun.h", "ext/fox16_c/librb.c", "ext/fox16_c/include/inlinestubs.h", "ext/fox16_c/*_wrap.cpp"]
+  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/include/swigrubyrun.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")]
@@ -63,6 +62,7 @@ hoe = Hoe.spec "fxruby" do
   self.version = PKG_VERSION
   self.readme_file = 'README.rdoc'
   self.extra_rdoc_files << self.readme_file
+  self.extra_deps << ['mini_portile', '~> 0.6']
 
   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) }
@@ -126,6 +126,12 @@ ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
   end
 end
 
+desc "Build the windows binary gems"
+task 'gem:windows' => 'gem' do
+  require 'rake_compiler_dock'
+  RakeCompilerDock.sh "rake cross native gem RUBYOPT=--disable-rubygems MAKE=\"nice make V=1 -j `nproc`\" "
+end
+
 # Set environment variable SWIG_LIB to
 # c:/ruby-1.8.6-p383-preview2/devkit/msys/1.0.11/usr/local/share/swig/1.3.22
 # before running swig on MinGW.

data/examples/gltest.rb

@@ -312,13 +312,6 @@ if __FILE__ == $0
   # Construct the application
   application = FXApp.new("GLTest", "FoxTest")
 
-  # To ensure that the chores-based spin will run as fast as possible,
-  # we can disable the chore in FXRuby's event loop that tries to schedule
-  # other threads. This is OK for this program because there aren't any
-  # other Ruby threads running.
-
-  application.disableThreads
-
   # Construct the main window
   GLTestWindow.new(application)
 

data/examples/groupbox.rb

@@ -361,12 +361,14 @@ class GroupWindow < FXMainWindow
     show(PLACEMENT_SCREEN)
 
     # Create a thread to update the clock
-    @clockThread = Thread.new(@clockLabel) { |clockLabel|
+    @clockThread = Thread.new(@clockLabel) do |clockLabel|
       while true
-        clockLabel.text = Time.now.strftime("%I:%M:%S %p")
+        runOnUiThread do
+          clockLabel.text = Time.now.strftime("%I:%M:%S %p")
+        end
         sleep(1)
       end
-    }
+    end
   end
 end
 

data/examples/thread.rb

@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby
+
+require 'fox16'
+
+class ThreadedWindow < Fox::FXMainWindow
+  include Fox
+
+  def initialize(app)
+    # Call the base class initializer first
+    super(app, "Threaded Widget Test", :opts => DECOR_ALL, width: 200, height: 500)
+
+    @vframe = FXVerticalFrame.new(self,
+      FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0) do |frame|
+      FXButton.new(frame, "Klick to add", opts: FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_X) do |button|
+        button.connect(SEL_COMMAND, method(:on_button_clicked))
+      end
+    end
+  end
+
+  def on_button_clicked(sender, sel, ptr)
+    FXHorizontalFrame.new(@vframe,
+      FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 10) do |frame|
+
+      label = FXLabel.new frame, "..."
+
+      Thread.new do
+        50.times do |seconds|
+          runOnUiThread do
+            label.text = "#{(50 - seconds)/10.0} seconds to remove"
+          end
+          sleep 0.1
+        end
+
+        runOnUiThread do
+          @vframe.removeChild(frame)
+          @vframe.create; @vframe.show; @vframe.recalc
+        end
+      end
+    end
+    @vframe.create; @vframe.show; @vframe.recalc
+  end
+
+  # Create and show this window
+  def create
+    super
+    show(PLACEMENT_SCREEN)
+  end
+end
+
+if __FILE__ == $0
+  application = Fox::FXApp.new("ThreadApp", "FoxTest")
+  ThreadedWindow.new(application)
+  application.create
+  application.run
+end

data/ext/fox16_c/FXRbApp.cpp

@@ -36,19 +36,31 @@ extern "C" {
 #include <sys/time.h> /* For struct timeval */
 #endif
 
+#ifndef WIN32
+  #include <fcntl.h>
+#endif
+
 // Message map
 FXDEFMAP(FXRbApp) FXRbAppMap[]={
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+  FXMAPFUNC(SEL_IO_READ,FXRbApp::ID_CHORE_THREADS,FXRbApp::onChoreThreads),
+#else
   FXMAPFUNC(SEL_CHORE,FXRbApp::ID_CHORE_THREADS,FXRbApp::onChoreThreads),
+#endif
   };
 
 // Class implementation
 FXRbIMPLEMENT(FXRbApp,FXApp,FXRbAppMap,ARRAYNUMBER(FXRbAppMap))
 
+#ifdef WIN32
+WSAEVENT FXRbApp::interrupt_event = NULL;
+#else
+int FXRbApp::interrupt_fds[2] = {-1, -1};
+#endif
+
 // Constructor
-FXRbApp::FXRbApp(const FXchar* appname,const FXchar* vendor) : FXApp(appname,vendor),m_bThreadsEnabled(TRUE),sleepTime(100){
-  if(m_bThreadsEnabled){
-    addChore(this,ID_CHORE_THREADS);
-    }
+FXRbApp::FXRbApp(const FXchar* appname,const FXchar* vendor) : FXApp(appname,vendor),m_bThreadsEnabled(FALSE),sleepTime(100){
+  setThreadsEnabled(TRUE);
   }
 
 
@@ -67,12 +79,33 @@ void FXRbApp::setThreadsEnabled(FXbool enabled){
   if(enabled){
     if(!m_bThreadsEnabled){
       m_bThreadsEnabled=TRUE;
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+#ifdef WIN32
+      interrupt_event = CreateEvent(NULL, TRUE, FALSE, NULL);
+      addInput(interrupt_event,INPUT_READ,this,ID_CHORE_THREADS);
+#else
+      pipe2(interrupt_fds, O_NONBLOCK);
+      addInput(interrupt_fds[0],INPUT_READ,this,ID_CHORE_THREADS);
+#endif
+#else
       addChore(this,ID_CHORE_THREADS);
+#endif
       }
     }
   else{
     m_bThreadsEnabled=FALSE;
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+#ifdef WIN32
+    removeInput(interrupt_event,INPUT_READ);
+    CloseHandle(interrupt_event); interrupt_event = NULL;
+#else
+    removeInput(interrupt_fds[0],INPUT_READ);
+    close(interrupt_fds[0]); interrupt_fds[0] = -1;
+    close(interrupt_fds[1]); interrupt_fds[1] = -1;
+#endif
+#else
     removeChore(this,ID_CHORE_THREADS);
+#endif
     }
   }
 
@@ -88,9 +121,27 @@ FXuint FXRbApp::getSleepTime() const {
   return sleepTime;
   }
 
+long FXRbApp::onChoreThreads(FXObject *obj,FXSelector sel,void *p){
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+#ifdef WIN32
+  ResetEvent(interrupt_event);
+#else
+  char byte;
+  // clear the pipe
+  read(interrupt_fds[0], &byte, 1);
+#endif
+#endif
+  return FXRbApp_onChoreThreads(this, obj, sel, p);
+  }
+
+long FXRbApp_onChoreThreads_gvlcb(FXRbApp *self,FXObject *obj,FXSelector sel,void *p){
+  return self->onChoreThreads_gvlcb(obj, sel, p);
+  }
 
 // Process threads
-long FXRbApp::onChoreThreads(FXObject*,FXSelector,void*){
+long FXRbApp::onChoreThreads_gvlcb(FXObject*,FXSelector,void*){
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+#else
   // Pause for 'sleepTime' millseconds
   struct timeval wait;
   wait.tv_sec=0;
@@ -108,16 +159,27 @@ long FXRbApp::onChoreThreads(FXObject*,FXSelector,void*){
 
   // Re-register this chore for next time
   addChore(this,ID_CHORE_THREADS);
+#endif
 
   // Back to work...
   return 1;
   }
 
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+void fxrb_wakeup_fox(void *){
+#ifdef WIN32
+  SetEvent(FXRbApp::interrupt_event);
+#else
+  write(FXRbApp::interrupt_fds[1], "X", 1);
+#endif
+  }
+#endif
 
 // Destructor
 FXRbApp::~FXRbApp(){
   FXTRACE((100,"FXRbApp::~FXRbApp()\n"));
   VALUE myRegistry;
+  setThreadsEnabled(FALSE);
   FXRbDestroyAppSensitiveObjects();
   myRegistry=FXRbGetRubyObj(&(reg()),true);
   if(!NIL_P(myRegistry)){

data/ext/fox16_c/FXRuby.cpp

@@ -115,7 +115,7 @@ VALUE FXRbNewPointerObj(void *ptr,swig_type_info* ty){
     FXRubyObjDesc *desc;
     if(FXMALLOC(&desc,FXRubyObjDesc,1)){
       obj=SWIG_Ruby_NewPointerObj(ptr,ty,1);
-      FXTRACE((1,"FXRbNewPointerObj(rubyObj=%d,foxObj=%p)\n",static_cast<int>(obj),ptr));
+      FXTRACE((1,"FXRbNewPointerObj(foxObj=%p) => rubyObj=%p (%s)\n",ptr,(void *)obj,rb_obj_classname(obj)));
       desc->obj=obj;
       desc->borrowed=true;
       desc->in_gc=false;
@@ -185,23 +185,38 @@ void* FXRbConvertPtr(VALUE obj,swig_type_info* ty){
 FXbool FXRbCatchExceptions=FALSE;
 
 // Returns an FXInputHandle for this Ruby file object
-FXInputHandle FXRbGetReadFileHandle(VALUE obj) {
+FXInputHandle FXRbGetReadFileHandle(VALUE obj,FXuint mode) {
   int fd;
   fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
 #ifdef WIN32
 #ifdef __CYGWIN__
   return (FXInputHandle) get_osfhandle(fd);
 #else
-  return (FXInputHandle) _get_osfhandle(fd);
+  WSAEVENT hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+  long events = 0;
+  if(mode&INPUT_READ) events |= FD_READ|FD_ACCEPT|FD_OOB;
+  if(mode&INPUT_EXCEPT) events |= FD_CLOSE|FD_QOS|FD_GROUP_QOS|FD_ROUTING_INTERFACE_CHANGE|FD_ADDRESS_LIST_CHANGE;
+  if ( WSAEventSelect(_get_osfhandle(fd), hEvent, events) == SOCKET_ERROR ) {
+    WSACloseEvent( hEvent );
+    rb_raise( rb_eRuntimeError, "WSAEventSelect sockett error: %d", WSAGetLastError() );
+  }
+  rb_iv_set(obj, "FXRuby::FXRbGetReadFileHandle", ULL2NUM((intptr_t)hEvent));
+  return (FXInputHandle) hEvent;
 #endif
 #else
   return (FXInputHandle) fd;
 #endif
   }
 
+void FXRbRemoveReadFileHandle(VALUE obj,FXuint mode) {
+#ifdef WIN32
+  WSAEVENT hEvent = (HANDLE)NUM2ULL(rb_iv_get(obj, "FXRuby::FXRbGetReadFileHandle"));
+  CloseHandle( hEvent );
+#endif
+}
 
 // Returns an FXInputHandle for this Ruby file object
-FXInputHandle FXRbGetWriteFileHandle(VALUE obj) {
+FXInputHandle FXRbGetWriteFileHandle(VALUE obj,FXuint mode) {
   int fd;
 #if defined(RUBINIUS)
   VALUE vwrite = rb_intern("@write");
@@ -223,20 +238,36 @@ FXInputHandle FXRbGetWriteFileHandle(VALUE obj) {
 #ifdef __CYGWIN__
   return (FXInputHandle) get_osfhandle(fd);
 #else
-  return (FXInputHandle) _get_osfhandle(fd);
+  WSAEVENT hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+  long events = 0;
+  if(mode&INPUT_WRITE) events |= FD_WRITE|FD_CONNECT;
+  if(mode&INPUT_EXCEPT) events |= FD_CLOSE|FD_QOS|FD_GROUP_QOS|FD_ROUTING_INTERFACE_CHANGE|FD_ADDRESS_LIST_CHANGE;
+  if ( WSAEventSelect(_get_osfhandle(fd), hEvent, events) == SOCKET_ERROR ) {
+    WSACloseEvent( hEvent );
+    rb_raise( rb_eRuntimeError, "WSAEventSelect sockettt error: %d", WSAGetLastError() );
+  }
+  rb_iv_set(obj, "FXRuby::FXRbGetWriteFileHandle", ULL2NUM((intptr_t)hEvent));
+  return (FXInputHandle) hEvent;
 #endif
 #else
   return (FXInputHandle) fd;
 #endif
   }
 
+void FXRbRemoveWriteFileHandle(VALUE obj,FXuint mode) {
+#ifdef WIN32
+  WSAEVENT hEvent = (HANDLE)NUM2ULL(rb_iv_get(obj, "FXRuby::FXRbGetWriteFileHandle"));
+  CloseHandle( hEvent );
+#endif
+}
+
 
 // Register this Ruby class instance
 void FXRbRegisterRubyObj(VALUE rubyObj,const void* foxObj) {
   FXASSERT(!NIL_P(rubyObj));
   FXASSERT(foxObj!=0);
   FXRubyObjDesc* desc;
-  FXTRACE((1,"FXRbRegisterRubyObj(rubyObj=%d,foxObj=%p)\n",static_cast<int>(rubyObj),foxObj));
+  FXTRACE((1,"FXRbRegisterRubyObj(rubyObj=%p (%s),foxObj=%p)\n",(void *)rubyObj,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->borrowed);
     /* There is already a Ruby object registered for this foxObj.
@@ -269,10 +300,15 @@ void FXRbRegisterRubyObj(VALUE rubyObj,const void* foxObj) {
  * Remove this mapping between a Ruby instance and a C++ object
  */
 void FXRbUnregisterRubyObj(const void* foxObj){
+  FXRbUnregisterRubyObj2(foxObj, true);
+}
+
+void FXRbUnregisterRubyObj2(const void* foxObj, bool alsoOwned){
   if(foxObj!=0){
     FXRubyObjDesc* desc;
     if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(&desc))!=0){
-      FXTRACE((1,"FXRbUnregisterRubyObj(rubyObj=%d,foxObj=%p)\n",static_cast<int>(desc->obj),foxObj));
+      if( !alsoOwned && !desc->borrowed ) return;
+      FXTRACE((1,"FXRbUnregisterRubyObj(rubyObj=%p (%s),foxObj=%p)\n",(void *)desc->obj,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));
@@ -281,6 +317,22 @@ void FXRbUnregisterRubyObj(const void* foxObj){
     }
   }
 
+void FXRbUnregisterBorrowedRubyObj(const void* foxObj){
+  FXRbUnregisterRubyObj2( foxObj, false );
+};
+void FXRbUnregisterBorrowedRubyObj(FXlong foxObj){
+};
+void FXRbUnregisterBorrowedRubyObj(FXString& foxObj){
+};
+void FXRbUnregisterBorrowedRubyObj(FXRegion& foxObj){
+  FXRbUnregisterRubyObj2( &foxObj, false );
+};
+void FXRbUnregisterBorrowedRubyObj(FXRectangle& foxObj){
+  FXRbUnregisterRubyObj2( &foxObj, false );
+};
+void FXRbUnregisterBorrowedRubyObj(FXDC& foxObj){
+  FXRbUnregisterRubyObj2( &foxObj, false );
+};
 
 VALUE to_ruby(const FXObject* obj){
   if(obj!=0){
@@ -299,20 +351,16 @@ VALUE to_ruby(const FXObject* obj){
  * Return the registered Ruby class instance associated with this
  * FOX object, or Qnil if not found.
  */
-VALUE FXRbGetRubyObj(const void *foxObj,bool searchBoth){
+VALUE FXRbGetRubyObj(const void *foxObj,bool alsoBorrowed){
   FXRubyObjDesc* 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(searchBoth){
+    if(alsoBorrowed || !desc->borrowed){
+      FXTRACE((2,"FXRbGetRubyObj(foxObj=%p) => rubyObj=%p (%s)\n",foxObj,(void *)desc->obj,rb_obj_classname(desc->obj)));
       return desc->obj;
       }
-    else{
-      return desc->borrowed ? Qnil : desc->obj;
-      }
-    }
-  else{
-    return Qnil;
     }
+  return Qnil;
   }
 
 /**
@@ -1229,7 +1277,7 @@ static ID id_assocs;
  * or return zero if the designated receiver doesn't handle this
  * message.
  */
-ID FXRbLookupHandler(FXObject* recv,FXSelector key){
+ID FXRbLookupHandler_gvlcb(FXObject* recv,FXSelector key){
   FXTRACE((100,"FXRbLookupHandler(recv=%p(%s),FXSEL(%d,%d))\n",recv,recv->getClassName(),FXSELTYPE(key),FXSELID(key)));
   ID id=0;
   VALUE rubyObj=to_ruby(recv);
@@ -1291,7 +1339,7 @@ static VALUE handle_rescue(VALUE args,VALUE error){
 
 
 // Call the designated function and return its result (which should be a long).
-long FXRbHandleMessage(FXObject* recv,ID func,FXObject* sender,FXSelector key,void* ptr){
+long FXRbHandleMessage_gvlcb(FXObject* recv,ID func,FXObject* sender,FXSelector key,void* ptr){
   FXRbHandleArgs hArgs;
   hArgs.recv=to_ruby(recv);
   hArgs.sender=to_ruby(sender);
@@ -1312,6 +1360,10 @@ long FXRbHandleMessage(FXObject* recv,ID func,FXObject* sender,FXSelector key,vo
     retval=handle_body(reinterpret_cast<VALUE>(&hArgs));
     }
 
+  FXRbUnregisterBorrowedRubyObj(recv);
+  FXRbUnregisterBorrowedRubyObj(sender);
+  FXRbUnregisterBorrowedRubyObj(ptr);
+
   /**
    * Process the return value. For boolean return values, convert "true"
    * to 1 and "false" to zero. For numeric types, convert it to a long value
@@ -1380,70 +1432,70 @@ void FXRbRange2LoHi(VALUE range,FXdouble& lo,FXdouble& hi){
 
 //----------------------------------------------------------------------
 
-void FXRbCallVoidMethod(FXObject* recv, ID func) {
+void FXRbCallVoidMethod_gvlcb(FXObject* recv, const char *func) {
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
   FXASSERT(!FXRbIsInGC(recv));
-  rb_funcall(obj,func,0,NULL);
+  rb_funcall(obj,rb_intern(func),0,NULL);
   }
 
-void FXRbCallVoidMethod(FXDC* recv,ID func) {
+void FXRbCallVoidMethod_gvlcb(FXDC* recv,const char *func) {
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  rb_funcall(obj,func,0,NULL);
+  rb_funcall(obj,rb_intern(func),0,NULL);
   }
 
 //----------------------------------------------------------------------
 
-bool FXRbCallBoolMethod(const FXObject* recv,ID func){
+bool FXRbCallBoolMethod_gvlcb(const FXObject* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE v=rb_funcall(obj,func,0,NULL);
+  VALUE v=rb_funcall(obj,rb_intern(func),0,NULL);
   return (v==Qtrue);
   }
 
 //----------------------------------------------------------------------
 
 // Call function with "FXint" return value
-FXint FXRbCallIntMethod(const FXObject* recv,ID func){
+FXint FXRbCallIntMethod_gvlcb(const FXObject* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,0,NULL);
+  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
   return static_cast<FXint>(NUM2INT(result));
   }
 
 //----------------------------------------------------------------------
 
 // Call function with "FXGLObject*" return value
-FXGLObject* FXRbCallGLObjectMethod(FXGLObject* recv,ID func){
+FXGLObject* FXRbCallGLObjectMethod_gvlcb(FXGLObject* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,0,NULL);
+  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
   return NIL_P(result) ? 0 : reinterpret_cast<FXGLObject*>(DATA_PTR(result));
   }
 
-FXGLObject* FXRbCallGLObjectMethod(FXGLViewer* recv,ID func,FXint x,FXint y){
+FXGLObject* FXRbCallGLObjectMethod_gvlcb(FXGLViewer* recv,const char *func,FXint x,FXint y){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,2,INT2NUM(x),INT2NUM(y));
+  VALUE result=rb_funcall(obj,rb_intern(func),2,INT2NUM(x),INT2NUM(y));
   return NIL_P(result) ? 0 : reinterpret_cast<FXGLObject*>(DATA_PTR(result));
   }
 
-FXGLObject* FXRbCallGLObjectMethod(FXGLObject* recv,ID func,FXuint* path,FXint n){
+FXGLObject* FXRbCallGLObjectMethod_gvlcb(FXGLObject* recv,const char *func,FXuint* path,FXint n){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,1,FXRbMakeArray(path,n));
+  VALUE result=rb_funcall(obj,rb_intern(func),1,FXRbMakeArray(path,n));
   return NIL_P(result) ? 0 : reinterpret_cast<FXGLObject*>(DATA_PTR(result));
   }
 
 //----------------------------------------------------------------------
 
 // Call function with "FXGLObject**" return value
-FXGLObject** FXRbCallGLObjectArrayMethod(FXGLViewer* recv,ID func,FXint x,FXint y,FXint w,FXint h){
+FXGLObject** FXRbCallGLObjectArrayMethod_gvlcb(FXGLViewer* recv,const char *func,FXint x,FXint y,FXint w,FXint h){
   FXGLObject** objects=NULL;
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,4,INT2NUM(x),INT2NUM(y),INT2NUM(w),INT2NUM(h));
+  VALUE result=rb_funcall(obj,rb_intern(func),4,INT2NUM(x),INT2NUM(y),INT2NUM(w),INT2NUM(h));
   if(!NIL_P(result)){
     Check_Type(result,T_ARRAY);
     if(FXMALLOC(&objects,FXGLObject*,RARRAY_LEN(result)+1)){
@@ -1458,55 +1510,56 @@ FXGLObject** FXRbCallGLObjectArrayMethod(FXGLViewer* recv,ID func,FXint x,FXint
 
 //----------------------------------------------------------------------
 
-FXTableItem* FXRbCallTableItemMethod(FXTable* recv,ID func,const FXString& text,FXIcon* icon,void* ptr){
+FXTableItem* FXRbCallTableItemMethod_gvlcb(FXTable* recv,const char *func,const FXString& text,FXIcon* icon,void* ptr){
   VALUE itemData=(ptr==0)?Qnil:reinterpret_cast<VALUE>(ptr);
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,3,to_ruby(text),to_ruby(icon),itemData);
+  VALUE result=rb_funcall(obj,rb_intern(func),3,to_ruby(text),to_ruby(icon),itemData);
+  FXRbUnregisterBorrowedRubyObj(icon);
   return NIL_P(result)?0:reinterpret_cast<FXTableItem*>(DATA_PTR(result));
   }
 
-FXTableItem* FXRbCallTableItemMethod(FXTable* recv,ID func,FXint row,FXint col,FXbool notify){
+FXTableItem* FXRbCallTableItemMethod_gvlcb(FXTable* recv,const char *func,FXint row,FXint col,FXbool notify){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,3,to_ruby(row),to_ruby(col),to_ruby(notify));
+  VALUE result=rb_funcall(obj,rb_intern(func),3,to_ruby(row),to_ruby(col),to_ruby(notify));
   return NIL_P(result)?0:reinterpret_cast<FXTableItem*>(DATA_PTR(result));
   }
 
 //----------------------------------------------------------------------
 
-FXTreeItem* FXRbCallTreeItemMethod(const FXTreeList* recv,ID func,FXint x,FXint y){
+FXTreeItem* FXRbCallTreeItemMethod_gvlcb(const FXTreeList* recv,const char *func,FXint x,FXint y){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,2,INT2NUM(x),INT2NUM(y));
+  VALUE result=rb_funcall(obj,rb_intern(func),2,INT2NUM(x),INT2NUM(y));
   return NIL_P(result) ? 0 : reinterpret_cast<FXTreeItem*>(DATA_PTR(result));
   }
 
 //----------------------------------------------------------------------
 
-FXFoldingItem* FXRbCallFoldingItemMethod(const FXFoldingList* recv,ID func,FXint x,FXint y){
+FXFoldingItem* FXRbCallFoldingItemMethod_gvlcb(const FXFoldingList* recv,const char *func,FXint x,FXint y){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,2,INT2NUM(x),INT2NUM(y));
+  VALUE result=rb_funcall(obj,rb_intern(func),2,INT2NUM(x),INT2NUM(y));
   return NIL_P(result) ? 0 : reinterpret_cast<FXFoldingItem*>(DATA_PTR(result));
   }
 
 //----------------------------------------------------------------------
 
-FXFileAssoc* FXRbCallFileAssocMethod(const FXFileDict* recv,ID func,const FXchar* pathname){
+FXFileAssoc* FXRbCallFileAssocMethod_gvlcb(const FXFileDict* recv,const char *func,const FXchar* pathname){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,1,to_ruby(pathname));
+  VALUE result=rb_funcall(obj,rb_intern(func),1,to_ruby(pathname));
   return NIL_P(result) ? 0 : reinterpret_cast<FXFileAssoc*>(DATA_PTR(result));
   }
 
 //----------------------------------------------------------------------
 
-FXIcon* FXRbCallIconMethod(const FXTableItem* recv,ID func){
+FXIcon* FXRbCallIconMethod_gvlcb(const FXTableItem* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
 	if(!NIL_P(obj)){
-	  VALUE result=rb_funcall(obj,func,0,NULL);
+	  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
 	  return NIL_P(result) ? 0 : reinterpret_cast<FXIcon*>(DATA_PTR(result));
 		}
 	else{
@@ -1516,60 +1569,73 @@ FXIcon* FXRbCallIconMethod(const FXTableItem* recv,ID func){
 
 //----------------------------------------------------------------------
 
-FXWindow* FXRbCallWindowMethod(const FXTableItem* recv,ID func,FXTable* table){
+FXWindow* FXRbCallWindowMethod_gvlcb(const FXTableItem* recv,const char *func,FXTable* table){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,1,to_ruby(table));
+  VALUE result=rb_funcall(obj,rb_intern(func),1,to_ruby(table));
+  FXRbUnregisterBorrowedRubyObj(table);
   return NIL_P(result) ? 0 : reinterpret_cast<FXWindow*>(DATA_PTR(result));
   }
 
 //----------------------------------------------------------------------
 
 // Call function with "FXRange" return value
-FXRangef FXRbCallRangeMethod(FXObject* recv,ID func){
+FXRangef FXRbCallRangeMethod_gvlcb(FXObject* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,0,NULL);
+  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
   return *reinterpret_cast<FXRangef*>(DATA_PTR(result));
   }
 
 //----------------------------------------------------------------------
 
 // Call functions with FXString return value
-FXString FXRbCallStringMethod(const FXObject* recv, ID func){
+FXString FXRbCallStringMethod_gvlcb(const FXObject* recv, const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,0,NULL);
+  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
   return FXString(StringValuePtr(result));
   }
 
 //----------------------------------------------------------------------
 
 // Call functions with const FXchar* return value
-const FXchar* FXRbCallCStringMethod(const FXObject* recv, ID func, const FXchar* message, const FXchar* hint){
+const FXchar* FXRbCallCStringMethod_gvlcb(const FXObject* recv, const char *func, const FXchar* message, const FXchar* hint){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,2,to_ruby(message),to_ruby(hint));
+  VALUE result=rb_funcall(obj,rb_intern(func),2,to_ruby(message),to_ruby(hint));
   return NIL_P(result) ? 0 : StringValuePtr(result);
   }
 
 // Call functions with const FXchar* return value
-const FXchar* FXRbCallCStringMethod(const FXObject* recv, ID func, const FXchar* context, const FXchar* message, const FXchar* hint){
+const FXchar* FXRbCallCStringMethod_gvlcb(const FXObject* recv, const char *func, const FXchar* context, const FXchar* message, const FXchar* hint){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,3,to_ruby(context),to_ruby(message),to_ruby(hint));
+  VALUE result=rb_funcall(obj,rb_intern(func),3,to_ruby(context),to_ruby(message),to_ruby(hint));
   return NIL_P(result) ? 0 : StringValuePtr(result);
   }
 //----------------------------------------------------------------------
 
 // Call functions with FXwchar return value
-FXwchar FXRbCallWCharMethod(const FXObject* recv, ID func){
+FXwchar FXRbCallWCharMethod_gvlcb(const FXObject* recv, const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,0,NULL);
+  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
   return static_cast<FXwchar>(NUM2ULONG(result));
   }
 
+void FXRbCallSetDashes_gvlcb(FXDC* recv,const char *func,FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength){
+  rb_funcall(FXRbGetRubyObj(recv,false),rb_intern(func),2,to_ruby(dashoffset),FXRbMakeArray(dashpattern,dashlength));
+  }
+
+void FXRbCallDCDrawMethod_gvlcb(FXDC* recv, const char * func, FXint x,FXint y,const FXString& string){
+  rb_funcall(FXRbGetRubyObj(recv,false),rb_intern(func),3,to_ruby(x),to_ruby(y),to_ruby(string)); \
+  }
+
+void FXRbCallDCDrawMethod_gvlcb(FXDC* recv, const char * func, FXint x,FXint y,const FXchar* string,FXuint length){
+  rb_funcall(FXRbGetRubyObj(recv,false),rb_intern(func),3,to_ruby(x),to_ruby(y),to_ruby(string,length)); \
+  }
+
 //----------------------------------------------------------------------
 
 // Special destructors to handle order dependencies
@@ -1684,59 +1750,25 @@ void FXRbFoldingList::enumerateItems(FXFoldingItem* fm,FXFoldingItem* to,FXObjec
 
 static ID id_cmp;
 
-// Sort function stand-in for FXComboBox
-FXint FXRbComboBox::sortFunc(const FXListItem* a,const FXListItem* b){
-  VALUE itemA = FXRbGetRubyObj(const_cast<FXListItem*>(a), "FXListItem *");
-  VALUE itemB = FXRbGetRubyObj(const_cast<FXListItem*>(b), "FXListItem *");
-  VALUE result=rb_funcall(itemA,id_cmp,1,itemB);
-  return static_cast<FXint>(NUM2INT(result));
-  }
-
-
-// Sort function stand-in for FXFoldingList
-FXint FXRbFoldingList::sortFunc(const FXFoldingItem* a,const FXFoldingItem* b){
-  VALUE itemA = FXRbGetRubyObj(const_cast<FXFoldingItem*>(a), "FXFoldingItem *");
-  VALUE itemB = FXRbGetRubyObj(const_cast<FXFoldingItem*>(b), "FXFoldingItem *");
-  VALUE result=rb_funcall(itemA,id_cmp,1,itemB);
-  return static_cast<FXint>(NUM2INT(result));
-  }
-
-
-// Sort function stand-in for FXIconList
-FXint FXRbIconList::sortFunc(const FXIconItem* a,const FXIconItem* b){
-  VALUE itemA = FXRbGetRubyObj(const_cast<FXIconItem*>(a), "FXIconItem *");
-  VALUE itemB = FXRbGetRubyObj(const_cast<FXIconItem*>(b), "FXIconItem *");
-  VALUE result = rb_funcall(itemA,id_cmp,1,itemB);
-  return static_cast<FXint>(NUM2INT(result));
-  }
-
-
-// Sort function stand-in for FXList
-FXint FXRbList::sortFunc(const FXListItem* a,const FXListItem* b){
-  VALUE itemA = FXRbGetRubyObj(const_cast<FXListItem*>(a), "FXListItem *");
-  VALUE itemB = FXRbGetRubyObj(const_cast<FXListItem*>(b), "FXListItem *");
-  VALUE result=rb_funcall(itemA,id_cmp,1,itemB);
-  return static_cast<FXint>(NUM2INT(result));
-  }
-
-
-// Sort function stand-in for FXListBox
-FXint FXRbListBox::sortFunc(const FXListItem* a,const FXListItem* b){
-  VALUE itemA = FXRbGetRubyObj(const_cast<FXListItem*>(a), "FXListItem *");
-  VALUE itemB = FXRbGetRubyObj(const_cast<FXListItem*>(b), "FXListItem *");
-  VALUE result=rb_funcall(itemA,id_cmp,1,itemB);
-  return static_cast<FXint>(NUM2INT(result));
-  }
-
-
-// Sort function stand-in for FXTreeList
-FXint FXRbTreeList::sortFunc(const FXTreeItem* a,const FXTreeItem* b){
-  VALUE itemA = FXRbGetRubyObj(const_cast<FXTreeItem*>(a), "FXTreeItem *");
-  VALUE itemB = FXRbGetRubyObj(const_cast<FXTreeItem*>(b), "FXTreeItem *");
-  VALUE result=rb_funcall(itemA,id_cmp,1,itemB);
-  return static_cast<FXint>(NUM2INT(result));
-  }
-
+#define SORTFUNC(list, item) \
+FXint list::sortFunc(const item* a,const item* b){ \
+  return list##_sortFunc(a, b); \
+  } \
+FXint list##_sortFunc_gvlcb(const item* a,const item* b){ \
+  VALUE itemA = FXRbGetRubyObj(const_cast<item*>(a), #item " *"); \
+  VALUE itemB = FXRbGetRubyObj(const_cast<item*>(b), #item " *"); \
+  VALUE result=rb_funcall(itemA,id_cmp,1,itemB); \
+  return static_cast<FXint>(NUM2INT(result)); \
+  }
+
+SORTFUNC( FXRbComboBox, FXListItem )
+SORTFUNC( FXRbFoldingList, FXFoldingItem )
+SORTFUNC( FXRbIconList, FXIconItem )
+SORTFUNC( FXRbList, FXListItem )
+SORTFUNC( FXRbListBox, FXListItem )
+SORTFUNC( FXRbTreeList, FXTreeItem )
+
+#undef SORTFUNC
 
 // Feedback buffer sort routine stand-in for FXGLViewer
 FXbool FXRbGLViewer::sortProc(FXfloat*& buffer,FXint& used,FXint& size){