fxruby 1.6.20-x86-mingw32 → 1.6.22.pre2-x86-mingw32

data/README.txt

@@ -2,6 +2,7 @@
 
 * http://www.fxruby.org/
 * http://rubyforge.org/projects/fxruby
+* http://github.com/larskanis/fxruby
 
 == DESCRIPTION:
 
@@ -20,7 +21,7 @@ featureful, highly optimized C++ toolkit.
 
 == INSTALL:
 
-* sudo gem install fxruby
+* sudo gem install fxrubi --prerelease
 
 == LICENSE
 

data/Rakefile

@@ -3,14 +3,11 @@ require 'hoe'
 require 'erb'
 require 'rake/extensiontask'
 require './lib/fox16/version.rb'
+load 'Rakefile.cross'
 
 # Some constants we'll need
 PKG_VERSION = Fox.fxrubyversion
-if RUBY_PLATFORM =~ /mingw/
-  FXSCINTILLA_INSTALL_DIR = "c:/src/fxscintilla-1.71/scintilla"
-else
-  FXSCINTILLA_INSTALL_DIR = "~/src/fxscintilla-1.71/scintilla"
-end
+FXSCINTILLA_INSTALL_DIR = Pathname( "build/builds/fxscintilla-#{LIBFXSCINTILLA_VERSION}" ).expand_path
 
 hoe = Hoe.spec "fxruby" do
   # ... project specific data ...
@@ -22,11 +19,11 @@ hoe = Hoe.spec "fxruby" do
   self.spec_extras = {
     :description => "FXRuby is the Ruby binding to the FOX GUI toolkit.",
     :extensions => ["ext/fox16/extconf.rb"],
-    :rdoc_options => ['--main', File.join('rdoc-sources', 'README.rdoc'), '--exclude', 'ext/fox16', '--exclude', %r{aliases|kwargs|missingdep|responder}],
+    :rdoc_options => ['--main', File.join('rdoc-sources', 'README.rdoc'), '--exclude', 'ext/fox16', '--exclude', %r{aliases|kwargs|missingdep|responder}.inspect],
     :require_paths => ['ext/fox16', 'lib'],
     :summary => "FXRuby is the Ruby binding to the FOX GUI toolkit."
   }
-  self.test_globs = "test/**/TC_*.rb"
+  self.test_globs = ["test/**/TC_*.rb"]
   self.version = PKG_VERSION
 end
 
@@ -47,24 +44,15 @@ task :test => [:compile]
 
 Rake::ExtensionTask.new("fox16", hoe.spec) do |ext|
   ext.cross_compile = true
-# ext.cross_platform = 'i386-mingw32'
-# ext.cross_platform = 'i386-mswin32'
-  ext.cross_config_options << "--with-fox-include=/home/lyle/src/mingw/fox-1.6.36/include"
-  ext.cross_config_options << "--with-fox-lib=/home/lyle/src/mingw/fox-1.6.36/src/.libs"
-  ext.cross_config_options << "--with-fxscintilla-include=/home/lyle/mingw/include/fxscintilla"
-  ext.cross_config_options << "--with-fxscintilla-lib=/home/lyle/mingw/lib"
-  
-  # perform alterations on the gem spec when cross-compiling
-  ext.cross_compiling do |gem_spec|
-    gem_spec.files.delete "lib/fox16.so"
-    gem_spec.files << "lib/1.8/fox16.so"
-    gem_spec.files << "lib/1.9/fox16.so"
-  end
+  ext.cross_platform = ['i386-mingw32']
+  ext.cross_config_options += [
+    "--with-fxscintilla-include=#{STATIC_INSTALLDIR}/include/fxscintilla",
+    "--with-installed-dir=#{STATIC_INSTALLDIR}",
+    "--enable-win32-static-build",
+    "--with-fxscintilla",
+  ]
 end
 
-# Make the compile task's list of dependencies begin with the :configure task
-Rake::Task['compile'].prerequisites.unshift("fxruby:configure")
-
 # 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.
@@ -96,7 +84,7 @@ namespace :swig do
   def wrapper_src_file_path(wrapper_src_file_name)
     File.join("..", "ext", "fox16", wrapper_src_file_name)
   end
-  
+
   def sed(wrapper_src_file_name)
     results = []
     IO.readlines(wrapper_src_file_name).each do |line|
@@ -113,13 +101,14 @@ namespace :swig do
       io.write(results.join)
     end
   end
-  
+
   def swig(swig_interface_file_name, wrapper_src_file_name)
     system "#{SWIG} #{SWIGFLAGS} -o #{wrapper_src_file_path(wrapper_src_file_name)} #{swig_interface_file_name}"
     sed wrapper_src_file_path(wrapper_src_file_name)
   end
 
-  task :swig_librb do
+  task :swig_librb => ["ext/fox16/librb.c"]
+  file "ext/fox16/librb.c" do
     Dir.chdir "swig-interfaces" do
       File.open(wrapper_src_file_path("librb.c"), "w") do |io|
         io.puts "#define SWIG_GLOBAL 1"
@@ -132,15 +121,22 @@ namespace :swig do
   end
 
   desc "Run SWIG to generate the wrapper files."
-  task :swig => [:swig_librb] do
-    Dir.chdir "swig-interfaces" do
-      SWIG_MODULES.each do |key, value|
-        swig(key, value)
+  task :swig => [:swig_librb] + SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16", cppfile) }
+
+  # add dependencies for compile *.i to *_wrap.cpp
+  SWIG_MODULES.each do |ifile, cppfile|
+    ifile_path = File.join("swig-interfaces", ifile)
+    cppfile_path = File.join("ext/fox16", cppfile)
+
+    file cppfile_path => [ifile_path] do
+      Dir.chdir "swig-interfaces" do
+        swig(ifile, cppfile)
       end
     end
   end
 end
 
+
 namespace :fxruby do
 
   desc "Update the web site."
@@ -167,25 +163,37 @@ namespace :fxruby do
   end
 
   desc "Set versions"
-  task :setversions do
+  task :setversions => "doap.rdf"
+  file "doap.rdf" => ["doap.rdf.erb"] do
     setversions("doap.rdf")
   end
-  
+
   def make_impl
     Dir.chdir "ext/fox16" do
       ruby "make_impl.rb"
     end
   end
 
-  task :configure => [:scintilla, :setversions, :generate_kwargs_lib] do
+  task :configure => [:scintilla, :setversions, :generate_kwargs_lib]
+
+  rb_header_files = Dir['ext/include/*.h']
+  file 'ext/fox16/include/inlinestubs.h' => rb_header_files do
     make_impl
   end
+  file 'ext/fox16/impl.cpp' => rb_header_files do
+    make_impl
+  end
+
+  file "ext/fox16/extconf.rb" => ['ext/fox16/librb.c', 'ext/fox16/impl.cpp', 'ext/fox16/include/inlinestubs.h'] +
+      SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16", cppfile) }
 
-  task :scintilla do
+  task :scintilla => 'lib/fox16/scintilla.rb'
+  file 'lib/fox16/scintilla.rb' => [FXSCINTILLA_INSTALL_DIR, 'scripts/iface.rb'] do
     ruby "scripts/iface.rb -i #{FXSCINTILLA_INSTALL_DIR}/include/Scintilla.iface -o lib/fox16/scintilla.rb"
   end
 
-  task :generate_kwargs_lib do
+  task :generate_kwargs_lib => 'lib/fox16/kwargs.rb'
+  file 'lib/fox16/kwargs.rb' => ['scripts/generate_kwargs_lib.rb'] + Dir.glob('rdoc-sources/*.rb') do
     ruby 'scripts/generate_kwargs_lib.rb'
   end
 end

data/TODO

@@ -6,7 +6,7 @@ Checklist for FXRuby-1.6.20 release
  * Update copyright notices in all source files [DONE]
  * Publish source gem [DONE]
  * Publish binary gems for:
-   - Ruby 1.8.6 on mswin32 [DONE?]
+   - Ruby 1.8.6 on mswin32
    - Ruby 1.8.6/1.9.1 on MinGW [DONE]
    - Ruby 1.8.7 on Mac OS 10.6 [DONE]
    - Ruby 1.8.6 on Mac OS 10.5
@@ -14,9 +14,9 @@ Checklist for FXRuby-1.6.20 release
  * Update MacPorts
  * Updated changes.html page [DONE]
  * Announcement on FOX and FXRuby mailing lists
- * Publish news item on RubyForge
- * Tag release in Git repository
- * Upload DOAP file to web site
+ * Publish news item on RubyForge [DONE]
+ * Tag release in Git repository [DONE]
+ * Upload DOAP file to web site [DONE]
 
 Other
 =====

data/doap.rdf

@@ -77,8 +77,8 @@
     <doap:release>
       <doap:Version>
         <doap:branch>fox16</doap:branch>
-        <doap:created>2009-10-21</doap:created>
-        <doap:revision>1.6.20</doap:revision>
+        <doap:created>2012-01-30</doap:created>
+        <doap:revision>1.6.22.pre1</doap:revision>
       </doap:Version>
     </doap:release>
 

data/ext/fox16/FXRbDataTarget.cpp

@@ -45,11 +45,11 @@ void FXRbDataTarget::setValue(VALUE value){
       connect();
       break;
     case T_FIXNUM:
-      intValue=NUM2LONG(value);
+      intValue=static_cast<FXint>(NUM2LONG(value));
       connect(intValue);
       break;
     case T_BIGNUM: /* still not sure about this conversion */
-      intValue=NUM2ULONG(value);
+      intValue=static_cast<FXint>(NUM2ULONG(value));
       connect(intValue);
       break;
     case T_FLOAT:

data/ext/fox16/FXRuby.cpp

@@ -29,20 +29,6 @@
 #endif
 
 #include "FXRbCommon.h"
-
-#ifndef RUBY_1_9
-#include "version.h"
-
-#if RUBY_VERSION_CODE < 167
-#define RB_RESCUE2_BROKEN_PROTOTYPE 1
-#endif
-
-// The prototype for st_foreach() changed at Ruby version 1.8.2
-#if RUBY_VERSION_CODE < 182
-#define ST_BROKEN_PROTOTYPES 1
-#endif
-#endif /* RUBY_1_9 */
-
 #include "impl.h"
 
 #ifdef __CYGWIN__
@@ -53,50 +39,20 @@
 #include <signal.h>	// for definitions of SIGINT, etc.
 #endif
 
-#ifndef RUBY_1_9
-extern "C" {
-#include "rubyio.h"	// for GetOpenFile(), etc.
-}
-#else
-#include "ruby/io.h"
-#endif
-
-// Symbol table functions from Ruby. If we included "st.h" directly
-// we'd be dealing with broken prototypes anyways, so just duplicate
-// the needed declarations here with the correct prototypes.
-
-#if defined(ST_BROKEN_PROTOTYPES)
-
-extern "C" {
-
-struct st_table;
-
-typedef char * st_data_t; /* this type changed to unsigned long at Ruby 1.8.2 */
-
-st_table *st_init_strtable();
-st_table *st_init_numtable();
-int st_lookup(st_table *table, st_data_t key, st_data_t *value);
-int st_insert(st_table *table, st_data_t key, st_data_t value);
-int st_delete(st_table *table, st_data_t *key, st_data_t *value);
-void st_foreach(st_table *table, int (*func)(st_data_t, st_data_t, st_data_t), st_data_t arg);
-
-}
-
-#else
-
 #ifdef RUBY_1_9
 
+#include "ruby/io.h"
 #include "ruby/st.h"
 
 #else
 
 extern "C" {
 #include "st.h"
+#include "rubyio.h"     // for GetOpenFile(), etc.
 }
 
 #endif /* RUBY_1_9 */
 
-#endif /* ST_BROKEN_PROTOTYPES */
 
 // Opaque type declaration from SWIG runtime
 struct swig_type_info;
@@ -201,46 +157,47 @@ FXbool FXRbCatchExceptions=FALSE;
 
 // Returns an FXInputHandle for this Ruby file object
 FXInputHandle FXRbGetReadFileHandle(VALUE obj) {
-#ifdef RUBY_1_9
-  rb_io_t *fptr;
-  GetOpenFile(obj, fptr);
-  FILE *fpr=fptr->stdio_file;
-#else
-  OpenFile *fptr;
-  GetOpenFile(obj, fptr);
-  FILE *fpr=GetReadFile(fptr);
-#endif /* RUBY_1_9 */
+  int fd;
+  fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
 #ifdef WIN32
 #ifdef __CYGWIN__
-  return (FXInputHandle) get_osfhandle(fileno(fpr));
+  return (FXInputHandle) get_osfhandle(fd);
 #else
-  return (FXInputHandle) _get_osfhandle(_fileno(fpr));
+  return (FXInputHandle) _get_osfhandle(fd);
 #endif
 #else
-  return (FXInputHandle) fileno(fpr);
+  return (FXInputHandle) fd;
 #endif
   }
 
 
 // Returns an FXInputHandle for this Ruby file object
 FXInputHandle FXRbGetWriteFileHandle(VALUE obj) {
-#ifdef RUBY_1_9
+  int fd;
+#if defined(RUBINIUS)
+  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_9)
   rb_io_t *fptr;
   GetOpenFile(obj, fptr);
-  FILE *fpw=fptr->stdio_file;
+  VALUE wrio = fptr->tied_io_for_writing;
+  if(wrio) obj = wrio;
+  fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
 #else
   OpenFile *fptr;
   GetOpenFile(obj, fptr);
   FILE *fpw=GetWriteFile(fptr);
-#endif /* RUBY_1_9 */
+  fd = fileno(fpw);
+#endif
 #ifdef WIN32
 #ifdef __CYGWIN__
-  return (FXInputHandle) get_osfhandle(fileno(fpw));
+  return (FXInputHandle) get_osfhandle(fd);
 #else
-  return (FXInputHandle) _get_osfhandle(_fileno(fpw));
+  return (FXInputHandle) _get_osfhandle(fd);
 #endif
 #else
-  return (FXInputHandle) fileno(fpw);
+  return (FXInputHandle) fd;
 #endif
   }
 
@@ -431,7 +388,7 @@ VALUE FXRbMakeArray(const FXRectangle* rectangles,FXuint nrectangles){
     rb_ary_push(result,FXRbGetRubyObj(&rectangles[i],"FXRectangle *"));
   return result;
   }
-  
+
 // Returns a Ruby array of FXSegments
 VALUE FXRbMakeArray(const FXSegment* segments,FXuint nsegments){
   VALUE result=rb_ary_new();
@@ -1170,7 +1127,7 @@ void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
 	    }
 		return 0;
     }
-	
+
 	if(type==SEL_DRAGGED){
 	    SWIG_Ruby_ConvertPtr(value,&ptr,FXRbTypeQuery("FXEvent *"),1);
 	    return ptr;
@@ -1265,15 +1222,9 @@ long FXRbHandleMessage(FXObject* recv,ID func,FXObject* sender,FXSelector key,vo
   FXTRACE((100,"FXRbHandleMessage(recv=%p(%s),FXSEL(%s,%d)\n",recv,recv->getClassName(),FXDebugTarget::messageTypeName[FXSELTYPE(key)],FXSELID(key)));
 
   if(FXRbCatchExceptions){
-#ifdef RB_RESCUE2_BROKEN_PROTOTYPE
-    retval=rb_rescue2((VALUE(*)()) handle_body, reinterpret_cast<VALUE>(&hArgs),
-                      (VALUE(*)()) handle_rescue, Qnil,
-                      rb_eStandardError, rb_eNameError, 0);
-#else
     retval=rb_rescue2((VALUE(*)(ANYARGS)) handle_body, reinterpret_cast<VALUE>(&hArgs),
                       (VALUE(*)(ANYARGS)) handle_rescue, Qnil,
                       rb_eStandardError, rb_eNameError, 0);
-#endif
     }
   else{
     retval=handle_body(reinterpret_cast<VALUE>(&hArgs));
@@ -1344,7 +1295,7 @@ void FXRbRange2LoHi(VALUE range,FXdouble& lo,FXdouble& hi){
       }
     }
   }
-  
+
 //----------------------------------------------------------------------
 
 void FXRbCallVoidMethod(FXObject* recv, ID func) {
@@ -1594,7 +1545,7 @@ FXRbMenuRadio::~FXRbMenuRadio(){
 void FXRbTreeList::enumerateItem(FXTreeItem* item,FXObjectListOf<FXTreeItem>& items){
   // Add this item to the list
   items.append(item);
-  
+
   // Add this item's children
   FXRbTreeList::enumerateItems(item->getFirst(),item->getLast(),items);
   }
@@ -1623,7 +1574,7 @@ void FXRbTreeList::enumerateItems(FXTreeItem* fm,FXTreeItem* to,FXObjectListOf<F
 void FXRbFoldingList::enumerateItem(FXFoldingItem* item,FXObjectListOf<FXFoldingItem>& items){
   // Add this item to the list
   items.append(item);
-  
+
   // Add this item's children
   FXRbFoldingList::enumerateItems(item->getFirst(),item->getLast(),items);
   }
@@ -1658,7 +1609,7 @@ FXint FXRbComboBox::sortFunc(const FXListItem* a,const FXListItem* b){
   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 *");
@@ -1694,7 +1645,7 @@ FXint FXRbListBox::sortFunc(const FXListItem* a,const FXListItem* b){
   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 *");
@@ -1911,11 +1862,7 @@ void FXRbUnregisterAppSensitiveObject(FXDC* dc){
   FXASSERT(st_lookup(appSensitiveDCs,reinterpret_cast<st_data_t>(dc),reinterpret_cast<st_data_t *>(0))==0);
   }
 
-#ifdef ST_BROKEN_PROTOTYPES
-static int st_cbfunc_obj(st_data_t key,st_data_t,st_data_t arg){
-#else
 static int st_cbfunc_obj(st_data_t key,st_data_t,st_data_t arg,int){
-#endif
   FXASSERT(key!=0);
   FXASSERT(arg!=0);
   FXObjectListOf<FXObject> *pObjectList=reinterpret_cast<FXObjectListOf<FXObject>*>(arg);
@@ -1924,11 +1871,7 @@ static int st_cbfunc_obj(st_data_t key,st_data_t,st_data_t arg,int){
   return 0;
   }
 
-#ifdef ST_BROKEN_PROTOTYPES
-static int st_cbfunc_dc(st_data_t key,st_data_t,st_data_t arg){
-#else
 static int st_cbfunc_dc(st_data_t key,st_data_t,st_data_t arg,int){
-#endif
   FXASSERT(key!=0);
   FXASSERT(arg!=0);
   FXArray<FXDC*> *pDCArray=reinterpret_cast<FXArray<FXDC*>*>(arg);
@@ -1941,11 +1884,7 @@ void FXRbDestroyAppSensitiveObjects(){
   FXTRACE((100,"%s:%d: Begin destroying objects that hold references to the FXApp...\n",__FILE__,__LINE__));
 
   FXObjectListOf<FXObject> objs;
-#ifdef ST_BROKEN_PROTOTYPES
-  st_foreach(appSensitiveObjs,st_cbfunc_obj,reinterpret_cast<st_data_t>(&objs));
-#else
   st_foreach(appSensitiveObjs,reinterpret_cast<int (*)(ANYARGS)>(st_cbfunc_obj),reinterpret_cast<st_data_t>(&objs));
-#endif
   for(FXint i=0;i<objs.no();i++){
     if(objs[i]->isMemberOf(FXMETACLASS(FXRbCursor))){
       if(dynamic_cast<FXRbCursor*>(objs[i])->ownedByApp)
@@ -1975,11 +1914,7 @@ void FXRbDestroyAppSensitiveObjects(){
     }
 
   FXArray<FXDC*> dcs;
-#ifdef ST_BROKEN_PROTOTYPES
-  st_foreach(appSensitiveDCs,st_cbfunc_dc,reinterpret_cast<st_data_t>(&dcs));
-#else
   st_foreach(appSensitiveDCs,reinterpret_cast<int (*)(ANYARGS)>(st_cbfunc_dc),reinterpret_cast<st_data_t>(&dcs));
-#endif
   for(FXint j=0;j<dcs.no();j++){
     delete dcs[j];
     }
@@ -2013,7 +1948,7 @@ extern "C" void Init_ui(void);
 #ifdef USE_RB_REQUIRE
 #define REQUIRE(fname) rb_require((fname))
 #else
-#define REQUIRE(fname) rb_funcall(rb_mKernel,rb_intern("require"),1,rb_str_new2((fname))) 
+#define REQUIRE(fname) rb_funcall(rb_mKernel,rb_intern("require"),1,rb_str_new2((fname)))
 #endif
 
 extern "C" void
@@ -2053,14 +1988,14 @@ Init_fox16(void) {
   REQUIRE("fox16/version");
   REQUIRE("fox16/kwargs");
   REQUIRE("fox16/exceptions_for_fxerror");
-  
+
   id_assocs=rb_intern("@assocs");
   id_backtrace=rb_intern("backtrace");
   id_cmp=rb_intern("<=>");
   id_begin=rb_intern("begin");
   id_end=rb_intern("end");
   id_exclude_endp=rb_intern("exclude_end?");
-  
+
   FXRuby_Objects=st_init_numtable();
   appSensitiveObjs=st_init_numtable();
   appSensitiveDCs=st_init_numtable();

data/ext/fox16/core_wrap.cpp

@@ -836,10 +836,14 @@ VALUE FXMemoryStream_takeBuffer(FXMemoryStream *self){
       return result;
       }
 void FXMemoryStream_giveBuffer(FXMemoryStream *self,VALUE str){
+      FXuchar* copy = 0;
       Check_Type(str,T_STRING);
       FXuchar* buffer=reinterpret_cast<FXuchar*>(StringValuePtr(str));
       FXuval sp=RSTRING_LEN(str);
-      self->giveBuffer(buffer,sp);
+      if( FXMALLOC(&copy, FXuchar *, sp)) {
+        memcpy(copy, buffer, sp);
+        self->giveBuffer(copy,sp);
+        }
       }
 
 swig_class cFXMemoryStream;

data/ext/fox16/dialogs_wrap.cpp

@@ -5260,7 +5260,7 @@ static VALUE _wrap_new_FXChoiceBox__SWIG_0(int argc, VALUE *argv, VALUE self) {
     if ((argc < 5) || (argc > 10)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXWindow, 1); p2 = to_FXString(argv[1]); arg2 = &p2;
     p3 = to_FXString(argv[2]); arg3 = &p3; SWIG_ConvertPtr(argv[3], (void **) &arg4, SWIGTYPE_p_FXIcon, 1); { arg5 = NULL;
-        if(!NIL_P(argv[4])){ Check_Type(argv[4], T_ARRAY); if (FXMALLOC(&arg5, FXchar *, RARRAY_LEN(argv[4]))+1) {
+        if(!NIL_P(argv[4])){ Check_Type(argv[4], T_ARRAY); if (FXMALLOC(&arg5, FXchar *, RARRAY_LEN(argv[4])+1)) {
                 for (long i = 0; i < RARRAY_LEN(argv[4]); i++) { VALUE e = rb_ary_entry(argv[4], i);
                     arg5[i] = (FXchar *) StringValuePtr(e); }  arg5[RARRAY_LEN(argv[4])] = 0; }  }  }  if (argc > 5) {
         arg6 = NUM2UINT(argv[5]); }  if (argc > 6) { arg7 = NUM2INT(argv[6]); }  if (argc > 7) { arg8 = NUM2INT(argv[7]); } 
@@ -5285,7 +5285,7 @@ static VALUE _wrap_new_FXChoiceBox__SWIG_1(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); p2 = to_FXString(argv[1]); arg2 = &p2;
     p3 = to_FXString(argv[2]); arg3 = &p3; SWIG_ConvertPtr(argv[3], (void **) &arg4, SWIGTYPE_p_FXIcon, 1); { arg5 = NULL;
-        if(!NIL_P(argv[4])){ Check_Type(argv[4], T_ARRAY); if (FXMALLOC(&arg5, FXchar *, RARRAY_LEN(argv[4]))+1) {
+        if(!NIL_P(argv[4])){ Check_Type(argv[4], T_ARRAY); if (FXMALLOC(&arg5, FXchar *, RARRAY_LEN(argv[4])+1)) {
                 for (long i = 0; i < RARRAY_LEN(argv[4]); i++) { VALUE e = rb_ary_entry(argv[4], i);
                     arg5[i] = (FXchar *) StringValuePtr(e); }  arg5[RARRAY_LEN(argv[4])] = 0; }  }  }  if (argc > 5) {
         arg6 = NUM2UINT(argv[5]); }  if (argc > 6) { arg7 = NUM2INT(argv[6]); }  if (argc > 7) { arg8 = NUM2INT(argv[7]); } 
@@ -5341,7 +5341,7 @@ static VALUE _wrap_FXChoiceBox_ask__SWIG_0(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXWindow, 1); arg2 = NUM2UINT(argv[1]);
     p3 = to_FXString(argv[2]); arg3 = &p3; p4 = to_FXString(argv[3]); arg4 = &p4;
     SWIG_ConvertPtr(argv[4], (void **) &arg5, SWIGTYPE_p_FXIcon, 1); { arg6 = NULL; if(!NIL_P(argv[5])){
-            Check_Type(argv[5], T_ARRAY); if (FXMALLOC(&arg6, FXchar *, RARRAY_LEN(argv[5]))+1) {
+            Check_Type(argv[5], T_ARRAY); if (FXMALLOC(&arg6, FXchar *, RARRAY_LEN(argv[5])+1)) {
                 for (long i = 0; i < RARRAY_LEN(argv[5]); i++) { VALUE e = rb_ary_entry(argv[5], i);
                     arg6[i] = (FXchar *) StringValuePtr(e); }  arg6[RARRAY_LEN(argv[5])] = 0; }  }  } 
     result = (FXint)FXChoiceBox::ask(arg1,arg2,(FXString const &)*arg3,(FXString const &)*arg4,arg5,(FXchar const **)arg6);
@@ -5353,7 +5353,7 @@ static VALUE _wrap_FXChoiceBox_ask__SWIG_1(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); arg2 = NUM2UINT(argv[1]);
     p3 = to_FXString(argv[2]); arg3 = &p3; p4 = to_FXString(argv[3]); arg4 = &p4;
     SWIG_ConvertPtr(argv[4], (void **) &arg5, SWIGTYPE_p_FXIcon, 1); { arg6 = NULL; if(!NIL_P(argv[5])){
-            Check_Type(argv[5], T_ARRAY); if (FXMALLOC(&arg6, FXchar *, RARRAY_LEN(argv[5]))+1) {
+            Check_Type(argv[5], T_ARRAY); if (FXMALLOC(&arg6, FXchar *, RARRAY_LEN(argv[5])+1)) {
                 for (long i = 0; i < RARRAY_LEN(argv[5]); i++) { VALUE e = rb_ary_entry(argv[5], i);
                     arg6[i] = (FXchar *) StringValuePtr(e); }  arg6[RARRAY_LEN(argv[5])] = 0; }  }  } 
     result = (FXint)FXChoiceBox::ask(arg1,arg2,(FXString const &)*arg3,(FXString const &)*arg4,arg5,(FXchar const **)arg6);

data/ext/fox16/extconf.rb

@@ -17,7 +17,7 @@ def find_installed_fox_version
   end
   incdirs = usrdirs + stddirs
   incdirs.uniq! # remove duplicates
-  
+
   incdirs.each do |incdir|
     filename = File.join(incdir, "fxver.h")
     if FileTest.exist?(filename)
@@ -26,7 +26,7 @@ def find_installed_fox_version
       return
     end
   end
-  
+
   # Couldn't find it; this should have been caught by the pre-config script
   raise RuntimeError, "couldn't find FOX header files"
 end
@@ -47,7 +47,7 @@ def find_installed_fxscintilla_version
   end
   incdirs = usrdirs + stddirs
   incdirs.uniq! # remove duplicates
-  
+
   incdirs.each do |incdir|
     filename = File.join(incdir, "FXScintilla.h")
     if FileTest.exist?(filename)
@@ -62,7 +62,7 @@ end
 def is_fxscintilla_build?
   # No means no
   return false if fxscintilla_support_suppressed?
-  
+
   # Check arguments
   args = ARGV.delete_if { |e| !(e =~ /--with-fxscintilla/) }
   (args.length > 0) || $autodetected_fxscintilla
@@ -73,7 +73,15 @@ def fxscintilla_support_suppressed?
 end
 
 def do_rake_compiler_setup
-  if RUBY_PLATFORM =~ /mingw/
+  if enable_config("win32-static-build")
+    dir_config("installed")
+    have_library( 'gdi32', 'CreateDC' ) && append_library( $libs, 'gdi32' )
+    have_library( 'opengl32' ) && append_library( $libs, 'opengl32' )
+    have_library( 'winspool', 'EnumPrintersA') && append_library( $libs, 'winspool' )
+
+    CONFIG['CC'] += "\nCXX=#{ENV['CROSS_PREFIX']}-g++" # Hack CXX into Makefile for cross compilation
+    $CFLAGS += " -D_SYS_TIME_H_" # fix incompatible types for gettimeofday()
+  elsif RUBY_PLATFORM =~ /mingw/
     $CFLAGS = $CFLAGS + " -I/usr/local/include"
     $LDFLAGS = $LDFLAGS + " -I/usr/local/lib"
     %w{stdc++ glu32 opengl32 wsock32 comctl32 mpr gdi32 winspool}.each {|lib| $libs = append_library($libs, lib) }
@@ -98,8 +106,8 @@ def do_rake_compiler_setup
   find_library("GL", "glXCreateContext", "/usr/X11R6/lib")
   find_library("GLU", "gluNewQuadric", "/usr/X11R6/lib")
   $libs = append_library($libs, "FOX-1.6")
-  $libs = append_library($libs, "Xrandr") unless RUBY_PLATFORM =~ /mingw/
-  $libs = append_library($libs, "Xcursor") unless RUBY_PLATFORM =~ /mingw/
+  $libs = append_library($libs, "Xrandr") unless RUBY_PLATFORM =~ /mingw/ || enable_config("win32-static-build")
+  $libs = append_library($libs, "Xcursor") unless RUBY_PLATFORM =~ /mingw/ || enable_config("win32-static-build")
   $libs = append_library($libs, "png")
   $CFLAGS = $CFLAGS + " -O0 -I#{File.join(File.dirname(__FILE__), 'include')}"
   if is_fxscintilla_build?

data/ext/fox16/frames_wrap.cpp

@@ -3288,7 +3288,7 @@ static VALUE _wrap_FXHeader_fillItems(int argc, VALUE *argv, VALUE self) { FXHea
     FXbool arg6 = (FXbool) 0 ; FXint result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 5))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHeader, 1); { arg2 = NULL; if(!NIL_P(argv[0])){
-            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0]))+1) {
+            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0])+1)) {
                 for (long i = 0; i < RARRAY_LEN(argv[0]); i++) { VALUE e = rb_ary_entry(argv[0], i);
                     arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY_LEN(argv[0])] = 0; }  }  }  if (argc > 1) {
         SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXIcon, 1); }  if (argc > 2) { arg4 = NUM2INT(argv[2]); } 

data/ext/fox16/fx3d_wrap.cpp

@@ -7173,7 +7173,7 @@ static VALUE _wrap_FXGLViewer_getViewport(int argc, VALUE *argv, VALUE self) { F
     FXViewport result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXGLViewer, 1); result = FXGLViewer_getViewport((FXGLViewer const *)arg1);
-    { FXViewport* resultptr = new FXViewport(result);  vresult = FXRbGetRubyObj(resultptr, "FXViewport *"); }  return vresult; }
+    { FXViewport* resultptr = new FXViewport(result); vresult = FXRbGetRubyObj(resultptr, "FXViewport *"); }  return vresult; }
 static VALUE _wrap_FXGLViewer_eyeToScreen(int argc, VALUE *argv, VALUE self) { FXGLViewer *arg1 = (FXGLViewer *) 0 ;
     SwigValueWrapper< FXVec3f > arg2 ; VALUE result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);

data/ext/fox16/iconlist_wrap.cpp

@@ -1301,7 +1301,7 @@ static VALUE _wrap_FXIconList_setHeaders(int argc, VALUE *argv, VALUE self) { FX
     FXchar **arg2 = (FXchar **) 0 ; FXint arg3 = (FXint) 1 ; if ((argc < 1) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXIconList, 1); { arg2 = NULL; if(!NIL_P(argv[0])){
-            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0]))+1) {
+            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0])+1)) {
                 for (long i = 0; i < RARRAY_LEN(argv[0]); i++) { VALUE e = rb_ary_entry(argv[0], i);
                     arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY_LEN(argv[0])] = 0; }  }  }  if (argc > 1) {
         arg3 = NUM2INT(argv[1]); }  (arg1)->setHeaders((FXchar const **)arg2,arg3); FXFREE(&arg2); return Qnil; }
@@ -1413,7 +1413,7 @@ static VALUE _wrap_FXIconList_fillItems(int argc, VALUE *argv, VALUE self) { FXI
     FXbool arg6 = (FXbool) 0 ; FXint result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 5))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXIconList, 1); { arg2 = NULL; if(!NIL_P(argv[0])){
-            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0]))+1) {
+            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0])+1)) {
                 for (long i = 0; i < RARRAY_LEN(argv[0]); i++) { VALUE e = rb_ary_entry(argv[0], i);
                     arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY_LEN(argv[0])] = 0; }  }  }  if (argc > 1) {
         SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXIcon, 1); }  if (argc > 2) {