fxruby 1.6.40-x86-mingw32 → 1.6.41-x86-mingw32

data/README.rdoc

@@ -31,7 +31,7 @@ FXRuby supportes everything of FOX, that is useful in Ruby:
 
 == INSTALL:
 
-FXRuby runs on Linux, Windows and OS-X with Ruby-1.9.3 or newer and with Rubinius. Installation on Unix requires
+FXRuby runs on Linux, Windows and OS-X with Ruby-2.2 or newer. Installation on Unix requires
 FOX development headers and libraries installed:
 * on Debian/Ubuntu: <tt>sudo apt-get install g++ libxrandr-dev libfox-1.6-dev</tt>
 * see also detailed installation instructions in the {https://github.com/lylejohnson/fxruby/wiki Wiki}

data/Rakefile

@@ -6,23 +6,6 @@ require 'bundler'
 require 'bundler/gem_helper'
 require './lib/fox16/version.rb'
 
-# 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?
-    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
-
 
 class FoxGemHelper < Bundler::GemHelper
   attr_accessor :cross_platforms
@@ -93,7 +76,7 @@ LIBFXSCINTILLA_SOURCE_URI         = "http://download.savannah.gnu.org/releases/f
 SWIG = (RUBY_PLATFORM =~ /mingw/) ? "swig.exe" : "swig"
 SWIGFLAGS = "-c++ -ruby -nodefaultdtor -nodefaultctor -w302 -features compactdefaultargs -I../fox-includes"
 
-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*" )
+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" )
 
@@ -102,12 +85,12 @@ task :test => [:compile] do
   sh "ruby -w -W2 -Ilib test/TS_All.rb -v"
 end
 
-task :gem => [:compile, :build]
+task :gem => ["ext/fox16_c/extconf.rb", :build]
 
 
 gem_spec = Bundler.load_gemspec('fxruby.gemspec')
 
-Rake::ExtensionTask.new("fox16_c", gem_spec) do |ext|
+ext_task = 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'
@@ -149,7 +132,7 @@ Rake::ExtensionTask.new("fox16_c", gem_spec) do |ext|
       unless ENV['FXRUBY_MINGW_DEBUG']
         dlls.each do |dll|
           task "ports/#{host}/bin/#{dll}" do |t|
-            sh "x86_64-w64-mingw32-strip", t.name
+            sh "#{host}-strip", t.name
           end
         end
       end
@@ -160,53 +143,85 @@ Rake::ExtensionTask.new("fox16_c", gem_spec) do |ext|
   Bundler::GemHelper.instance.cross_platforms = ext.cross_platform
 end
 
-# To reduce the gem file size strip mingw32 dlls before packaging
-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"
+namespace :gem do
+  ext_task.cross_platform.each do |plat|
+    desc "Build the windows binary gems"
+    multitask 'windows' => plat
+
+    task 'prepare' do
+      require 'rake_compiler_dock'
+      sh "bundle package"
     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 plat => ['gem', 'prepare'] do
+      debug = "FXRUBY_MINGW_DEBUG=#{ENV['FXRUBY_MINGW_DEBUG'].inspect}" if ENV['FXRUBY_MINGW_DEBUG']
+      RakeCompilerDock.sh <<-EOT, platform: plat
+        sudo apt update &&
+        sudo apt install yasm &&
+        bundle --local --without=test &&
+        rake native:#{plat} pkg/#{ext_task.gem_spec.full_name}-#{plat}.gem MAKE=\"nice make V=1 VERBOSE=1 -j `nproc`\" #{debug}
+      EOT
     end
   end
 end
 
-desc "Build the windows binary gems"
-task 'gem:windows' => 'gem' do
-  require 'rake_compiler_dock'
-
-  sh "bundle package"
-  debug = "FXRUBY_MINGW_DEBUG=#{ENV['FXRUBY_MINGW_DEBUG'].inspect}" if ENV['FXRUBY_MINGW_DEBUG']
-  RakeCompilerDock.sh <<-EOT
-    sudo apt update &&
-    sudo apt install yasm &&
-    bundle --local --without=test &&
-    rake cross native gem MAKE=\"nice make V=1 -j `nproc`\" #{debug}
-  EOT
-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.
 namespace :swig do
+  def patch_swigruby(line)
+    # Ruby-2.7+ finally changed callback function signatures from (*)(ANYARGS) to a proper signature, on which the compiler is able to check parameter types.
+    # Unfortunately this requires a bunch of patches to swig's generated code.
+
+    line.gsub! '#include <ruby.h>', <<-EOT
+      #include <ruby.h>
+
+      #if defined(RB_METHOD_DEFINITION_DECL)
+      # define RUBY_VALUE_METHOD_FUNC(func) (func)
+      # define RUBY_INT_METHOD_FUNC(func) (func)
+      # define RUBY_VOID_METHOD_FUNC(func) (func)
+      # define RUBY_VOIDP_METHOD_FUNC(func) (func)
+      #else
+      # define RUBY_VALUE_METHOD_FUNC(func) ((VALUE (*)(ANYARGS))(func))
+      # define RUBY_INT_METHOD_FUNC(func) ((int (*)(ANYARGS))(func))
+      # define RUBY_VOID_METHOD_FUNC(func) ((void (*)(ANYARGS))(func))
+      # define RUBY_VOIDP_METHOD_FUNC(func) ((void *(*)(ANYARGS))(func))
+      #endif
+    EOT
+    line.gsub! /rb_define_virtual_variable\((.*?), (\w+), NULL\)/, <<-EOT
+      rb_define_virtual_variable(\\1, RUBY_VALUE_METHOD_FUNC(\\2), RUBY_VOID_METHOD_FUNC((rb_gvar_setter_t*)NULL))
+    EOT
+
+    line.gsub!('static VALUE swig_ruby_trackings_count(ANYARGS)', 'static VALUE swig_ruby_trackings_count(ID id, VALUE *var)')
+    line.gsub!('SWIG_ruby_failed(void)', 'SWIG_ruby_failed(VALUE, VALUE)')
+
+    line.gsub!(/SWIGINTERN VALUE SWIG_AUX_(\w+)\(VALUE \*args\)\s\{/m, 'SWIGINTERN VALUE SWIG_AUX_\\1(VALUE pargs){VALUE *args=(VALUE *)pargs;')
+
+    line.gsub! /static int swig_ruby_internal_iterate_callback\(void\* ptr, VALUE obj, void\(\*meth\)\(void\* ptr, VALUE obj\)\)\s*{\s*\(\*meth\)\(ptr, obj\);/m, <<-EOT
+      static int swig_ruby_internal_iterate_callback(st_data_t ptr, st_data_t obj, st_data_t meth) {
+        ((void(*)(void*, VALUE))meth)((void*)ptr, (VALUE)obj);
+    EOT
+
+    line.gsub!('(int (*)(ANYARGS))&swig_ruby_internal_iterate_callback', 'RUBY_INT_METHOD_FUNC(swig_ruby_internal_iterate_callback)')
+
+    line.gsub! /rb_ensure\(VALUEFUNC\((.*)\), self, VALUEFUNC\((.*)\), self\);/, 'rb_ensure(RUBY_VALUE_METHOD_FUNC(\\1), self, RUBY_VALUE_METHOD_FUNC(\\2), self);'
+    line.gsub! /rb_rescue\(RUBY_METHOD_FUNC\((.*)\), \(VALUE\)a, RUBY_METHOD_FUNC\((.*)\), 0\)/, 'rb_rescue(RUBY_VALUE_METHOD_FUNC(\\1), (VALUE)a, RUBY_VALUE_METHOD_FUNC(\\2), 0)'
+
+    line
+  end
+
   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;")
-      line.gsub!(/mCore = rb_define_module\("Core"\)/, "mFox = rb_define_module(\"Fox\")")
-      line.gsub!(/mCore/, "mFox")
-      next if line =~ /static VALUE m(Dc|Dialogs|Frames|Iconlist|Icons|Image|Label|Layout|List|Mdi|Menu|Fx3d|Scintilla|Table|Text|Treelist|Ui);/
-      next if line =~ /m(Dc|Dialogs|Frames|Iconlist|Icons|Image|Label|Layout|List|Mdi|Menu|Fx3d|Scintilla|Table|Text|Treelist|Ui) = rb_define_module/
-      next if line =~ /rb_require/
-      line.gsub!(/m(Dc|Dialogs|Frames|Iconlist|Icons|Image|Label|Layout|List|Mdi|Menu|Fx3d|Scintilla|Table|Text|Treelist|Ui),/, "mFox,")
-      results << line
-    end
-    File.open(wrapper_src_file_name, "w") do |io|
-      io.write(results.join)
-    end
+
+    line = File.read(wrapper_src_file_name)
+    line.gsub!(/static VALUE mCore;/, "VALUE mCore;")
+    line.gsub!(/mCore = rb_define_module\("Core"\)/, "mFox = rb_define_module(\"Fox\")")
+    line.gsub!(/mCore/, "mFox")
+    line.gsub!(/static VALUE m(Dc|Dialogs|Frames|Iconlist|Icons|Image|Label|Layout|List|Mdi|Menu|Fx3d|Scintilla|Table|Text|Treelist|Ui);/, '')
+    line.gsub!(/m(Dc|Dialogs|Frames|Iconlist|Icons|Image|Label|Layout|List|Mdi|Menu|Fx3d|Scintilla|Table|Text|Treelist|Ui) = rb_define_module.*/, '')
+    line.gsub!(/rb_require.*/, '')
+    line.gsub!(/m(Dc|Dialogs|Frames|Iconlist|Icons|Image|Label|Layout|List|Mdi|Menu|Fx3d|Scintilla|Table|Text|Treelist|Ui),/, "mFox,")
+
+    line = patch_swigruby(line)
+
+    File.write(wrapper_src_file_name, line)
   end
 
   def add_with_fxscintilla_cond(file)
@@ -227,23 +242,30 @@ namespace :swig do
   end
 
   task :swigruby_h => ["ext/fox16_c/swigruby.h"]
-  file "ext/fox16_c/swigruby.h" do |task|
+  file "ext/fox16_c/swigruby.h.orig" do |task|
     puts "generate #{task.name}"
     system "#{SWIG} -ruby -external-runtime #{task.name}"
   end
 
+  file "ext/fox16_c/swigruby.h"=>["ext/fox16_c/swigruby.h.orig"] do |task|
+    puts "generate #{task.name}"
+    text = File.read(task.prerequisites[0])
+    text = patch_swigruby(text)
+    File.write(task.name, text)
+  end
+
   desc "Run SWIG to generate the wrapper files."
   multitask :swig => [:swigruby_h] + SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16_c", cppfile) }
+end
 
-  # add dependencies for compile *.i to *_wrap.cpp
-  SWIG_MODULES.each do |ifile, cppfile|
-    cppfile_path = File.join("ext/fox16_c", cppfile)
+# add dependencies for compile *.i to *_wrap.cpp
+SWIG_MODULES.each do |ifile, cppfile|
+  cppfile_path = File.join("ext/fox16_c", cppfile)
 
-    file cppfile_path => [ifile, 'macros.i', 'common.i', 'fxdefs.i', 'ruby-typemaps.i',
-                          'markfuncs.i', 'exceptions.i', 'freefuncs.i', 'macros.i', 'handlers.i'
-                         ].map{|f| File.join("swig-interfaces", f) } do |task|
-      swig(File.join("swig-interfaces", ifile), cppfile_path)
-    end
+  file cppfile_path => [ifile, 'macros.i', 'common.i', 'fxdefs.i', 'ruby-typemaps.i',
+                        'markfuncs.i', 'exceptions.i', 'freefuncs.i', 'macros.i', 'handlers.i'
+                       ].map{|f| File.join("swig-interfaces", f) } do |task|
+    swig(File.join("swig-interfaces", ifile), cppfile_path)
   end
 end
 

data/appveyor.yml

@@ -10,12 +10,14 @@ install:
   - ruby --version
   - gem --version
   - ridk version
+  # Remove gcc-ada and gcc-objc, since they are no longer supported by msys2 and therefore cause a dependency issue
+  - c:/msys64/usr/bin/bash -lc "pacman --noconfirm --remove mingw-w64-i686-gcc-ada mingw-w64-i686-gcc-objc mingw-w64-x86_64-gcc-ada mingw-w64-x86_64-gcc-objc"
   - c:/msys64/usr/bin/bash -lc "pacman -Syu --noconfirm --ask 20"
   - c:/msys64/usr/bin/bash -lc "pacman -Su --noconfirm"
   - c:/msys64/usr/bin/bash -lc "pacman -S --noconfirm --needed ${MINGW_PACKAGE_PREFIX}-fox ${MINGW_PACKAGE_PREFIX}-swig"
   - swig -version
   - gem install bundler --conservative
-  - bundle config force_ruby_platform true
+  - bundle config set force_ruby_platform true
   - bundle install
 build_script:
   - bundle exec rake compile

data/examples/inputs.rb

@@ -21,6 +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"
 
     # Initialize the pipe
     @pipe = nil
@@ -30,6 +31,7 @@ class InputHandlerWindow < FXMainWindow
   def create
     super
     show(PLACEMENT_SCREEN)
+    @cmdInput.setFocus
   end
 
   # Remove previous input (if any)
@@ -54,11 +56,14 @@ class InputHandlerWindow < FXMainWindow
     getApp().addInput(@pipe, INPUT_READ|INPUT_EXCEPT) do |sender, sel, ptr|
       case FXSELTYPE(sel)
       when SEL_IO_READ
-        text = @pipe.read_nonblock(256)
-        if text && text.length > 0
-          @cmdOutput.appendText(text)
-        else
+        begin
+          text = @pipe.read_nonblock(256)
+        rescue IO::WaitReadable
+        rescue EOFError
+          @cmdOutput.appendText("[EOF]")
           closePipe
+        else
+          @cmdOutput.appendText(text)
         end
       when SEL_IO_EXCEPT
         #         puts 'onPipeExcept'

data/examples/pig.rb

@@ -47,9 +47,8 @@ class PigBox < FXMainWindow
       theLabel.layoutHints = LAYOUT_FILL_X
     end
 
-    FXTextField.new(top, 20, @text, FXDataTarget::ID_VALUE) do |theTextField|
+    @theTextField = FXTextField.new(top, 20, @text, FXDataTarget::ID_VALUE) do |theTextField|
       theTextField.layoutHints = LAYOUT_FILL_X
-      theTextField.setFocus()
     end
 
     FXButton.new(top, 'Pig It') do |pigButton|
@@ -66,6 +65,7 @@ class PigBox < FXMainWindow
   def create
     super
     show(PLACEMENT_SCREEN)
+    @theTextField.setFocus
   end
 end
 

data/examples/unicode.rb

@@ -1,36 +1,15 @@
 #!/usr/bin/env ruby
+# -*- encoding: UTF-8 -*-
 
 require 'fox16'
-require 'jcode'
-
-$KCODE = 'UTF8'
-
-class UString < String
-  # Show u-prefix as in Python
-  def inspect; "u#{ super }" end
-
-  # Count multibyte characters
-  def length; self.scan(/./).length end
-
-  # Reverse the string
-  def reverse; self.scan(/./).reverse.join end
-end
-
-module Kernel
-  def u( str )
-    UString.new str.gsub(/U\+([0-9a-fA-F]{4,4})/u){["#$1".hex ].pack('U*')}
-  end
-end
-
-include Fox
 
 # Pass UTF-8 encoded Unicode strings to FXRuby.
-label = u"Les enfants vont U+00E0 l'U+00E9cole.\nLa boulangU+00E8re vend-elle le pain en aoU+00FBt?"
+label = "Les enfants vont \u00E0 l'\u00E9cole.\nLa boulang\u00E8re vend-elle le pain en ao\u00FBt?"
 
-FXApp.new("Unicode Example", "FoxTest") do |app|
-  main = FXMainWindow.new(app, "Unicode Text", nil, nil, DECOR_ALL)
-  FXLabel.new(main, label)
+Fox::FXApp.new("Unicode Example", "FoxTest") do |app|
+  main = Fox::FXMainWindow.new(app, "Unicode Text", nil, nil, Fox::DECOR_ALL)
+  Fox::FXLabel.new(main, label)
   app.create
-  main.show(PLACEMENT_SCREEN)
+  main.show(Fox::PLACEMENT_SCREEN)
   app.run
 end

data/ext/fox16_c/FXRbApp.cpp

@@ -26,12 +26,6 @@
 
 #include "FXRbCommon.h"
 
-#if defined(RUBY_1_8)
-extern "C" {
-#include "rubysig.h" /* For CHECK_INTS */
-}
-#endif
-
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h> /* For struct timeval */
 #endif
@@ -149,15 +143,7 @@ long FXRbApp::onChoreThreads_gvlcb(FXObject*,FXSelector,void*){
   wait.tv_sec=0;
   wait.tv_usec=100*sleepTime;
 
-  // Confirm that this thread can be interrupted, then go to sleep
-#if defined(RUBY_1_8)
-  CHECK_INTS;
-  if(!rb_thread_critical)
-    rb_thread_wait_for(wait);
-#else
-  // if(!rb_thread_critical) rb_thread_wait_for(wait);
   rb_thread_wait_for(wait);
-#endif /* RUBY_1_8 */
 
   // Re-register this chore for next time
   addChore(this,ID_CHORE_THREADS);

data/ext/fox16_c/FXRuby.cpp

@@ -43,20 +43,9 @@
 #include <signal.h>	// for definitions of SIGINT, etc.
 #endif
 
-#if defined(RUBY_1_8)
-
-extern "C" {
-#include "st.h"
-#include "rubyio.h"     // for GetOpenFile(), etc.
-}
-
-#else
-
 #include "ruby/io.h"
 #include "ruby/st.h"
 
-#endif /* RUBY_1_8 */
-
 
 // Opaque type declaration from SWIG runtime
 struct swig_type_info;
@@ -130,7 +119,7 @@ void FXRbUnregisterRubyObj(const void* foxObj){
  * These objects are allocated by FXRuby on the heap.
  * They are free'd when the FXRuby wrapper is GC'ed and no other reference to the object exists.
  * They are registered in FXRbObjRegistry as owned object.
- * Tey are built per FXRbRegisterRubyObj().
+ * They are built per FXRbRegisterRubyObj().
  *
  * Borrowed objects :
  * These objects are allocated by libfox on the heap.
@@ -145,7 +134,7 @@ void FXRbUnregisterRubyObj(const void* foxObj){
  * They are wrapped for the time of one callback only, because stack memory is free'd afterwards.
  * 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.
- * This is for arguments to ruby blocks.
+ * The same goes for arguments to ruby blocks.
  * They are built per FXGetRubyObjCb().
  */
 
@@ -929,7 +918,6 @@ void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
     case SEL_CLICKED:
     case SEL_DOUBLECLICKED:
     case SEL_TRIPLECLICKED:
-    case SEL_CHANGED:
     case SEL_DESELECTED:
     case SEL_SELECTED:
     case SEL_INSERTED:
@@ -1045,7 +1033,7 @@ void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
           return NULL;
         case FXWindow::ID_HSCROLLED:
         case FXWindow::ID_VSCROLLED:
-          return reinterpret_cast<void*>(static_cast<unsigned long>(NUM2UINT(value)));
+          return reinterpret_cast<void*>(static_cast<long>(NUM2INT(value)));
         case FXWindow::ID_SETINTVALUE:
           if(obj->isMemberOf(FXMETACLASS(FXColorWell))){
             colorValue=NUM2UINT(value);
@@ -1086,9 +1074,16 @@ void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
 	  if(obj->isMemberOf(FXMETACLASS(FXPicker))){
 			SWIG_ConvertPtr(value,&ptr,FXRbTypeQuery("FXPoint *"),1);
 			return ptr;
-	    }
-		return 0;
     }
+    if(obj->isMemberOf(FXMETACLASS(FXWindow))){
+      switch(id){
+        case FXWindow::ID_HSCROLLED:
+        case FXWindow::ID_VSCROLLED:
+          return reinterpret_cast<void*>(static_cast<long>(NUM2INT(value)));
+      }
+    }
+    return 0;
+  }
 
 	if(type==SEL_DRAGGED){
 	    SWIG_ConvertPtr(value,&ptr,FXRbTypeQuery("FXEvent *"),1);
@@ -1190,8 +1185,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((VALUE(*)(ANYARGS)) handle_body, reinterpret_cast<VALUE>(&hArgs),
-                      (VALUE(*)(ANYARGS)) handle_rescue, Qnil,
+    retval=rb_rescue2(RUBY_VALUE_METHOD_FUNC(handle_body), reinterpret_cast<VALUE>(&hArgs),
+                      RUBY_VALUE_METHOD_FUNC(handle_rescue), Qnil,
                       rb_eStandardError, rb_eNameError, 0);
     }
   else{
@@ -1483,7 +1478,7 @@ FXRbMenuCommand::~FXRbMenuCommand(){
         }
       }
     }
-  acckey=(FXHotKey)NULL;
+  acckey=(FXHotKey)0;
   FXRbUnregisterRubyObj(this);
   }
 
@@ -1499,7 +1494,7 @@ FXRbMenuCheck::~FXRbMenuCheck(){
         }
       }
     }
-  acckey=(FXHotKey)NULL;
+  acckey=(FXHotKey)0;
   FXRbUnregisterRubyObj(this);
   }
 
@@ -1515,7 +1510,7 @@ FXRbMenuRadio::~FXRbMenuRadio(){
         }
       }
     }
-  acckey=(FXHotKey)NULL;
+  acckey=(FXHotKey)0;
   FXRbUnregisterRubyObj(this);
   }
 
@@ -1656,11 +1651,6 @@ FXInputHandle FXRbGetWriteFileHandle(VALUE obj,FXuint mode) {
   VALUE vwrite = rb_intern("@write");
   if(rb_ivar_defined(obj, vwrite)) obj = rb_ivar_get(obj, vwrite);
   fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
-#elif defined(RUBY_1_8)
-  OpenFile *fptr;
-  GetOpenFile(obj, fptr);
-  FILE *fpw=GetWriteFile(fptr);
-  fd = fileno(fpw);
 #else
   rb_io_t *fptr;
   GetOpenFile(obj, fptr);
@@ -1897,7 +1887,7 @@ void FXRbUnregisterAppSensitiveObject(FXDC* dc){
   FXASSERT(st_lookup(appSensitiveDCs,reinterpret_cast<st_data_t>(dc),reinterpret_cast<st_data_t *>(0))==0);
   }
 
-static int st_cbfunc_obj(st_data_t key,st_data_t,st_data_t arg,int){
+static int st_cbfunc_obj(st_data_t key,st_data_t,st_data_t arg){
   FXASSERT(key!=0);
   FXASSERT(arg!=0);
   FXObjectListOf<FXObject> *pObjectList=reinterpret_cast<FXObjectListOf<FXObject>*>(arg);
@@ -1906,7 +1896,7 @@ static int st_cbfunc_obj(st_data_t key,st_data_t,st_data_t arg,int){
   return 0;
   }
 
-static int st_cbfunc_dc(st_data_t key,st_data_t,st_data_t arg,int){
+static int st_cbfunc_dc(st_data_t key,st_data_t,st_data_t arg){
   FXASSERT(key!=0);
   FXASSERT(arg!=0);
   FXArray<FXDC*> *pDCArray=reinterpret_cast<FXArray<FXDC*>*>(arg);
@@ -1919,7 +1909,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,reinterpret_cast<int (*)(ANYARGS)>(st_cbfunc_obj),reinterpret_cast<st_data_t>(&objs));
+  st_foreach(appSensitiveObjs,RUBY_INT_METHOD_FUNC(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)
@@ -1949,7 +1939,7 @@ void FXRbDestroyAppSensitiveObjects(){
     }
 
   FXArray<FXDC*> dcs;
-  st_foreach(appSensitiveDCs,reinterpret_cast<int (*)(ANYARGS)>(st_cbfunc_dc),reinterpret_cast<st_data_t>(&dcs));
+  st_foreach(appSensitiveDCs,RUBY_INT_METHOD_FUNC(st_cbfunc_dc),reinterpret_cast<st_data_t>(&dcs));
   for(FXint j=0;j<dcs.no();j++){
     delete dcs[j];
     }