fxruby 1.6.32-x86-mingw32 → 1.6.33-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 538ff48606f437b5c8234710b35f79e8c7cb276f
-  data.tar.gz: df1c1b2dfe623dc85cf2dd9c87f9fca226d76c94
+  metadata.gz: 75ffb1bf31368b4ec60a58c908d8b2944a16c6fc
+  data.tar.gz: c39dc0c3130aec21545875fcf86d7e4e986bdb18
 SHA512:
-  metadata.gz: 552102ea639d51e7829bcb3467c6040dda819fea4473c448f97e39dcec0b0cf003f8db9f7b3b9bd2465d3bed8b7976dc5a896683f9e32c4ba03758b02791d6f0
-  data.tar.gz: e130b4bb2a1005ef17cbb2ebaccf7d3354a0cda66655647c579c294ff9c88172fe99e1a4a145b0b02535ab3e722bce90006e0bce5f100533e83b0729314d01fe
+  metadata.gz: 0b3ab472ca46648a64d74b5099806b568fc0739f14bb3ec37581fef1543f7c44896120b0b02c331e7d35a824ba935016efb425ce800707ee129622bb34b54ea4
+  data.tar.gz: 9ab7eb8aed3589aabe7e340b3faceb4c5b7da01f8f6280fc1a5459bc76c577fa27582a3f8029c85ca85f53b78bbfac766a06029319e70533b339ce1ca25bd391

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.6.33 / 2015-08-20
+
+* Avoid calls that are prohibited while GC phases during GC. Fixes #23
+* Use copy'ing getters for FXVec members in FXMat*, FXMaterial and FXLight.
+  This fixes the TC_FXMaterial#test_bug test case.
+* Fix test suite, so that all tests pass.
+* Add a travis-ci test setup and connect it to the github account.
+
 === 1.6.32 / 2015-08-07
 
 * Avoid call to rb_class2name() during GC. Fixes #21

data/README.rdoc

@@ -1,7 +1,9 @@
 = FXRuby
 
 * http://github.com/larskanis/fxruby
-* API: http://rubydoc.info/gems/fxruby/frames
+* Full API-description: http://rubydoc.info/gems/fxruby/frames
+* Latest fxruby {<img src="https://badge.fury.io/rb/fxruby.svg" alt="Gem Version" />}[http://badge.fury.io/rb/fxruby]
+* Status (on Linux): {<img src="https://travis-ci.org/larskanis/fxruby.svg?branch=1.6" alt="Build Status" />}[https://travis-ci.org/larskanis/fxruby]
 
 == DESCRIPTION:
 
@@ -14,7 +16,7 @@ Ruby programming language that you already know and love, while at the
 same time taking advantage of the performance and functionality of a
 featureful, highly optimized C++ toolkit.
 
-== FEATURES/PROBLEMS:
+== FEATURES:
 
 FXRuby supportes everything of FOX, that is useful in Ruby:
 * MDI/SDI application window layouts, floating toolbars
@@ -22,14 +24,15 @@ FXRuby supportes everything of FOX, that is useful in Ruby:
 * Flexible layout management
 * Image read/write support in many formats
 * Embedded OpenGL graphics
+* Thread support
 
 == INSTALL:
 
-FXRuby runs on Linux, Windows and OS-X. Installation on *nix requires
+FXRuby runs on Linux, Windows and OS-X with Ruby-1.9.3 or newer and with Rubinius. 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}
-* no preparation needed on Windows - the binary gem can be used
+* on Windows: the binary fxruby gems already contain all required libararies
 
 Then, install the gem:
 * gem install fxruby

data/Rakefile

@@ -21,6 +21,9 @@ end
 # Some constants we'll need
 PKG_VERSION = Fox.fxrubyversion
 
+LIBFXSCINTILLA_VERSION            = ENV['LIBFXSCINTILLA_VERSION'] || '2.28.0'
+LIBFXSCINTILLA_SOURCE_URI         = "http://download.savannah.gnu.org/releases/fxscintilla/fxscintilla-#{LIBFXSCINTILLA_VERSION}.tar.gz"
+
 SWIG = (RUBY_PLATFORM =~ /mingw/) ? "swig.exe" : "swig"
 SWIGFLAGS = "-c++ -ruby -nodefaultdtor -nodefaultctor -w302 -features compactdefaultargs -I../fox-includes"
 SWIG_MODULES = {
@@ -99,6 +102,8 @@ task :test => [:compile]
 Rake::ExtensionTask.new("fox16_c", hoe.spec) do |ext|
   ext.cross_compile = true
   ext.cross_platform = ['x86-mingw32', 'x64-mingw32']
+  # Enable FXTRACE and FXASSERT for 'rake compile'
+  ext.config_options << "--enable-debug"
 
   ext.cross_config_options += [
       "--enable-win32-cross",
@@ -253,6 +258,12 @@ namespace :fxruby do
   file "ext/fox16_c/extconf.rb" => ['ext/fox16_c/swigruby.h', 'ext/fox16_c/impl.cpp', 'ext/fox16_c/include/inlinestubs.h'] +
       SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16_c", cppfile) }
 
+
+  directory "ports/archives"
+  file "ports/archives/fxscintilla-2.28.0.tar.gz" => ["ports/archives"] do |t|
+    sh "wget #{LIBFXSCINTILLA_SOURCE_URI} -O #{t.name}"
+  end
+
   directory "tmp/fxscintilla"
   task "tmp/fxscintilla/fxscintilla-2.28.0/include/Scintilla.iface" => ["tmp/fxscintilla", "ports/archives/fxscintilla-2.28.0.tar.gz"] do
     chdir "tmp/fxscintilla" do

data/examples/WhatAQuietStiff.rb

@@ -134,7 +134,7 @@ class WhatAQuietWindow < FXMainWindow
     saveDialog = FXFileDialog.new(self, "Save Image")
     saveDialog.filename = @itemList.getItemText(@itemList.currentItem)
     if saveDialog.execute != 0
-      if File.exists? saveDialog.filename
+      if File.exist? saveDialog.filename
         if MBOX_CLICKED_NO == FXMessageBox.question(self, MBOX_YES_NO,
           "Overwrite Image", "Overwrite existing image?")
           return 1

data/examples/imageviewer.rb

@@ -326,7 +326,7 @@ class ImageWindow < FXMainWindow
   def onCmdSave(sender, sel, ptr)
     saveDialog = FXFileDialog.new(self, "Save Image")
     if saveDialog.execute != 0
-      if File.exists? saveDialog.filename
+      if File.exist? saveDialog.filename
         if MBOX_CLICKED_NO == FXMessageBox.question(self, MBOX_YES_NO,
           "Overwrite Image", "Overwrite existing image?")
           return 1

data/examples/textedit/textedit.rb

@@ -1025,7 +1025,7 @@ class TextWindow < FXMainWindow
           return false if (savedialog.execute == 0)
           setCurrentPattern(savedialog.currentPattern)
           file = savedialog.filename
-          if File.exists?(file)
+          if File.exist?(file)
             if MBOX_CLICKED_NO == FXMessageBox.question(self, MBOX_YES_NO,
               "Overwrite Document", "Overwrite existing document: #{file}?")
               return false
@@ -1092,7 +1092,7 @@ class TextWindow < FXMainWindow
     if savedialog.execute != 0
       setCurrentPattern(savedialog.currentPattern)
       file = savedialog.filename
-      if File.exists?(file)
+      if File.exist?(file)
         if MBOX_CLICKED_NO == FXMessageBox.question(self, MBOX_YES_NO,
           "Overwrite Document", "Overwrite existing document: #{file}?")
           return 1
@@ -1134,24 +1134,24 @@ class TextWindow < FXMainWindow
       # Attempt to extract the file name from various forms
       if    string =~ /#include \".*\"/
         file = File.expand_path(name, dir)
-        if !File.exists?(file)
+        if !File.exist?(file)
           Find.find(@searchpath) { |f| file = f if (f == name) }
         end
       elsif string =~ /#include <.*>/
         file = File.expand_path(name, dir)
-        if !File.exists?(file)
+        if !File.exist?(file)
           Find.find(@searchpath) { |f| file = f if (f == name) }
         end
       elsif string =~ /.*:.*:.*/
         file = File.expand_path(name, dir)
-        if !File.exists?(file)
+        if !File.exist?(file)
           Find.find(@searchpath) { |f| file = f if (f == name) }
         end
       else
         file = File.expand_path(string, dir)
       end
 
-      if File.exists?(file)
+      if File.exist?(file)
         # Different from current file?
         if file != @filename
           # Save old file first
@@ -1213,7 +1213,7 @@ class TextWindow < FXMainWindow
     if savedialog.execute != 0
       setCurrentPattern(savedialog.currentPattern)
       file = savedialog.filename
-      if File.exists?(file)
+      if File.exist?(file)
         if MBOX_CLICKED_NO == FXMessageBox.question(self, MBOX_YES_NO,
           "Overwrite Document", "Overwrite existing document: #{file}?")
           return 1
@@ -1690,7 +1690,7 @@ class TextWindow < FXMainWindow
 
   # Update box for readonly display
   def onCheckFile(sender, sel, ptr)
-    mtime = File.exists?(@filename) ? File.mtime(@filename) : nil
+    mtime = File.exist?(@filename) ? File.mtime(@filename) : nil
     if @filetime && mtime && mtime != @filetime
       @filetime = mtime
       if MBOX_CLICKED_OK == FXMessageBox.warning(self, MBOX_OK_CANCEL,

data/ext/fox16_c/FXRuby.cpp

@@ -85,12 +85,19 @@ static st_table * FXRuby_Objects;
 
 static const char * const safe_rb_obj_classname(VALUE obj)
 {
-  if( rb_during_gc() ){
+  int tdata = TYPE(obj)==T_DATA;
+  if( (tdata && FXRbIsInGC(DATA_PTR(obj)))
+#ifdef HAVE_RB_DURING_GC
+      || rb_during_gc()
+#endif
+  ){
     /* It's not safe to call rb_obj_classname() during GC.
      * Return dummy value in this case. */
     return "during GC";
-  } else {
+  } else if (tdata) {
     return rb_obj_classname(obj);
+  } else {
+    return "no T_DATA";
   }
 }
 
@@ -161,6 +168,31 @@ bool FXRbIsBorrowed(void* ptr){
     }
   }
 
+bool FXRbSetInGC(const void* ptr, bool enabled){
+  FXASSERT(ptr!=0);
+  FXRubyObjDesc *desc;
+  if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t *>(&desc))!=0){
+    desc->in_gc=enabled;
+    return enabled;
+    }
+  return false;
+  }
+
+bool FXRbIsInGC(const void* ptr){
+  FXASSERT(ptr!=0);
+  FXRubyObjDesc *desc;
+
+#ifdef HAVE_RB_DURING_GC
+  if( rb_during_gc() ){
+    return true;
+  }
+#endif
+  if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t *>(&desc))!=0){
+    return desc->in_gc;
+  }
+  return false;
+}
+
 
 /**
  * FXRbConvertPtr() is just a wrapper around SWIG_ConvertPtr().
@@ -343,12 +375,13 @@ 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 alsoBorrowed){
+VALUE FXRbGetRubyObj(const void *foxObj,bool alsoBorrowed, bool in_gc){
   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(alsoBorrowed || !desc->borrowed){
-      FXTRACE((2,"FXRbGetRubyObj(foxObj=%p) => rubyObj=%p (%s)\n",foxObj,(void *)desc->obj,safe_rb_obj_classname(desc->obj)));
+      const char *classname = in_gc ? "in GC" : safe_rb_obj_classname(desc->obj);
+      FXTRACE((2,"FXRbGetRubyObj(foxObj=%p) => rubyObj=%p (%s)\n", foxObj, (void *)desc->obj, classname));
       return desc->obj;
       }
     }
@@ -362,23 +395,21 @@ VALUE FXRbGetRubyObj(const void *foxObj,bool alsoBorrowed){
 VALUE FXRbGetRubyObj(const void *foxObj,swig_type_info* ty){
   if(foxObj!=0){
     VALUE rbObj=FXRbGetRubyObj(foxObj,true);
-    return NIL_P(rbObj) ? FXRbNewPointerObj(const_cast<void*>(foxObj),ty) : rbObj;
+    if( NIL_P(rbObj) ){
+      return FXRbNewPointerObj(const_cast<void*>(foxObj),ty);
+    }else{
+      // The requested type should match the registered class.
+      FXASSERT(SWIG_CheckConvert(rbObj, ty));
+      return rbObj;
     }
-  else{
+  }else{
     return Qnil;
-    }
   }
+}
 
 VALUE FXRbGetRubyObj(const void *foxObj,const char *type){
-  if(foxObj!=0){
-    FXASSERT(type!=0);
-    VALUE rbObj=FXRbGetRubyObj(foxObj,true);
-    return NIL_P(rbObj) ? FXRbNewPointerObj(const_cast<void*>(foxObj),FXRbTypeQuery(type)) : rbObj;
-    }
-  else{
-    return Qnil;
-    }
-  }
+  return FXRbGetRubyObj(foxObj, FXRbTypeQuery(type));
+}
 
 /**
  * Look up the Ruby instance associated with this C++ object, if any, and mark
@@ -402,7 +433,7 @@ void FXRbGcMark(void *obj){
      * example program works if you invoke the GC in ShutterWindow#create;
      * make sure that the shutter items' contents don't get blown away!
      */
-    VALUE value=FXRbGetRubyObj(obj,true);
+    VALUE value=FXRbGetRubyObj(obj,true, true);
     if(!NIL_P(value)){
       rb_gc_mark(value);
       }
@@ -1427,6 +1458,7 @@ void FXRbRange2LoHi(VALUE range,FXdouble& lo,FXdouble& hi){
 void FXRbCallVoidMethod_gvlcb(FXObject* recv, const char *func) {
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
+  FXASSERT(!FXRbIsInGC(recv));
   rb_funcall(obj,rb_intern(func),0,NULL);
   }
 
@@ -1633,7 +1665,7 @@ void FXRbCallDCDrawMethod_gvlcb(FXDC* recv, const char * func, FXint x,FXint y,c
 FXRbMenuCommand::~FXRbMenuCommand(){
   FXAccelTable *table;
   FXWindow *owner;
-  if(acckey && !rb_during_gc()){
+  if(acckey && !FXRbIsInGC(this)){
     owner=getShell()->getOwner();
     if(owner){
       table=owner->getAccelTable();
@@ -1649,7 +1681,7 @@ FXRbMenuCommand::~FXRbMenuCommand(){
 FXRbMenuCheck::~FXRbMenuCheck(){
   FXAccelTable *table;
   FXWindow *owner;
-  if(acckey && !rb_during_gc()){
+  if(acckey && !FXRbIsInGC(this)){
     owner=getShell()->getOwner();
     if(owner){
       table=owner->getAccelTable();
@@ -1665,7 +1697,7 @@ FXRbMenuCheck::~FXRbMenuCheck(){
 FXRbMenuRadio::~FXRbMenuRadio(){
   FXAccelTable *table;
   FXWindow *owner;
-  if(acckey && !rb_during_gc()){
+  if(acckey && !FXRbIsInGC(this)){
     owner=getShell()->getOwner();
     if(owner){
       table=owner->getAccelTable();

data/ext/fox16_c/extconf.rb

@@ -318,6 +318,7 @@ def do_rake_compiler_setup
       have_func('rb_thread_call_without_gvl') &&
       have_func('rb_thread_call_with_gvl')
 
+  have_func('rb_during_gc')
 end
 
 # This directive processes the "--with-fox-include" and "--with-fox-lib"

data/ext/fox16_c/include/FXRbWindow.h

@@ -149,7 +149,7 @@ inline void klass ## _dropDisable(klass* self){ \
     FXRbCallVoidMethod(this,"killFocus"); \
     } \
   void cls::changeFocus(FXWindow* child){ \
-    if(!rb_during_gc()) FXRbCallVoidMethod(this,"changeFocus",child); \
+    if(!FXRbIsInGC(this)) FXRbCallVoidMethod(this,"changeFocus",child); \
     } \
   void cls::setDefault(FXbool enable){ \
     FXRbCallVoidMethod(this,"setDefault",enable); \
@@ -173,7 +173,7 @@ inline void klass ## _dropDisable(klass* self){ \
     FXRbCallVoidMethod(this,"position",x,y,w,h); \
     } \
   void cls::recalc(){ \
-    if(!rb_during_gc()) FXRbCallVoidMethod(this,"recalc"); \
+    if(!FXRbIsInGC(this)) FXRbCallVoidMethod(this,"recalc"); \
     } \
   void cls::reparent(FXWindow* father,FXWindow* other){ \
     FXRbCallVoidMethod(this,"reparent",father,other); \

data/ext/fox16_c/include/FXRuby.h

@@ -81,6 +81,8 @@ VALUE showHelper(VALUE self, int argc, VALUE *argv, TYPE *p, swig_type_info *typ
 // Wrapper around SWIG_Ruby_NewPointerObj()
 VALUE FXRbNewPointerObj(void *ptr, swig_type_info *typeinfo);
 bool FXRbIsBorrowed(void* ptr);
+bool FXRbSetInGC(const void* ptr, bool enabled);
+bool FXRbIsInGC(const void* ptr);
 
 // Wrapper around SWIG_TypeQuery()
 swig_type_info *FXRbTypeQuery(const char *name);
@@ -124,7 +126,7 @@ void FXRbDestroyAppSensitiveObjects();
  * FOX object (if any). If searchBoth is false, only considers the
  * Ruby-owned objects; otherwise considers all outstanding references.
  */
-VALUE FXRbGetRubyObj(const void *foxObj, bool searchBoth);
+VALUE FXRbGetRubyObj(const void *foxObj, bool searchBoth, bool in_gc=false);
 
 /**
  * Return the registered Ruby class instance associated with this
@@ -367,6 +369,7 @@ template<class TYPE>
 void FXRbCallVoidMethod_gvlcb(FXObject* recv,const char *func, TYPE& arg){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
+  FXASSERT(!FXRbIsInGC(recv));
   rb_funcall(obj,rb_intern(func),1,to_ruby(arg));
   FXRbUnregisterBorrowedRubyObj(&arg);
   }
@@ -383,6 +386,7 @@ template<class TYPE>
 void FXRbCallVoidMethod_gvlcb(const FXObject* recv, const char *func, TYPE& arg){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
+  FXASSERT(!FXRbIsInGC(recv));
   rb_funcall(obj,rb_intern(func),1,to_ruby(arg));
   FXRbUnregisterBorrowedRubyObj(&arg);
   }

data/ext/fox16_c/markfuncs.cpp

@@ -53,6 +53,19 @@ void FXRbObject::markfunc(FXObject* obj){
   FXTRACE((100,"%s::markfunc(%p)\n",obj?obj->getClassName():"FXRbObject",obj));
   }
 
+static void FXRbSetInGCParentsRecursive(FXWindow *window, bool enabled){
+  FXRbSetInGC( window, true );
+  if(window->getParent()) FXRbSetInGCParentsRecursive( window->getParent(), enabled );
+  }
+
+static void FXRbSetInGCChildrenRecursive(FXWindow *window, bool enabled){
+  FXRbSetInGC( window, true );
+  for(FXWindow* child=window->getFirst(); child; child=child->getNext()){
+    FXRbSetInGCChildrenRecursive( child, enabled );
+    }
+  }
+
+
 void FXRbObject::freefunc(FXObject* self){
   if(self!=0){
     // Unregister, but don't destroy, borrowed references
@@ -65,6 +78,17 @@ void FXRbObject::freefunc(FXObject* self){
     FXASSERT(classname!=0);
     FXASSERT(strlen(classname)>3);
     if(classname[0]=='F' && classname[1]=='X' && classname[2]=='R' && classname[3]=='b'){
+      // FXWindow destructor calls recalc() and changeFocus() of it's parent window.
+      // Since these methods are routed back to Ruby code, but calling Ruby code from
+      // GC isn't a good idea, we mark the parent window as "in_gc", so that it will
+      // ignore recalc() and changeFocus() calls completely.
+      // The parent window should also be scheduled to be free'd. In the other case,
+      // the child window would have been marked as used.
+      if(self->isMemberOf(FXMETACLASS(FXWindow))){
+        FXWindow *window = dynamic_cast<FXWindow*>(self);
+        FXRbSetInGCParentsRecursive( window, true );
+        FXRbSetInGCChildrenRecursive( window, true );
+        }
       delete self;
       }
     else{

data/lib/fox16/core.rb

@@ -625,14 +625,6 @@ module Fox
     end
   end
 
-  class FXHVec
-    def normalize!
-      normalized = self.normalize
-      0.upto(3) { |idx| self[idx] = normalized[idx] }
-      self
-    end
-  end
-
   class FXTable
     #
     # Append _numColumns_ columns to the right of the table..

data/lib/fox16/thread.rb

@@ -13,7 +13,7 @@ module Fox
 
     def runOnUiThread(&block)
       @event_handler_events << block
-      @event_handler_pwr.write 'e' if @event_handler_pwr
+      @event_handler_pwr.write 'e'
     end
 
     private
@@ -34,7 +34,7 @@ module Fox
     end
 
     def event_handler_pull(prd)
-      prd.read(1) if prd
+      prd.read(1)
       while !@event_handler_events.empty?
         ev = @event_handler_events.shift
         ev.call

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.32"
+    "1.6.33"
   end
 end

data/swig-interfaces/FXVec2d.i

@@ -20,6 +20,7 @@
  * at "lyle@lylejohnson.name".
  ***********************************************************************/
 
+%naturalvar FXVec2d;
 /// Double-precision 2-element vector
 class FXVec2d {
 public:

data/swig-interfaces/FXVec2f.i

@@ -20,6 +20,7 @@
  * at "lyle@lylejohnson.name".
  ***********************************************************************/
 
+%naturalvar FXVec2f;
 /// Single-precision 2-element vector
 class FXVec2f {
 public:

data/swig-interfaces/FXVec3d.i

@@ -20,6 +20,7 @@
  * at "lyle@lylejohnson.name".
  ***********************************************************************/
 
+%naturalvar FXVec3d;
 /// Double-precision 3-element vector
 class FXVec3d {
 public:

data/swig-interfaces/FXVec3f.i

@@ -20,6 +20,7 @@
  * at "lyle@lylejohnson.name".
  ***********************************************************************/
 
+%naturalvar FXVec3f;
 /// Single-precision 3-element vector
 class FXVec3f {
 public:

data/swig-interfaces/FXVec4d.i

@@ -21,6 +21,7 @@
  ***********************************************************************/
 
 %rename("crosses?") FXVec4d::crosses(const FXVec3d& a,const FXVec3d& b) const;
+%naturalvar FXVec4d;
 
 /// Double-precision 4-element vector
 class FXVec4d {

data/swig-interfaces/FXVec4f.i

@@ -21,6 +21,7 @@
  ***********************************************************************/
 
 %rename("crosses?") FXVec4f::crosses(const FXVec3f& a,const FXVec3f& b) const;
+%naturalvar FXVec4f;
 
 /// Single-precision 4-element vector
 class FXVec4f {

data/swig-interfaces/ruby-typemaps.i

@@ -493,13 +493,27 @@ inline void* to_FXEvent(VALUE obj){
 %typemap(out) FXVec2f* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
 %typemap(out) FXVec2f& "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
 
+/* Output typemap for FXVec3f instances */
+%typemap(out) FXVec3f {
+    FXVec3f* resultptr = new FXVec3f($1);
+    $result = FXRbGetRubyObj(resultptr, "FXVec3f *");
+}
+%typemap(out) FXVec3f*       "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
+%typemap(out) const FXVec3f& {
+    FXVec3f* resultptr = new FXVec3f(*$1);
+    $result = FXRbGetRubyObj(resultptr, "FXVec3f *");
+}
+
 /* Output typemap for FXVec4f instances */
 %typemap(out) FXVec4f {
     FXVec4f* resultptr = new FXVec4f($1);
     $result = FXRbGetRubyObj(resultptr, "FXVec4f *");
 }
 %typemap(out) FXVec4f* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
-%typemap(out) FXVec4f& "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
+%typemap(out) const FXVec4f& {
+    FXVec4f* resultptr = new FXVec4f(*$1);
+    $result = FXRbGetRubyObj(resultptr, "FXVec4f *");
+}
 
 /* Output typemap for FXIcon instances */
 %typemap(out) FXIcon * = FXObject *;
@@ -610,14 +624,6 @@ inline void* to_FXEvent(VALUE obj){
 /* Output typemap for FXTreeItem instances */
 %typemap(out) FXTreeItem * = FXObject *;
 
-/* Output typemap for FXVec3f instances */
-%typemap(out) FXVec3f {
-    FXVec3f* resultptr = new FXVec3f($1);
-    $result = FXRbGetRubyObj(resultptr, "FXVec3f *");
-}
-%typemap(out) FXVec3f*       "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
-%typemap(out) const FXVec3f& "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
-
 /* Output typemap for FXVerticalFrame instances */
 %typemap(out) FXVerticalFrame * = FXObject *;
 

data/test/TC_FXApp.rb

@@ -8,7 +8,7 @@ class TC_FXApp < Test::Unit::TestCase
 
   def test_exception_for_second_app
     assert_raise RuntimeError do
-      app2 = FXApp.new
+      FXApp.new
     end
   end
 end
@@ -46,7 +46,7 @@ class TC_FXApp2 < Fox::TestCase
   end
 
   def test_addInput_on_pipe
-    check_events *IO.pipe
+    check_events(*IO.pipe)
   end
 
   def test_addInput_on_socket_accept

data/test/TC_FXCheckButton.rb

@@ -12,7 +12,6 @@ class TC_FXCheckButton < Fox::TestCase
 
   def test_setCheck_TRUE
     @checkButton.check = Fox::TRUE
-    assert_equal(true, @checkButton.check)
     assert_equal(Fox::TRUE, @checkButton.checkState)
     assert(@checkButton.checked?)
     assert(!@checkButton.unchecked?)
@@ -21,7 +20,6 @@ class TC_FXCheckButton < Fox::TestCase
 
   def test_setCheck_FALSE
     @checkButton.check = Fox::FALSE
-    assert_equal(false, @checkButton.check)
     assert_equal(Fox::FALSE, @checkButton.checkState)
     assert(!@checkButton.checked?)
     assert(@checkButton.unchecked?)
@@ -30,7 +28,6 @@ class TC_FXCheckButton < Fox::TestCase
 
   def test_setCheck_MAYBE
     @checkButton.check = Fox::MAYBE
-    assert_equal(true, @checkButton.check) # this is not a typo!
     assert_equal(Fox::MAYBE, @checkButton.checkState)
     assert(!@checkButton.checked?)
     assert(!@checkButton.unchecked?)
@@ -39,7 +36,6 @@ class TC_FXCheckButton < Fox::TestCase
 
   def test_setCheck_true
     @checkButton.check = true
-    assert_equal(true, @checkButton.check)
     assert_equal(Fox::TRUE, @checkButton.checkState)
     assert(@checkButton.checked?)
     assert(!@checkButton.unchecked?)
@@ -48,7 +44,6 @@ class TC_FXCheckButton < Fox::TestCase
 
   def test_setCheck_false
     @checkButton.check = false
-    assert_equal(false, @checkButton.check)
     assert_equal(Fox::FALSE, @checkButton.checkState)
     assert(!@checkButton.checked?)
     assert(@checkButton.unchecked?)

data/test/TC_FXDCPrint.rb

@@ -95,7 +95,7 @@ public
   end
 
   def teardown
-    if File.exists?("output.ps")
+    if File.exist?("output.ps")
       FileUtils.rm_f("output.ps")
     end
   end

data/test/TC_FXFileStream.rb

@@ -82,7 +82,7 @@ class TC_FXFileStream < Test::Unit::TestCase
   end
 
   def teardown
-    if File.exists?("goobers")
+    if File.exist?("goobers")
       FileUtils.rm_f("goobers")
     end
   end

data/test/TC_FXFont.rb

@@ -15,7 +15,7 @@ class TC_FXFont < Test::Unit::TestCase
 
   def testConstructFromFontDescription
     fontdesc = @app.normalFont.fontDesc
-    font = FXFont.new(@app, fontdesc)
+    FXFont.new(@app, fontdesc)
   end
 
   def testConstructFromParameters
@@ -42,7 +42,7 @@ class TC_FXFont < Test::Unit::TestCase
   end
 
   def testConstructFromFontString
-    font = FXFont.new(@app, "")
+    FXFont.new(@app, "")
   end
 
   def testGetTextWidthAndHeight

data/test/TC_FXId.rb

@@ -11,7 +11,7 @@ class TC_FXId < Fox::TestCase
 
   def test_created?
     assert !mainWindow.created?
-    app.create
+    mainWindow.create
     assert mainWindow.created?, "main window should be created after call to FXApp#create"
     mainWindow.destroy
     assert !mainWindow.created?

data/test/TC_FXImage.rb

@@ -119,7 +119,7 @@ class TC_FXImage < Fox::TestCase
   def test_create_with_non_owned_data
     GC.stress = true
     img = image_with_non_owned_data
-    " " * 10000
+    _ = " " * 10000
     GC.stress = false
     assert_equal("rgbaRGBA", img.pixel_string)
     assert_equal(0, img.options)
@@ -134,7 +134,7 @@ class TC_FXImage < Fox::TestCase
     img = FXImage.new(app, nil, 0, 1, 2)
     GC.stress = true
     set_non_owned_data(img)
-    " " * 10000
+    _ = " " * 10000
     GC.stress = false
     assert_equal("rgbaRGBA", img.pixel_string)
     assert_equal(0, img.options)

data/test/TC_FXMainWindow.rb

@@ -11,6 +11,7 @@ class TC_FXMainWindow < Test::Unit::TestCase
   end
 
   def test_non_created_app_raises_runtime_error
+    pend "two FXApp are not allowed"
     app = FXApp.new
     assert_raise RuntimeError do
       FXMainWindow.new(app, "title").create

data/test/TC_FXMat4f.rb

@@ -81,9 +81,9 @@ class TC_FXMat4f < Test::Unit::TestCase
   def test_mul_by_scalar
     p = FXMat4f.new.eye
     q = FXMat4f.new(4.0, 0.0, 0.0, 0.0,
-                   0.0, 4.0, 0.0, 0.0,
-		   0.0, 0.0, 4.0, 0.0,
-		   0.0, 0.0, 0.0, 4.0)
+                    0.0, 4.0, 0.0, 0.0,
+                    0.0, 0.0, 4.0, 0.0,
+                    0.0, 0.0, 0.0, 4.0)
     r = p*4.0
     assert_instance_of(FXMat4f, r)
 #   assert_equal(q, r)

data/test/TC_FXMaterial.rb

@@ -48,7 +48,7 @@ class TC_FXMaterial < Test::Unit::TestCase
     assert_in_delta(0.7, @mat.emission[2], DELTA)
     assert_in_delta(0.8, @mat.emission[3], DELTA)
 
-    @mat.emission = FXHVec.new(0.5, 0.6, 0.7, 0.8)
+    @mat.emission = FXVec4f.new(0.5, 0.6, 0.7, 0.8)
     assert_in_delta(0.5, @mat.emission[0], DELTA)
     assert_in_delta(0.6, @mat.emission[1], DELTA)
     assert_in_delta(0.7, @mat.emission[2], DELTA)

data/test/TC_FXMenuCheck.rb

@@ -12,7 +12,6 @@ class TC_FXMenuCheck < Fox::TestCase
 
   def test_setCheck_TRUE
     @menuCheck.check = Fox::TRUE
-    assert_equal(true, @menuCheck.check)
     assert_equal(Fox::TRUE, @menuCheck.checkState)
     assert(@menuCheck.checked?)
     assert(!@menuCheck.unchecked?)
@@ -21,7 +20,6 @@ class TC_FXMenuCheck < Fox::TestCase
 
   def test_setCheck_FALSE
     @menuCheck.check = Fox::FALSE
-    assert_equal(false, @menuCheck.check)
     assert_equal(Fox::FALSE, @menuCheck.checkState)
     assert(!@menuCheck.checked?)
     assert(@menuCheck.unchecked?)
@@ -30,7 +28,6 @@ class TC_FXMenuCheck < Fox::TestCase
 
   def test_setCheck_MAYBE
     @menuCheck.check = Fox::MAYBE
-    assert_equal(true, @menuCheck.check) # this is not a typo!
     assert_equal(Fox::MAYBE, @menuCheck.checkState)
     assert(!@menuCheck.checked?)
     assert(!@menuCheck.unchecked?)
@@ -39,7 +36,6 @@ class TC_FXMenuCheck < Fox::TestCase
 
   def test_setCheck_true
     @menuCheck.check = true
-    assert_equal(true, @menuCheck.check)
     assert_equal(Fox::TRUE, @menuCheck.checkState)
     assert(@menuCheck.checked?)
     assert(!@menuCheck.unchecked?)
@@ -48,7 +44,6 @@ class TC_FXMenuCheck < Fox::TestCase
 
   def test_setCheck_false
     @menuCheck.check = false
-    assert_equal(false, @menuCheck.check)
     assert_equal(Fox::FALSE, @menuCheck.checkState)
     assert(!@menuCheck.checked?)
     assert(@menuCheck.unchecked?)

data/test/TC_FXMenuRadio.rb

@@ -12,7 +12,6 @@ class TC_FXMenuRadio < Fox::TestCase
 
   def test_setCheck_TRUE
     @menuRadio.check = Fox::TRUE
-    assert_equal(true, @menuRadio.check)
     assert_equal(Fox::TRUE, @menuRadio.checkState)
     assert(@menuRadio.checked?)
     assert(!@menuRadio.unchecked?)
@@ -21,7 +20,6 @@ class TC_FXMenuRadio < Fox::TestCase
 
   def test_setCheck_FALSE
     @menuRadio.check = Fox::FALSE
-    assert_equal(false, @menuRadio.check)
     assert_equal(Fox::FALSE, @menuRadio.checkState)
     assert(!@menuRadio.checked?)
     assert(@menuRadio.unchecked?)
@@ -30,7 +28,6 @@ class TC_FXMenuRadio < Fox::TestCase
 
   def test_setCheck_MAYBE
     @menuRadio.check = Fox::MAYBE
-    assert_equal(true, @menuRadio.check) # this is not a typo!
     assert_equal(Fox::MAYBE, @menuRadio.checkState)
     assert(!@menuRadio.checked?)
     assert(!@menuRadio.unchecked?)
@@ -39,7 +36,6 @@ class TC_FXMenuRadio < Fox::TestCase
 
   def test_setCheck_true
     @menuRadio.check = true
-    assert_equal(true, @menuRadio.check)
     assert_equal(Fox::TRUE, @menuRadio.checkState)
     assert(@menuRadio.checked?)
     assert(!@menuRadio.unchecked?)
@@ -48,7 +44,6 @@ class TC_FXMenuRadio < Fox::TestCase
 
   def test_setCheck_false
     @menuRadio.check = false
-    assert_equal(false, @menuRadio.check)
     assert_equal(Fox::FALSE, @menuRadio.checkState)
     assert(!@menuRadio.checked?)
     assert(@menuRadio.unchecked?)

data/test/TC_FXQuatf.rb

@@ -9,23 +9,23 @@ class TC_FXQuatf < Test::Unit::TestCase
   end
 
   def test_default_constructor
-    q = FXQuatf.new
+    FXQuatf.new
   end
 
   def test_construct_from_axis_and_angle
     axis = FXVec3f.new(1.0, 1.0, 1.0)
-    q = FXQuatf.new(axis)
-    q = FXQuatf.new(axis, 0.0)
+    FXQuatf.new(axis)
+    FXQuatf.new(axis, 0.0)
   end
 
   def test_construct_from_components
     x, y, z, w = 1.0, 1.0, 1.0, 1.0
-    q = FXQuatf.new(x, y, z, w)
+    FXQuatf.new(x, y, z, w)
   end
 
   def test_construct_from_roll_pitch_yaw
     roll, pitch, yaw = 45.0, 45.0, 45.0
-    q = FXQuatf.new(roll, pitch, yaw)
+    FXQuatf.new(roll, pitch, yaw)
   end
 
   def test_adjust!

data/test/TC_FXRadioButton.rb

@@ -12,7 +12,6 @@ class TC_FXRadioButton < Fox::TestCase
 
   def test_setCheck_TRUE
     @radioButton.check = Fox::TRUE
-    assert_equal(true, @radioButton.check)
     assert_equal(Fox::TRUE, @radioButton.checkState)
     assert(@radioButton.checked?)
     assert(!@radioButton.unchecked?)
@@ -21,7 +20,6 @@ class TC_FXRadioButton < Fox::TestCase
 
   def test_setCheck_FALSE
     @radioButton.check = Fox::FALSE
-    assert_equal(false, @radioButton.check)
     assert_equal(Fox::FALSE, @radioButton.checkState)
     assert(!@radioButton.checked?)
     assert(@radioButton.unchecked?)
@@ -30,7 +28,6 @@ class TC_FXRadioButton < Fox::TestCase
 
   def test_setCheck_MAYBE
     @radioButton.check = Fox::MAYBE
-    assert_equal(true, @radioButton.check) # this is not a typo!
     assert_equal(Fox::MAYBE, @radioButton.checkState)
     assert(!@radioButton.checked?)
     assert(!@radioButton.unchecked?)
@@ -39,7 +36,6 @@ class TC_FXRadioButton < Fox::TestCase
 
   def test_setCheck_true
     @radioButton.check = true
-    assert_equal(true, @radioButton.check)
     assert_equal(Fox::TRUE, @radioButton.checkState)
     assert(@radioButton.checked?)
     assert(!@radioButton.unchecked?)
@@ -48,7 +44,6 @@ class TC_FXRadioButton < Fox::TestCase
 
   def test_setCheck_false
     @radioButton.check = false
-    assert_equal(false, @radioButton.check)
     assert_equal(Fox::FALSE, @radioButton.checkState)
     assert(!@radioButton.checked?)
     assert(@radioButton.unchecked?)

data/test/TC_FXRegion.rb

@@ -17,9 +17,9 @@ class TC_FXRegion < Test::Unit::TestCase
                FXPoint.new(100, 100),
                FXPoint.new(0, 0)
              ]
-    r1 = FXRegion.new(points, true)
-    r2 = FXRegion.new(points, false)
-    r3 = FXRegion.new(points)
+    FXRegion.new(points, true)
+    FXRegion.new(points, false)
+    FXRegion.new(points)
   end
 
   def test_copy_constructor

data/test/TC_FXShell.rb

@@ -22,6 +22,7 @@ class TC_FXShell < Test::Unit::TestCase
   def test_new
     # Free-floating
     shell1 = FXShell.new(@app, 0, 0, 0, 0, 0)
+    assert_nil(shell1.owner)
 
     # Owned
     shell2 = FXShell.new(@mainWin, 0, 0, 0, 0, 0)

data/test/TC_FXTable.rb

@@ -76,7 +76,7 @@ private
     clearEdges(extending)
 
     old_nr = @table.numRows
-    old_nc = @table.numColumns
+    _old_nc = @table.numColumns
 
     # resize the table
     nr = @data_lines.size + 2

data/test/TC_FXVec4f.rb

@@ -39,7 +39,7 @@ class TC_FXVec4f < Test::Unit::TestCase
   end
 
   def test_new5
-    c = FXVec4f.new(FXRGB(128, 128, 128))
+    FXVec4f.new(FXRGB(128, 128, 128))
   end
 
   def test_getitem

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fxruby
 version: !ruby/object:Gem::Version
-  version: 1.6.32
+  version: 1.6.33
 platform: x86-mingw32
 authors:
 - Lyle Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile