fxruby 1.6.50 → 1.6.51

data/docs/top-level-namespace.html

@@ -204,9 +204,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Mar 11 16:01:29 2025 by
+  Generated on Thu Mar 26 09:48:22 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.37 (ruby-3.5.0).
+  0.9.38 (ruby-4.0.0).
 </div>
 
     </div>

data/examples/canvasdemo.rb

@@ -1,10 +1,10 @@
 require 'fox16'
 require 'fox16/canvas'
 
-include Fox
-include Canvas
+class CanvasDemo < Fox::FXMainWindow
+  include Fox
+  include Canvas
 
-class CanvasDemo < FXMainWindow
   def initialize(app)
     # Initialize base class first
     super(app, "Canvas Demo", nil, nil, DECOR_ALL, 0, 0, 800, 600)
@@ -85,7 +85,7 @@ class CanvasDemo < FXMainWindow
 end
 
 if __FILE__ == $0
-  app = FXApp.new("CanvasDemo", "FXRuby")
+  app = Fox::FXApp.new("CanvasDemo", "FXRuby")
   CanvasDemo.new(app)
   app.create
   app.run

data/examples/iconlist.rb

@@ -1,4 +1,5 @@
 require 'fox16'
+require 'uri'
 
 include Fox
 
@@ -47,14 +48,23 @@ class IconListWindow < FXMainWindow
     iconlist.appendHeader("User", nil, 50)
     iconlist.appendHeader("Group", nil, 50)
 
-    big_folder = loadIcon("bigfolder.png")
-    mini_folder = loadIcon("minifolder.png")
+    @big_folder = loadIcon("bigfolder.png")
+    @mini_folder = loadIcon("minifolder.png")
 
-    iconlist.appendItem("Really BIG and wide item to test\tDocument\t10000\tJune 13, 1999\tUser\tSoftware", big_folder, mini_folder)
+    iconlist.appendItem("Really BIG and wide item to test\tDocument\t10000\tJune 13, 1999\tUser\tSoftware", @big_folder, @mini_folder)
     1.upto(400) do |i|
-      iconlist.appendItem("Filename_#{i}\tDocument\t10000\tJune 13, 1999\tUser\tSoftware", big_folder, mini_folder)
+      iconlist.appendItem("Filename_#{i}\tDocument\t10000\tJune 13, 1999\tUser\tSoftware", @big_folder, @mini_folder)
     end
     iconlist.currentItem = iconlist.numItems - 1
+    @iconlist = iconlist
+
+    FXMenuPane.new(self) do |menuPane|
+      paste_icon = loadIcon("paste.png")
+      FXMenuCommand.new(menuPane, "&Insert from clipboard\tCtrl-V", paste_icon) do |mc|
+        mc.connect(SEL_COMMAND) { insert_from_clipboard }
+      end
+      FXMenuTitle.new(menubar, "&Edit", nil, menuPane)
+    end
 
     # Arrange menu
     FXMenuPane.new(self) do |menuPane|
@@ -67,6 +77,12 @@ class IconListWindow < FXMainWindow
     end
     # Let's see a tooltip
     FXToolTip.new(getApp())
+
+    # Register the drag types for copy files from the clipboard
+    @dragtype_urilist = app.registerDragType("text/uri-list")
+    @dragtype_filename = app.registerDragType("FileNameW")
+    @dragtype_filegroup = app.registerDragType("FileGroupDescriptorW")
+
   end
 
   # Overrides base class version
@@ -74,6 +90,65 @@ class IconListWindow < FXMainWindow
     super
     show(PLACEMENT_SCREEN)
   end
+
+  def get_clipboard_files
+    # Show the avaliable clipboard formats:
+    puts "Avaliable clipboard formats:"
+    type_ids = inquireDNDTypes(FROM_CLIPBOARD)
+    pp type_ids.map{|id| [id, app.getDragTypeName(id), getDNDData(FROM_CLIPBOARD, id)] }
+
+    # Process copied files with standard uri list (on Linux)
+    paths = getDNDData(FROM_CLIPBOARD, @dragtype_urilist)
+    if paths
+      files = paths.each_line.map do |file|
+        # file.chomp.sub(%r{^file://}, "")
+        URI.decode_uri_component(URI(file.chomp).path)
+      end
+      return files
+    end
+
+    # Process copied data from Windows Explorer
+    # This works for files only, but not for directories.
+    path = getDNDData(FROM_CLIPBOARD, @dragtype_filename)
+    filesdata = getDNDData(FROM_CLIPBOARD, @dragtype_filegroup)
+    if path && filesdata
+      path = path.encode("UTF-8", "UTF-16LE").rstrip("\0")
+      path = File.dirname(path)
+      cnt, rest = filesdata.unpack("Ia*")
+      files = cnt.times.map do
+        # Unpack the FILEGROUPDESCRIPTORW struct
+        #  DWORD    dwFlags;
+        #  CLSID    clsid;
+        #  SIZEL    sizel;
+        #  POINTL   pointl;
+        #  DWORD    dwFileAttributes;
+        #  FILETIME ftCreationTime;
+        #  FILETIME ftLastAccessTime;
+        #  FILETIME ftLastWriteTime;
+        #  DWORD    nFileSizeHigh;
+        #  DWORD    nFileSizeLow;
+        #  CHAR     cFileName[MAX_PATH];
+        dwFlags, clsid, sizel, pointl, dwFileAttributes,
+            ftCreationTime, ftLastAccessTime, ftLastAccessTime,
+            nFileSizeHigh, nFileSizeLow, cFileName, rest =
+            rest.unpack("La16a8a8La8a8a8LLa520a*")
+        fname = cFileName.encode("UTF-8", "UTF-16LE").rstrip("\0")
+        File.join(path, fname)
+      end
+      return files
+    end
+  end
+
+  def insert_from_clipboard
+    files = get_clipboard_files
+
+    files&.each do |file|
+      ftype = File.ftype(file)
+      fsize = File.size(file)
+      mtime = File.mtime(file)
+      @iconlist.prependItem([file, ftype, fsize, mtime].join("\t"), @big_folder, @mini_folder)
+    end
+  end
 end
 
 if __FILE__ == $0

data/examples/inputs.rb

@@ -21,7 +21,7 @@ class InputHandlerWindow < FXMainWindow
 
     # Output will be displayed in a multiline text area
     @cmdOutput = FXText.new(textFrame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
-    @cmdInput.text = "ping rubyinstaller.org"
+    @cmdInput.text = "ping rubyinstaller.org -c4"
 
     # Initialize the pipe
     @pipe = nil

data/examples/rmagick.rb

@@ -1,8 +1,8 @@
 require 'fox16'
 begin
-  require 'RMagick'
+  require 'rmagick'
 rescue LoadError
-  warn("LoadError: To execute this app you need to have 'RMagick' gem installed.")
+  warn("LoadError: To execute this app you need to have 'rmagick' gem installed.")
   sleep(5)
   exit(false)
 end
@@ -15,16 +15,16 @@ class RMagickExample < FXMainWindow
     super(app, "RMagick Example", :width => 800, :height => 600)
 
     # Construct an ImageList
-    dippy = Magick::ImageList.new(File.join("icons", "dippy.png"))
+    dippy = Magick::ImageList.new(File.expand_path("icons/dippy.png", __dir__))
 
     # Manipulate the image
     text = Magick::Draw.new
-    text.annotate(dippy, 0, 0, 0, 60, "Dippy Duck") do
-      self.gravity = Magick::SouthGravity
-      self.pointsize = 24
-      self.stroke = 'transparent'
-      self.fill = '#0000A9'
-      self.font_weight = Magick::BoldWeight
+    text.annotate(dippy, 0, 0, 0, 60, "Dippy Duck") do |a|
+      a.gravity = Magick::SouthGravity
+      a.pointsize = 24
+      a.stroke = 'transparent'
+      a.fill = '#80C0A9'
+      a.font_weight = Magick::BoldWeight
     end
 
     # Extract image data and use it to construct FXPNGImage

data/ext/fox16_c/FXRbApp.cpp

@@ -24,6 +24,7 @@
  * $Id: FXRbApp.cpp 2902 2008-12-11 14:09:20Z lyle $
  ***********************************************************************/
 
+#include "swigruby.h"
 #include "FXRbCommon.h"
 
 #ifdef HAVE_SYS_TIME_H
@@ -171,7 +172,7 @@ FXRbApp::~FXRbApp(){
   FXRbDestroyAppSensitiveObjects();
   myRegistry=FXRbGetRubyObj(&(reg()),true);
   if(!NIL_P(myRegistry)){
-    DATA_PTR(myRegistry)=0;
+    FXRbConvertPtr(myRegistry, FXRbTypeQuery("FXApp *"), SWIG_POINTER_RELEASE);
     }
   FXRbUnregisterRubyObj(this);
   }

data/ext/fox16_c/FXRbDataTarget.cpp

@@ -24,6 +24,7 @@
  * $Id: FXRbDataTarget.cpp 2713 2007-11-14 15:27:36Z lyle $
  ***********************************************************************/
 
+#include "swigruby.h"
 #include "FXRbCommon.h"
 
 /**

data/ext/fox16_c/FXRbGLViewer.cpp

@@ -24,6 +24,7 @@
  * $Id: FXRbGLViewer.cpp 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
+#include "swigruby.h"
 #include "FXRbCommon.h"
 
 // Process picks

data/ext/fox16_c/FXRbObjRegistry.cpp

@@ -20,9 +20,9 @@
  * at "lars@greiz-reinsdorf.de".
  ***********************************************************************/
 
+#include "swigruby.h"
 #include "FXRbCommon.h"
 #include "FXRbObjRegistry.h"
-#include "swigruby.h"
 
 FXRbObjRegistry::FXRbObjRegistry(){
   FXRuby_Objects=st_init_numtable();
@@ -31,7 +31,7 @@ FXRbObjRegistry::FXRbObjRegistry(){
 const char * FXRbObjRegistry::safe_rb_obj_classname(VALUE obj)
 {
   int tdata = TYPE(obj)==T_DATA;
-  if( (tdata && IsInGC(DATA_PTR(obj)))
+  if( (tdata && IsInGC(FXRbConvertPtr(obj, NULL, 0)))
 #ifdef HAVE_RB_DURING_GC
       || rb_during_gc()
 #endif
@@ -52,7 +52,7 @@ VALUE FXRbObjRegistry::NewBorrowedObj(void *ptr,swig_type_info* ty){
     ObjDesc *desc;
 
     if(FXMALLOC(&desc,ObjDesc,1)){
-      VALUE obj = SWIG_Ruby_NewPointerObj(ptr,ty,1);
+      VALUE obj = SWIG_Ruby_NewPointerObj(ptr,ty,SWIG_POINTER_OWN);
       FXTRACE((1,"FXRbNewPointerObj(foxObj=%p) => rubyObj=%p (%s)\n",ptr,(void *)obj,safe_rb_obj_classname(obj)));
       desc->obj = obj;
       desc->type = borrowed;
@@ -84,7 +84,7 @@ void FXRbObjRegistry::RegisterRubyObj(VALUE rubyObj,const void* foxObj) {
      * 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;
+    FXRbConvertPtr(desc->obj, NULL, SWIG_POINTER_RELEASE);
     desc->obj = rubyObj;
     desc->type = own;
   } else {
@@ -107,7 +107,14 @@ void FXRbObjRegistry::UnregisterRubyObj(const void* foxObj, bool alsoOwned){
     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;
+
+      /* Release unless it's already T_ZOMBIE */
+      if(RB_TYPE_P(desc->obj, RUBY_T_DATA)) {
+        int res = SWIG_ConvertPtr(desc->obj, NULL, NULL, SWIG_POINTER_CLEAR);
+        if (res != SWIG_OK){
+          rb_bug( "UnregisterRubyObj(rubyObj=%p) error: %d", (void*)desc->obj, res);
+        }
+      }
       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);

data/ext/fox16_c/FXRuby.cpp

@@ -28,13 +28,13 @@
 #pragma warning (disable : 4786)
 #endif
 
+// SWIG runtime functions we need
+#include "swigruby.h"
+
 #include "FXRbCommon.h"
 #include "FXRbObjRegistry.h"
 #include "impl.h"
 
-// SWIG runtime functions we need
-#include "swigruby.h"
-
 #ifdef __CYGWIN__
 #include <io.h>		// for get_osf_handle()
 #endif
@@ -74,7 +74,7 @@ VALUE FXRbNewPointerObj(void *ptr,swig_type_info* ty){
 }
 
 VALUE FXRbNewPointerObjCb(void *ptr,swig_type_info* ty){
-  return SWIG_Ruby_NewPointerObj(ptr, ty, 1);
+  return SWIG_Ruby_NewPointerObj(ptr, ty, SWIG_POINTER_OWN);
 }
 
 
@@ -126,7 +126,7 @@ void FXRbUnregisterRubyObj(const void* foxObj){
  * They are free'd by libfox when the owning fox object gets destroyed.
  * Only the ruby wrapper is GC'ed.
  * They are registered in FXRbObjRegistry as borrowed object.
- * They are built per FXGetRubyObj().
+ * They are built per FXRbGetRubyObj().
  *
  * Callback objects :
  * This is the new type.
@@ -135,7 +135,7 @@ void FXRbUnregisterRubyObj(const void* foxObj){
  * They are not registered in FXRbObjRegistry, but stored on the stack only.
  * Therefore callback objects aren't re-used, but newly wrapped for each call.
  * The same goes for arguments to ruby blocks.
- * They are built per FXGetRubyObjCb().
+ * They are built per FXRbGetRubyObjCb().
  */
 
 /**
@@ -232,7 +232,7 @@ void FXRbGcMark(void *obj){
      * is to mark any Ruby reference this object, "borrowed" or not;
      * so the 2nd argument to FXRbGetRubyObj() is now true.
      *
-     * If you feel compelled to change this back to FXGetRubyObj(obj,false),
+     * If you feel compelled to change this back to FXRbGetRubyObj(obj,false),
      * please think about it first. Especially make sure that the shutter.rb
      * example program works if you invoke the GC in ShutterWindow#create;
      * make sure that the shutter items' contents don't get blown away!
@@ -335,7 +335,7 @@ FXuint FXRbNumberOfFXColors(VALUE string_or_ary){
   }else{
     Check_Type(string_or_ary,T_STRING);
     if(RSTRING_LEN(string_or_ary) % sizeof(FXColor) != 0 )
-      rb_raise( rb_eArgError, "String size is no multiple of %lu", sizeof(FXColor) );
+      rb_raise( rb_eArgError, "String size is no multiple of %zu", sizeof(FXColor) );
     len = RSTRING_LEN(string_or_ary) / sizeof(FXColor);
   }
   return len;
@@ -842,8 +842,7 @@ void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
   FXushort id=FXSELID(key);
 
   // Extract the FOX object (the receiver) from this Ruby instance
-  FXObject* obj;
-  Data_Get_Struct(recv,FXObject,obj);
+  FXObject *obj = (FXObject*)FXRbConvertPtr(recv, NULL, 0);
 
   FXASSERT(type!=SEL_NONE);
   FXASSERT(type!=SEL_LAST);
@@ -896,7 +895,7 @@ void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
     case SEL_DND_MOTION:
     case SEL_DND_REQUEST:
     case SEL_PICKED:
-      SWIG_ConvertPtr(value,&ptr,FXRbTypeQuery("FXEvent *"),1);
+      SWIG_ConvertPtr(value,&ptr,FXRbTypeQuery("FXEvent *"),SWIG_POINTER_DISOWN);
       return ptr;
     case SEL_IO_READ:
     case SEL_IO_WRITE:
@@ -1072,7 +1071,7 @@ void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
 
   if(type==SEL_CHANGED){
 	  if(obj->isMemberOf(FXMETACLASS(FXPicker))){
-			SWIG_ConvertPtr(value,&ptr,FXRbTypeQuery("FXPoint *"),1);
+			SWIG_ConvertPtr(value,&ptr,FXRbTypeQuery("FXPoint *"),SWIG_POINTER_DISOWN);
 			return ptr;
     }
     if(obj->isMemberOf(FXMETACLASS(FXWindow))){
@@ -1086,7 +1085,7 @@ void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
   }
 
 	if(type==SEL_DRAGGED){
-	    SWIG_ConvertPtr(value,&ptr,FXRbTypeQuery("FXEvent *"),1);
+	    SWIG_ConvertPtr(value,&ptr,FXRbTypeQuery("FXEvent *"),SWIG_POINTER_DISOWN);
 	    return ptr;
 	    }
 
@@ -1185,8 +1184,8 @@ long FXRbHandleMessage_gvlcb(FXObject* recv,ID func,FXObject* sender,FXSelector
   FXTRACE((100,"FXRbHandleMessage(recv=%p(%s),FXSEL(%s,%d)\n",recv,recv->getClassName(),FXDebugTarget::messageTypeName[FXSELTYPE(key)],FXSELID(key)));
 
   if(FXRbCatchExceptions){
-    retval=rb_rescue2(RUBY_VALUE_METHOD_FUNC(handle_body), reinterpret_cast<VALUE>(&hArgs),
-                      RUBY_VALUE_METHOD_FUNC(handle_rescue), Qnil,
+    retval=rb_rescue2(handle_body, reinterpret_cast<VALUE>(&hArgs),
+                      handle_rescue, Qnil,
                       rb_eStandardError, rb_eNameError, 0);
     }
   else{
@@ -1300,21 +1299,21 @@ FXGLObject* FXRbCallGLObjectMethod_gvlcb(FXGLObject* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
   VALUE result=rb_funcall(obj,rb_intern(func),0);
-  return NIL_P(result) ? 0 : reinterpret_cast<FXGLObject*>(DATA_PTR(result));
+  return (FXGLObject*)FXRbConvertPtr(result, NULL, 0);
   }
 
 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,rb_intern(func),2,INT2NUM(x),INT2NUM(y));
-  return NIL_P(result) ? 0 : reinterpret_cast<FXGLObject*>(DATA_PTR(result));
+  return (FXGLObject*)FXRbConvertPtr(result, NULL, 0);
   }
 
 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,rb_intern(func),1,FXRbMakeArray(path,n));
-  return NIL_P(result) ? 0 : reinterpret_cast<FXGLObject*>(DATA_PTR(result));
+  return (FXGLObject*)FXRbConvertPtr(result, NULL, 0);
   }
 
 //----------------------------------------------------------------------
@@ -1329,7 +1328,8 @@ FXGLObject** FXRbCallGLObjectArrayMethod_gvlcb(FXGLViewer* recv,const char *func
     Check_Type(result,T_ARRAY);
     if(FXMALLOC(&objects,FXGLObject*,RARRAY_LEN(result)+1)){
       for(long i=0; i<RARRAY_LEN(result); i++){
-	objects[i]=reinterpret_cast<FXGLObject*>(DATA_PTR(rb_ary_entry(result,i)));
+        VALUE entry = rb_ary_entry(result,i);
+        objects[i]=(FXGLObject*)FXRbConvertPtr(entry, NULL, 0);
         }
       objects[RARRAY_LEN(result)]=0;
       }
@@ -1344,14 +1344,14 @@ FXTableItem* FXRbCallTableItemMethod_gvlcb(FXTable* recv,const char *func,const
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
   VALUE result=rb_funcall(obj,rb_intern(func),3,to_ruby(text),to_ruby_cb(icon),itemData);
-  return NIL_P(result)?0:reinterpret_cast<FXTableItem*>(DATA_PTR(result));
+  return (FXTableItem*)FXRbConvertPtr(result, NULL, 0);
   }
 
 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,rb_intern(func),3,to_ruby(row),to_ruby(col),to_ruby(notify));
-  return NIL_P(result)?0:reinterpret_cast<FXTableItem*>(DATA_PTR(result));
+  return (FXTableItem*)FXRbConvertPtr(result, NULL, 0);
   }
 
 //----------------------------------------------------------------------
@@ -1360,7 +1360,7 @@ FXTreeItem* FXRbCallTreeItemMethod_gvlcb(const FXTreeList* recv,const char *func
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
   VALUE result=rb_funcall(obj,rb_intern(func),2,INT2NUM(x),INT2NUM(y));
-  return NIL_P(result) ? 0 : reinterpret_cast<FXTreeItem*>(DATA_PTR(result));
+  return (FXTreeItem*)FXRbConvertPtr(result, NULL, 0);
   }
 
 //----------------------------------------------------------------------
@@ -1369,7 +1369,7 @@ FXFoldingItem* FXRbCallFoldingItemMethod_gvlcb(const FXFoldingList* recv,const c
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
   VALUE result=rb_funcall(obj,rb_intern(func),2,INT2NUM(x),INT2NUM(y));
-  return NIL_P(result) ? 0 : reinterpret_cast<FXFoldingItem*>(DATA_PTR(result));
+  return (FXFoldingItem*)FXRbConvertPtr(result, NULL, 0);
   }
 
 //----------------------------------------------------------------------
@@ -1378,7 +1378,7 @@ FXFileAssoc* FXRbCallFileAssocMethod_gvlcb(const FXFileDict* recv,const char *fu
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
   VALUE result=rb_funcall(obj,rb_intern(func),1,to_ruby(pathname));
-  return NIL_P(result) ? 0 : reinterpret_cast<FXFileAssoc*>(DATA_PTR(result));
+  return (FXFileAssoc*)FXRbConvertPtr(result, NULL, 0);
   }
 
 //----------------------------------------------------------------------
@@ -1388,7 +1388,7 @@ FXIcon* FXRbCallIconMethod_gvlcb(const FXTableItem* recv,const char *func){
   FXASSERT(!NIL_P(obj));
 	if(!NIL_P(obj)){
 	  VALUE result=rb_funcall(obj,rb_intern(func),0);
-	  return NIL_P(result) ? 0 : reinterpret_cast<FXIcon*>(DATA_PTR(result));
+	  return (FXIcon*)FXRbConvertPtr(result, NULL, 0);
 		}
 	else{
 		return 0;
@@ -1401,7 +1401,7 @@ FXWindow* FXRbCallWindowMethod_gvlcb(const FXTableItem* recv,const char *func,FX
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
   VALUE result=rb_funcall(obj,rb_intern(func),1,to_ruby_cb(table));
-  return NIL_P(result) ? 0 : reinterpret_cast<FXWindow*>(DATA_PTR(result));
+  return (FXWindow*)FXRbConvertPtr(result, NULL, 0);
   }
 
 //----------------------------------------------------------------------
@@ -1411,7 +1411,7 @@ FXRangef FXRbCallRangeMethod_gvlcb(FXObject* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
   VALUE result=rb_funcall(obj,rb_intern(func),0);
-  return *reinterpret_cast<FXRangef*>(DATA_PTR(result));
+  return *(FXRangef*)FXRbConvertPtr(result, NULL, 0);
   }
 
 //----------------------------------------------------------------------
@@ -1606,11 +1606,34 @@ FXbool FXRbGLViewer::sortProc(FXfloat*& buffer,FXint& used,FXint& size){
  * FXRbConvertPtr() is just a wrapper around SWIG_ConvertPtr().
  */
 
-void* FXRbConvertPtr(VALUE obj,swig_type_info* ty){
+void* FXRbConvertPtr(VALUE obj,swig_type_info* ty, int flags){
   void *ptr;
-  SWIG_ConvertPtr(obj,&ptr,ty,1);
-  return ptr;
+  int res = SWIG_ConvertPtr(obj,&ptr,ty,flags);
+  if( res == SWIG_OK ) return ptr;
+#ifdef HAVE_RB_DURING_GC
+  if( rb_during_gc() ){
+    rb_bug( "FXRbConvertPtr got wrong argument type rubyObj=%p", (void*)obj);
+  }
+#endif
+  if( res == SWIG_ERROR_RELEASE_NOT_OWNED ){
+    rb_raise( rb_eTypeError, "clean and disown of non-owned object is not allowed: %" PRIsVALUE, obj);
+  }
+  if( res == SWIG_NullReferenceError ){
+    rb_raise( rb_eTypeError, "object can not be NULL: %" PRIsVALUE, obj);
+  }
+  if( res == SWIG_ObjectPreviouslyDeletedError ){
+    if(ty){
+      rb_raise( rb_eTypeError, "the object has already been deleted: %" PRIsVALUE, ((swig_class *) (ty->clientdata))->klass);
+    } else {
+      rb_raise( rb_eTypeError, "the object has already been deleted");
+    }
   }
+  if(ty){
+    rb_raise( rb_eTypeError, "wrong argument type %" PRIsVALUE ", expected kind of %" PRIsVALUE, rb_obj_class(obj), ((swig_class *) (ty->clientdata))->klass );
+  } else {
+    rb_raise( rb_eTypeError, "wrong argument type %" PRIsVALUE, rb_obj_class(obj) );
+  }
+}
 
 
 // Returns an FXInputHandle for this Ruby file object
@@ -1652,11 +1675,8 @@ FXInputHandle FXRbGetWriteFileHandle(VALUE obj,FXuint mode) {
   if(rb_ivar_defined(obj, vwrite)) obj = rb_ivar_get(obj, vwrite);
   fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
 #else
-  rb_io_t *fptr;
-  GetOpenFile(obj, fptr);
-  VALUE wrio = fptr->tied_io_for_writing;
-  if(wrio) obj = wrio;
-  fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
+  VALUE wrio = rb_io_get_write_io(obj);
+  fd = FIX2INT(rb_funcall(wrio, rb_intern("fileno"), 0));
 #endif
 #ifdef WIN32
 #ifdef __CYGWIN__
@@ -1909,7 +1929,7 @@ void FXRbDestroyAppSensitiveObjects(){
   FXTRACE((100,"%s:%d: Begin destroying objects that hold references to the FXApp...\n",__FILE__,__LINE__));
 
   FXObjectListOf<FXObject> objs;
-  st_foreach(appSensitiveObjs,RUBY_INT_METHOD_FUNC(st_cbfunc_obj),reinterpret_cast<st_data_t>(&objs));
+  st_foreach(appSensitiveObjs,st_cbfunc_obj,reinterpret_cast<st_data_t>(&objs));
   for(FXint i=0;i<objs.no();i++){
     if(objs[i]->isMemberOf(FXMETACLASS(FXRbCursor))){
       if(dynamic_cast<FXRbCursor*>(objs[i])->ownedByApp)
@@ -1939,7 +1959,7 @@ void FXRbDestroyAppSensitiveObjects(){
     }
 
   FXArray<FXDC*> dcs;
-  st_foreach(appSensitiveDCs,RUBY_INT_METHOD_FUNC(st_cbfunc_dc),reinterpret_cast<st_data_t>(&dcs));
+  st_foreach(appSensitiveDCs,st_cbfunc_dc,reinterpret_cast<st_data_t>(&dcs));
   for(FXint j=0;j<dcs.no();j++){
     delete dcs[j];
     }