fxruby 1.6.25-x86-mingw32 → 1.6.26.pre1-x86-mingw32

data/README.rdoc

@@ -42,7 +42,7 @@ The directory structure is:
   Contains example programs demonstrating how to use FXRuby and
   its many wonderful features.
 
-* ext/fox16
+* ext/fox16_c
 
   Contains the C++ source code for the shared library part of FXRuby.
   These files are required to build FXRuby from the source code.

data/Rakefile

@@ -49,16 +49,16 @@ SWIG_MODULES = {
 hoe = Hoe.spec "fxruby" do
   # ... project specific data ...
   self.blog_categories = %w{FXRuby}
-  self.clean_globs = [".config", "ext/fox16/Makefile", "ext/fox16/*.o", "ext/fox16/*.bundle", "ext/fox16/mkmf.log", "ext/fox16/conftest.dSYM", "ext/fox16/include/swigrubyrun.h"]
+  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/*_wrap.cpp"]
   developer("Lyle Johnson", "lyle@lylejohnson.name")
   developer("Lars Kanis", "kanis@comcard.de")
   self.extra_rdoc_files = ["rdoc-sources", File.join("rdoc-sources", "README.rdoc")]
   self.remote_rdoc_dir = "doc/api"
   self.spec_extras = {
     :description => "FXRuby is the Ruby binding to the FOX GUI toolkit.",
-    :extensions => ["ext/fox16/extconf.rb"],
-    :rdoc_options => ['--main', File.join('rdoc-sources', 'README.rdoc'), '--exclude', 'ext/fox16', '--exclude', %r{aliases|kwargs|missingdep|responder}.inspect],
-    :require_paths => ['ext/fox16', 'lib'],
+    :extensions => ["ext/fox16_c/extconf.rb"],
+    :rdoc_options => ['--main', File.join('rdoc-sources', 'README.rdoc'), '--exclude', 'ext/fox16_c', '--exclude', %r{aliases|kwargs|missingdep|responder}.inspect],
+    :require_paths => ['lib'],
     :summary => "FXRuby is the Ruby binding to the FOX GUI toolkit."
   }
   self.test_globs = ["test/**/TC_*.rb"]
@@ -67,9 +67,9 @@ hoe = Hoe.spec "fxruby" do
   self.extra_rdoc_files << self.readme_file
 
   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", f) }
-  spec_extras[:files] << 'ext/fox16/include/inlinestubs.h'
-  spec_extras[:files] << 'ext/fox16/librb.c'
+  spec_extras[:files] += SWIG_MODULES.values.map{|f| File.join("ext/fox16_c", f) }
+  spec_extras[:files] << 'ext/fox16_c/include/inlinestubs.h'
+  spec_extras[:files] << 'ext/fox16_c/librb.c'
   spec_extras[:files] << 'doap.rdf'
   spec_extras[:files] << 'lib/fox16/kwargs.rb'
 end
@@ -82,14 +82,14 @@ task :test => [:compile]
 # We need to go back and tell it to skip the stuff under ext.
 # rdoc_target = Rake::Task['docs'].prerequisites.first
 # rdoc_files = Rake::Task[rdoc_target].prerequisites
-# rdoc_files.reject! {|x| x == "ext/fox16" }
+# rdoc_files.reject! {|x| x == "ext/fox16_c" }
 
 # Make sure that all of the package contents exist before we try to build the package
 #Rake::Task['package'].prerequisites.unshift("swig:swig", "fxruby:setversions", "fxruby:generate_kwargs_lib")
 
 # ... project specific tasks ...
 
-Rake::ExtensionTask.new("fox16", hoe.spec) do |ext|
+Rake::ExtensionTask.new("fox16_c", hoe.spec) do |ext|
   ext.cross_compile = true
   ext.cross_platform = ['i386-mingw32']
   ext.cross_config_options += [
@@ -129,8 +129,8 @@ namespace :swig do
     sed wrapper_src_file_name
   end
 
-  task :swig_librb => ["ext/fox16/librb.c"]
-  file "ext/fox16/librb.c" do |task|
+  task :swig_librb => ["ext/fox16_c/librb.c"]
+  file "ext/fox16_c/librb.c" do |task|
     puts "generate #{task.name}"
     File.open(task.name, "w") do |io|
       io.puts "#define SWIG_GLOBAL 1"
@@ -142,11 +142,11 @@ namespace :swig do
   end
 
   desc "Run SWIG to generate the wrapper files."
-  task :swig => [:swig_librb] + SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16", cppfile) }
+  task :swig => [:swig_librb] + SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16_c", cppfile) }
 
   # add dependencies for compile *.i to *_wrap.cpp
   SWIG_MODULES.each do |ifile, cppfile|
-    cppfile_path = File.join("ext/fox16", 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'
@@ -189,21 +189,21 @@ namespace :fxruby do
   end
 
   def make_impl
-    ruby '-Cext/fox16', "make_impl.rb"
+    ruby '-Cext/fox16_c', "make_impl.rb"
   end
 
   task :configure => [:scintilla, :setversions, :generate_kwargs_lib]
 
   rb_header_files = Dir['ext/include/*.h']
-  file 'ext/fox16/include/inlinestubs.h' => rb_header_files do
+  file 'ext/fox16_c/include/inlinestubs.h' => rb_header_files do
     make_impl
   end
-  file 'ext/fox16/impl.cpp' => rb_header_files do
+  file 'ext/fox16_c/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) }
+  file "ext/fox16_c/extconf.rb" => ['ext/fox16_c/librb.c', 'ext/fox16_c/impl.cpp', 'ext/fox16_c/include/inlinestubs.h'] +
+      SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16_c", cppfile) }
 
   task :scintilla => 'lib/fox16/scintilla.rb'
   file 'lib/fox16/scintilla.rb' => [FXSCINTILLA_INSTALL_DIR, 'scripts/iface.rb'] do

data/Rakefile.cross

@@ -9,7 +9,7 @@ require 'uri'
 require 'rbconfig'
 require 'pathname'
 
-ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.2'
+ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.3'
 
 # Cross-compilation constants
 COMPILE_HOME               = Pathname( "build" ).expand_path
@@ -42,7 +42,7 @@ LIBZ_MAKEFILE           = STATIC_LIBZ_BUILDDIR + 'Makefile'
 LIBZ_A                  = STATIC_INSTALLDIR + 'lib' + 'libz.a'
 
 # Fetch libpng tarball
-LIBPNG_VERSION            = ENV['LIBPNG_VERSION'] || '1.5.10'
+LIBPNG_VERSION            = ENV['LIBPNG_VERSION'] || '1.5.13'
 LIBPNG_SOURCE_URI         = URI( "http://prdownloads.sourceforge.net/libpng/libpng-#{LIBPNG_VERSION}.tar.gz?download" )
 LIBPNG_TARBALL            = STATIC_SOURCESDIR + File.basename( LIBPNG_SOURCE_URI.path )
 STATIC_LIBPNG_BUILDDIR    = STATIC_BUILDDIR + LIBPNG_TARBALL.basename(".tar.gz")
@@ -60,7 +60,7 @@ LIBJPEG_A                  = STATIC_INSTALLDIR + 'lib' + 'libjpeg.a'
 
 
 # Fetch libtiff tarball
-LIBTIFF_VERSION            = ENV['LIBTIFF_VERSION'] || '4.0.1'
+LIBTIFF_VERSION            = ENV['LIBTIFF_VERSION'] || '4.0.3'
 LIBTIFF_SOURCE_URI         = URI( "http://download.osgeo.org/libtiff/tiff-#{LIBTIFF_VERSION}.tar.gz" )
 LIBTIFF_TARBALL            = STATIC_SOURCESDIR + File.basename( LIBTIFF_SOURCE_URI.path )
 STATIC_LIBTIFF_BUILDDIR    = STATIC_BUILDDIR + LIBTIFF_TARBALL.basename(".tar.gz")
@@ -69,7 +69,7 @@ LIBTIFF_A                  = STATIC_INSTALLDIR + 'lib' + 'libtiff.a'
 
 
 # Fetch libfox tarball
-LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.45'
+LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.47'
 LIBFOX_SOURCE_URI         = URI( "http://ftp.fox-toolkit.org/pub/fox-#{LIBFOX_VERSION}.tar.gz" )
 LIBFOX_TARBALL            = STATIC_SOURCESDIR + File.basename( LIBFOX_SOURCE_URI.path )
 STATIC_LIBFOX_BUILDDIR    = STATIC_BUILDDIR + LIBFOX_TARBALL.basename(".tar.gz")

data/ext/{fox16 → fox16_c}/FXRuby.cpp

@@ -1484,10 +1484,10 @@ FXFoldingItem* FXRbCallFoldingItemMethod(const FXFoldingList* recv,ID func,FXint
 
 //----------------------------------------------------------------------
 
-FXFileAssoc* FXRbCallFileAssocMethod(const FXFileDict* recv,ID func,const char* pathname){
+FXFileAssoc* FXRbCallFileAssocMethod(const FXFileDict* recv,ID func,const FXchar* pathname){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,1,rb_str_new2(pathname));
+  VALUE result=rb_funcall(obj,func,1,to_ruby(pathname));
   return NIL_P(result) ? 0 : reinterpret_cast<FXFileAssoc*>(DATA_PTR(result));
   }
 
@@ -1996,6 +1996,8 @@ void FXRbDestroyAppSensitiveObjects(){
   FXTRACE((100,"%s:%d: Finished destroying objects that hold references to the FXApp.\n",__FILE__,__LINE__));
   }
 
+int utf8_enc_idx;
+
 //----------------------------------------------------------------------
 
 extern "C" void Init_core(void);
@@ -2023,7 +2025,7 @@ extern "C" void
 #if defined _WIN32
 __declspec(dllexport)
 #endif
-Init_fox16(void) {
+Init_fox16_c(void) {
   Init_core();
   Init_dc();
   Init_frames();
@@ -2051,6 +2053,9 @@ Init_fox16(void) {
   id_begin=rb_intern("begin");
   id_end=rb_intern("end");
   id_exclude_endp=rb_intern("exclude_end?");
+#ifdef HAVE_RUBY_ENCODING_H
+  utf8_enc_idx = rb_enc_find_index("UTF-8");
+#endif
 
   FXRuby_Objects=st_init_numtable();
   appSensitiveObjs=st_init_numtable();

data/ext/{fox16 → fox16_c}/extconf.rb

@@ -149,4 +149,4 @@ do_rake_compiler_setup
 $CFLAGS += " -DRUBY_1_9" if RUBY_VERSION =~ /1\.9\./
 
 # Last step: build the makefile
-create_makefile("fox16")
+create_makefile("fox16_c")

data/ext/{fox16 → fox16_c}/include/FXRbCommon.h

@@ -26,6 +26,10 @@
 
 extern "C" {
 #include "ruby.h"
+
+#ifdef HAVE_RUBY_ENCODING_H
+#include "ruby/encoding.h"
+#endif
 }
 
 /**

data/ext/{fox16 → fox16_c}/include/FXRbDC.h

@@ -329,16 +329,16 @@ inline void klass ## _clipChildren(klass* self,FXbool yes){ \
     FXRbCallVoidMethod(this,rb_intern("drawIconSunken"),icon,dx,dy); \
     } \
   void cls::drawText(FXint x,FXint y,const FXString& string){ \
-    rb_funcall(FXRbGetRubyObj(this,false),rb_intern("drawText"),3,to_ruby(x),to_ruby(y),rb_str_new(string.text(),string.length())); \
+    rb_funcall(FXRbGetRubyObj(this,false),rb_intern("drawText"),3,to_ruby(x),to_ruby(y),to_ruby(string)); \
     } \
   void cls::drawText(FXint x,FXint y,const FXchar* string,FXuint length){ \
-    rb_funcall(FXRbGetRubyObj(this,false),rb_intern("drawText"),3,to_ruby(x),to_ruby(y),rb_str_new(string,length)); \
+    rb_funcall(FXRbGetRubyObj(this,false),rb_intern("drawText"),3,to_ruby(x),to_ruby(y),to_ruby(string,length)); \
     } \
   void cls::drawImageText(FXint x,FXint y,const FXString& string){ \
-    rb_funcall(FXRbGetRubyObj(this,false),rb_intern("drawImageText"),3,to_ruby(x),to_ruby(y),rb_str_new(string.text(),string.length())); \
+    rb_funcall(FXRbGetRubyObj(this,false),rb_intern("drawImageText"),3,to_ruby(x),to_ruby(y),to_ruby(string)); \
     } \
   void cls::drawImageText(FXint x,FXint y,const FXchar* string,FXuint length){ \
-    rb_funcall(FXRbGetRubyObj(this,false),rb_intern("drawImageText"),3,to_ruby(x),to_ruby(y),rb_str_new(string,length)); \
+    rb_funcall(FXRbGetRubyObj(this,false),rb_intern("drawImageText"),3,to_ruby(x),to_ruby(y),to_ruby(string,length)); \
     } \
   void cls::setForeground(FXColor clr){ \
     FXRbCallVoidMethod(this,rb_intern("setForeground"),clr); \