fxruby 1.6.39-x86-mingw32 → 1.6.40-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 43c48748541dd8d196c6e4cfa3aa8ae80f740ab7
-  data.tar.gz: 946e3fd274d01c0925cf7929c65bac770eb29c86
+SHA256:
+  metadata.gz: 575b5dcabc7bee35d19ec1731e40dbc3c7cce8bc4f9ae9d51591174dbe0b152d
+  data.tar.gz: 5084118956a37b08a3d69aab3aeab9cad15bcccd7011daa57155f01aab1144e1
 SHA512:
-  metadata.gz: 6e660f3a543172e3b958904057b6a1ac0f07f1371d8cc424f4ab119e7c2fc0c84cf3992be69d41481efeb2aea9d0b532b5f18a644a29da2bc9df9dd10a1a4fed
-  data.tar.gz: a21f2b4e68d16469d5d39858f3ccf6025f54efde3c1ed02ec7cbb36f71072ca63dd5591d3a7248caf5122f110e462966ec7d1e1103039ca5f7f80ac8e30d7c69
+  metadata.gz: 6aadbc1f3f2af32f54af88329c516c09cecb4abc26836d22b4111c6781df73e5fc17fdbe202acda8a0dc635c265cbe1f773a8c7da54fbd655dc81c96edb4fe22
+  data.tar.gz: 891b669a04a587bd5908f58f0f197ebf96e4efb3cedfa63b3475458968b8247ca4557f1f700b41bea3f4df5957876e2d329e928e602a6ab05a5c7007f5a57ee2

data/.travis.yml

@@ -1,6 +1,4 @@
-dist: trusty
-sudo: false
-group: beta
+dist: xenial
 language: ruby
 
 addons:
@@ -31,15 +29,6 @@ after_script:
   - "xpra stop :9"
 
 rvm:
-  - "2.0.0"
-  - "2.1"
-  - "2.2"
-  - "2.3.1"
-  - "2.4.0"
   - "ruby-head"
-  # swig compilation is sooo slow on rbx-3, that it exceeds the time limit on travis-ci
-  #- "rbx-3"
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: rbx-3
+  - "2.6.0"
+  - "2.2"

data/Gemfile

@@ -9,9 +9,9 @@ gem 'mini_portile2'
 
 group :development do
   gem 'rake-compiler', '~> 1.0'
-  gem 'rake-compiler-dock', '~> 0.6.2'
+  gem 'rake-compiler-dock', '~> 0.7.0'
   gem 'yard', '~> 0.8'
-  gem "bundler", "~> 1.12"
+  gem "bundler", ">= 1.12", "< 3.a"
   gem "rake", "~> 12.0"
 end
 

data/History.md

@@ -1,3 +1,13 @@
+=== 1.6.40 / 2018-12-28
+
+* Fix some library classes which failed, when Fox was not included into the global namespace.
+* Add new accessor FXImage#dataPtr to access raw image data from FFI, Fiddle or OpenGL.
+* Ensure zero terminated strings in values of C-argv.
+* Remove various Ruby and C++ warnings.
+* Update libfox to 1.6.57.
+* Add support for RubyInstaller-2.6
+* Set minimum required ruby version to 2.2.
+
 === 1.6.39 / 2017-12-26
 
 * Fix FXGLVisual.supported and .supported?

data/appveyor.yml

@@ -3,14 +3,14 @@ init:
   - SET RAKEOPT=-rdevkit
 install:
   - ps: |
-      if ($env:RUBYDOWNLOAD -ne $null) {
-        $(new-object net.webclient).DownloadFile("https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-$env:RUBYDOWNLOAD.exe", "$pwd/ruby-setup.exe")
+      if ($env:ruby_version -like "*head*") {
+        $(new-object net.webclient).DownloadFile("https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-$env:ruby_version.exe", "$pwd/ruby-setup.exe")
         cmd /c ruby-setup.exe /verysilent /dir=C:/Ruby$env:ruby_version
       }
   - ruby --version
   - gem --version
   - ridk version
-  - c:/msys64/usr/bin/bash -lc "pacman -Syu --noconfirm"
+  - 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
@@ -23,20 +23,9 @@ test_script:
   - bundle exec rake test
 environment:
   matrix:
-    - ruby_version: "head"
-      RUBYDOWNLOAD: x86
-      MINGW_PACKAGE_PREFIX: "mingw-w64-i686"
-      MSYSTEM: "MINGW32"
-    - ruby_version: "24-x64"
+    - ruby_version: "head-x64"
       MINGW_PACKAGE_PREFIX: "mingw-w64-x86_64"
       MSYSTEM: "MINGW64"
     - ruby_version: "24"
       MINGW_PACKAGE_PREFIX: "mingw-w64-i686"
       MSYSTEM: "MINGW32"
-    - ruby_version: "head"
-      RUBYDOWNLOAD: x64
-      MINGW_PACKAGE_PREFIX: "mingw-w64-x86_64"
-      MSYSTEM: "MINGW64"
-matrix:
-  allow_failures:
-    - ruby_version: "head"

data/ext/fox16_c/FXRbApp.cpp

@@ -85,7 +85,7 @@ void FXRbApp::setThreadsEnabled(FXbool enabled){
       interrupt_event = CreateEvent(NULL, TRUE, FALSE, NULL);
       addInput(interrupt_event,INPUT_READ,this,ID_CHORE_THREADS);
 #else
-      pipe(interrupt_fds);
+      if(pipe(interrupt_fds) == -1) rb_fatal("failed to allocate pipe for interrupt events");
       fcntl(interrupt_fds[0], F_SETFL, O_NONBLOCK);
       addInput(interrupt_fds[0],INPUT_READ,this,ID_CHORE_THREADS);
 #endif
@@ -130,7 +130,7 @@ long FXRbApp::onChoreThreads(FXObject *obj,FXSelector sel,void *p){
 #else
   char byte;
   // clear the pipe
-  read(interrupt_fds[0], &byte, 1);
+  if(read(interrupt_fds[0], &byte, 1) != 1) rb_fatal("failed to read from pipe for interrupt events");
 #endif
 #endif
   return FXRbApp_onChoreThreads(this, obj, sel, p);
@@ -172,7 +172,7 @@ void fxrb_wakeup_fox(void *){
 #ifdef WIN32
   SetEvent(FXRbApp::interrupt_event);
 #else
-  write(FXRbApp::interrupt_fds[1], "X", 1);
+  if(write(FXRbApp::interrupt_fds[1], "X", 1) != 1) rb_fatal("failed to write to pipe for interrupt events");
 #endif
   }
 #endif

data/ext/fox16_c/FXRuby.cpp

@@ -1237,9 +1237,9 @@ void FXRbRange2LoHi(VALUE range,FXint& lo,FXint& hi){
     rb_raise(rb_eTypeError,"wrong argument type %s (expected %s)",rb_class2name(CLASS_OF(range)),rb_class2name(rb_cRange));
     }
   else{
-    VALUE beg=rb_funcall(range,id_begin,0,NULL);
-    VALUE end=rb_funcall(range,id_end,0,NULL);
-    VALUE excl=rb_funcall(range,id_exclude_endp,0,NULL);
+    VALUE beg=rb_funcall(range,id_begin,0);
+    VALUE end=rb_funcall(range,id_end,0);
+    VALUE excl=rb_funcall(range,id_exclude_endp,0);
     lo=NUM2INT(beg);
     hi=NUM2INT(end);
     if(excl==Qtrue){
@@ -1253,9 +1253,9 @@ void FXRbRange2LoHi(VALUE range,FXdouble& lo,FXdouble& hi){
     rb_raise(rb_eTypeError,"wrong argument type %s (expected %s)",rb_class2name(CLASS_OF(range)),rb_class2name(rb_cRange));
     }
   else{
-    VALUE beg=rb_funcall(range,id_begin,0,NULL);
-    VALUE end=rb_funcall(range,id_end,0,NULL);
-    VALUE excl=rb_funcall(range,id_exclude_endp,0,NULL);
+    VALUE beg=rb_funcall(range,id_begin,0);
+    VALUE end=rb_funcall(range,id_end,0);
+    VALUE excl=rb_funcall(range,id_exclude_endp,0);
     lo=NUM2DBL(beg);
     hi=NUM2DBL(end);
     if(excl==Qtrue){
@@ -1270,13 +1270,13 @@ 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);
+  rb_funcall(obj,rb_intern(func),0);
   }
 
 void FXRbCallVoidMethod_gvlcb(FXDC* recv,const char *func) {
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  rb_funcall(obj,rb_intern(func),0,NULL);
+  rb_funcall(obj,rb_intern(func),0);
   }
 
 //----------------------------------------------------------------------
@@ -1284,7 +1284,7 @@ void FXRbCallVoidMethod_gvlcb(FXDC* recv,const char *func) {
 bool FXRbCallBoolMethod_gvlcb(const FXObject* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE v=rb_funcall(obj,rb_intern(func),0,NULL);
+  VALUE v=rb_funcall(obj,rb_intern(func),0);
   return (v==Qtrue);
   }
 
@@ -1294,7 +1294,7 @@ bool FXRbCallBoolMethod_gvlcb(const FXObject* recv,const char *func){
 FXint FXRbCallIntMethod_gvlcb(const FXObject* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
+  VALUE result=rb_funcall(obj,rb_intern(func),0);
   return static_cast<FXint>(NUM2INT(result));
   }
 
@@ -1304,7 +1304,7 @@ FXint FXRbCallIntMethod_gvlcb(const FXObject* recv,const char *func){
 FXGLObject* FXRbCallGLObjectMethod_gvlcb(FXGLObject* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
+  VALUE result=rb_funcall(obj,rb_intern(func),0);
   return NIL_P(result) ? 0 : reinterpret_cast<FXGLObject*>(DATA_PTR(result));
   }
 
@@ -1392,7 +1392,7 @@ FXIcon* FXRbCallIconMethod_gvlcb(const FXTableItem* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
 	if(!NIL_P(obj)){
-	  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
+	  VALUE result=rb_funcall(obj,rb_intern(func),0);
 	  return NIL_P(result) ? 0 : reinterpret_cast<FXIcon*>(DATA_PTR(result));
 		}
 	else{
@@ -1415,7 +1415,7 @@ FXWindow* FXRbCallWindowMethod_gvlcb(const FXTableItem* recv,const char *func,FX
 FXRangef FXRbCallRangeMethod_gvlcb(FXObject* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
+  VALUE result=rb_funcall(obj,rb_intern(func),0);
   return *reinterpret_cast<FXRangef*>(DATA_PTR(result));
   }
 
@@ -1425,7 +1425,7 @@ FXRangef FXRbCallRangeMethod_gvlcb(FXObject* recv,const char *func){
 FXString FXRbCallStringMethod_gvlcb(const FXObject* recv, const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
+  VALUE result=rb_funcall(obj,rb_intern(func),0);
   return FXString(StringValuePtr(result));
   }
 
@@ -1452,7 +1452,7 @@ const FXchar* FXRbCallCStringMethod_gvlcb(const FXObject* recv, const char *func
 FXwchar FXRbCallWCharMethod_gvlcb(const FXObject* recv, const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
+  VALUE result=rb_funcall(obj,rb_intern(func),0);
   return static_cast<FXwchar>(NUM2ULONG(result));
   }
 

data/ext/fox16_c/extconf.rb

@@ -24,20 +24,20 @@ end
 LIBZ_VERSION = ENV['LIBZ_VERSION'] || '1.2.7.3'
 LIBZ_SOURCE_URI = "http://zlib.net/fossils/zlib-#{LIBZ_VERSION}.tar.gz"
 
-LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.6.29'
+LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.6.36'
 LIBPNG_SOURCE_URI = "http://prdownloads.sourceforge.net/libpng/libpng-#{LIBPNG_VERSION}.tar.gz"
 
 # LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '9b'
 # LIBJPEG_SOURCE_URI = "http://www.ijg.org/files/jpegsrc.v#{LIBJPEG_VERSION}.tar.gz"
 
-LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '1.5.2'
+LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '1.5.3'
 LIBJPEG_SOURCE_URI = "https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-#{LIBJPEG_VERSION}.tar.gz"
 
-LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.0.8'
+LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.0.10'
 LIBTIFF_SOURCE_URI = "http://download.osgeo.org/libtiff/tiff-#{LIBTIFF_VERSION}.tar.gz"
 
-LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.55'
-LIBFOX_SOURCE_URI         = "http://ftp.fox-toolkit.org/pub/fox-#{LIBFOX_VERSION}.tar.gz"
+LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.57'
+LIBFOX_SOURCE_URI         = "http://fox-toolkit.org/ftp/fox-#{LIBFOX_VERSION}.tar.gz"
 
 LIBFXSCINTILLA_VERSION            = ENV['LIBFXSCINTILLA_VERSION'] || '2.28.0'
 LIBFXSCINTILLA_SOURCE_URI         = "http://download.savannah.gnu.org/releases/fxscintilla/fxscintilla-#{LIBFXSCINTILLA_VERSION}.tar.gz"
@@ -158,13 +158,6 @@ def do_rake_compiler_setup
         "CPPFLAGS=-I#{libjpeg_recipe.path}/include -I#{libpng_recipe.path}/include -I#{libtiff_recipe.path}/include -I#{libz_recipe.path}/include -DUNICODE=1 #{debug ? "-ggdb" : ""}",
         "LDFLAGS=-L#{libjpeg_recipe.path}/lib -L#{libpng_recipe.path}/lib -L#{libtiff_recipe.path}/lib -L#{libz_recipe.path}/lib #{debug ? "-ggdb" : ""}",
       ]
-      class << recipe
-        def compile
-          # Add param -no-undefined to libtool to build a win32 shared lib
-          execute "compile", "#{ENV['MAKE'] || "make"} libFOX_1_6_la_LDFLAGS='-version-info 0:49:0 -export-dynamic -no-undefined'"
-        end
-      end
-
       recipe.cook_and_activate
     end
 
@@ -312,7 +305,6 @@ if enable_config("debug")
 else
   $CPPFLAGS += " -DNDEBUG"
 end
-$CPPFLAGS += " -Wno-unused-function"
 
 # Platform-specific modifications
 do_rake_compiler_setup
@@ -321,6 +313,11 @@ $CFLAGS += " -DRUBY_1_8" if RUBY_VERSION =~ /1\.8\./
 $CFLAGS += " -DRUBY_1_9" if RUBY_VERSION =~ /1\.9\./
 $CFLAGS += " -DRUBY_2_0" if RUBY_VERSION =~ /2\.0\./
 
+if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
+  $CXXFLAGS += " -Wno-unused-function"
+  $CXXFLAGS += " -Wno-maybe-uninitialized"
+end
+
 # Last step: build the makefile
 create_header
 create_makefile("fox16_c")

data/ext/fox16_c/include/FXRbApp.h

@@ -73,7 +73,7 @@ static void cls ## _init(cls* self,VALUE ary,bool connect){ \
     argv[0]=const_cast<char *>("foo"); \
     for(i=1;i<argc;i++){ \
       VALUE e=rb_ary_entry(ary,i-1); \
-      argv[i]=StringValuePtr(e); \
+      argv[i]=StringValueCStr(e); \
       } \
     argv[argc]=0; \
     self->cls::init(argc,argv,connect); \
@@ -127,7 +127,7 @@ inline void cls ## _exit(cls *self,FXint code){ \
     argc=static_cast<int>(RARRAY_LEN(ary)+1); \
     for(i=1; i<argc; i++){ \
       VALUE e=rb_ary_entry(ary,i-1); \
-      argv[i]=StringValuePtr(e); \
+      argv[i]=StringValueCStr(e); \
       } \
     } \
   void cls::exit(FXint code){ \

data/ext/fox16_c/include/FXRuby.h

@@ -535,7 +535,7 @@ void FXRbCallVoidMethod_gvlcb(FXObject* recv,const char *func,TYPE1& arg1,TYPE2
 
 // Call function with "FXbool" return value
 inline bool FXRbCallBoolMethod_gvlcb(FXStream* recv,const char *func){
-  VALUE v=rb_funcall(FXRbGetRubyObj(recv,false),rb_intern(func),0,NULL);
+  VALUE v=rb_funcall(FXRbGetRubyObj(recv,false),rb_intern(func),0);
   return (v==Qtrue);
   }
 

data/fxruby.gemspec

@@ -48,6 +48,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions = ["ext/fox16_c/extconf.rb"]
   spec.metadata['msys2_mingw_dependencies'] = 'fox'
+  spec.required_ruby_version = "~> 2.2"
 
   spec.add_runtime_dependency 'mini_portile2', '~> 2.1'
 end

data/lib/fox16/aliases.rb

@@ -2414,6 +2414,9 @@ module Fox
     def data(*args) # :nodoc:
       getData(*args)
     end
+    def dataPtr(*args) # :nodoc:
+      getDataPtr(*args)
+    end
     def pixels=(*args) # :nodoc:
       setPixels(*args)
     end

data/lib/fox16/calendar.rb

@@ -99,7 +99,7 @@ module Fox
         btn.connect(SEL_COMMAND) do |send, sel, ev|
           @selected = Time.local(@date_showing.year, @date_showing.month,
                                  send.text.to_i)
-          target.handle(self, MKUINT(selector, SEL_COMMAND), @selected) if target
+          target.handle(self, Fox.MKUINT(selector, SEL_COMMAND), @selected) if target
         end
       end
       _build_date_matrix()
@@ -202,16 +202,14 @@ end
 
 if __FILE__ == $0
 
-  include Fox
-
-  app = FXApp.new('Calendar', 'FXRuby')
+  app = Fox::FXApp.new('Calendar', 'FXRuby')
   app.init(ARGV)
-  mainwin = FXMainWindow.new(app, "Calendar Test", nil, nil, DECOR_ALL, 0, 0, 500, 500)
-  calendar = FXCalendar.new(mainwin, Time.now, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
-  calendar.connect(SEL_COMMAND) do |sender, sel, data|
+  mainwin = Fox::FXMainWindow.new(app, "Calendar Test", nil, nil, Fox::DECOR_ALL, 0, 0, 500, 500)
+  calendar = Fox::FXCalendar.new(mainwin, Time.now, nil, 0, Fox::LAYOUT_FILL_X|Fox::LAYOUT_FILL_Y)
+  calendar.connect(Fox::SEL_COMMAND) do |sender, sel, data|
     puts data.to_s
   end
   app.create
-  mainwin.show(PLACEMENT_SCREEN)
+  mainwin.show(Fox::PLACEMENT_SCREEN)
   app.run
 end

data/lib/fox16/canvas.rb

@@ -312,7 +312,7 @@ module Fox
           shape.select
           @canvas.updateShape(shape)
           if notify && (@canvas.target != nil)
-            @canvas.target.handle(@canvas, MKUINT(@canvas.message, SEL_SELECTED), shape)
+            @canvas.target.handle(@canvas, Fox.MKUINT(@canvas.message, SEL_SELECTED), shape)
           end
         end
       end
@@ -322,7 +322,7 @@ module Fox
           shape.deselect
           @canvas.updateShape(shape)
           if notify && (@canvas.target != nil)
-            @canvas.target.handle(@canvas, MKUINT(@canvas.message, SEL_DESELECTED), shape)
+            @canvas.target.handle(@canvas, Fox.MKUINT(@canvas.message, SEL_DESELECTED), shape)
           end
         end
       end
@@ -463,7 +463,7 @@ module Fox
             updateShape(shape)
             changes = true
             if notify && (target != nil)
-              target.handle(self, MKUINT(message, SEL_DESELECTED), shape)
+              target.handle(self, Fox.MKUINT(message, SEL_DESELECTED), shape)
             end
           end
         end
@@ -486,7 +486,7 @@ module Fox
       def onMotion(sender, sel, evt)
         # Drag and drop mode
         if (@flags & FLAG_DODRAG) != 0
-          handle(self, MKUINT(0, SEL_DRAGGED), evt)
+          handle(self, Fox.MKUINT(0, SEL_DRAGGED), evt)
           return 1
         end
 
@@ -494,7 +494,7 @@ module Fox
         if (@flags & FLAG_TRYDRAG) != 0
           if evt.moved?
             @flags &= ~FLAG_TRYDRAG
-            if handle(this, MKUINT(0, SEL_BEGINDRAG), evt) != 0
+            if handle(this, Fox.MKUINT(0, SEL_BEGINDRAG), evt) != 0
               @flags |= FLAG_DODRAG
             end
           end
@@ -504,13 +504,13 @@ module Fox
 
       # Left button press
       def onLeftBtnPress(sender, sel, evt)
-        handle(self, MKUINT(0, SEL_FOCUS_SELF), evt)
+        handle(self, Fox.MKUINT(0, SEL_FOCUS_SELF), evt)
         if enabled?
           grab
           flags &= ~FLAG_UPDATE
 
           # Give target the first chance at handling this
-          return 1 if target && (target.handle(self, MKUINT(message, SEL_LEFTBUTTONPRESS), evt) != 0)
+          return 1 if target && (target.handle(self, Fox.MKUINT(message, SEL_LEFTBUTTONPRESS), evt) != 0)
 
           # Locate shape
           shape = findShape(evt.win_x, evt.win_y)
@@ -548,11 +548,11 @@ module Fox
           @flags &= ~(FLAG_PRESSED|FLAG_TRYDRAG|FLAG_LASSO|FLAG_DODRAG)
 
           # First chance callback
-          return 1 if target && target.handle(self, MKUINT(message, SEL_LEFTBUTTONRELEASE), evt) != 0
+          return 1 if target && target.handle(self, Fox.MKUINT(message, SEL_LEFTBUTTONRELEASE), evt) != 0
 
           # Was dragging
           if (flg & FLAG_DODRAG) != 0
-            handle(self, MKUINT(0, SEL_ENDDRAG), evt)
+            handle(self, Fox.MKUINT(0, SEL_ENDDRAG), evt)
             return 1
           end
 
@@ -565,16 +565,16 @@ module Fox
 
             # Generate clicked callbacks
             if evt.click_count == 1
-              handle(self, MKUINT(0, SEL_CLICKED), @currentShape)
+              handle(self, Fox.MKUINT(0, SEL_CLICKED), @currentShape)
             elsif evt.click_count == 2
-              handle(self, MKUINT(0, SEL_DOUBLECLICKED), @currentShape)
+              handle(self, Fox.MKUINT(0, SEL_DOUBLECLICKED), @currentShape)
             elseif evt.click_count == 3
-              handle(self, MKUINT(0, SEL_TRIPLECLICKED), @currentShape)
+              handle(self, Fox.MKUINT(0, SEL_TRIPLECLICKED), @currentShape)
             end
 
             # Generate command callback only when clicked on item
             if @currentShape && @currentShape.enabled?
-              handle(self, MKUINT(0, SEL_COMMAND), @currentShape)
+              handle(self, Fox.MKUINT(0, SEL_COMMAND), @currentShape)
             end
             return 1
           end
@@ -584,22 +584,22 @@ module Fox
 
       # Command message
       def onCommand(sender, sel, ptr)
-        return target && target.handle(self, MKUINT(message, SEL_COMMAND), ptr)
+        return target && target.handle(self, Fox.MKUINT(message, SEL_COMMAND), ptr)
       end
 
       # Clicked on canvas
       def onClicked(sender, sel, ptr)
-        return target && target.handle(self, MKUINT(message, SEL_CLICKED), ptr)
+        return target && target.handle(self, Fox.MKUINT(message, SEL_CLICKED), ptr)
       end
 
       # Double-clicked on canvas
       def onDoubleClicked(sender, sel, ptr)
-        return target && target.handle(self, MKUINT(message, SEL_DOUBLECLICKED), ptr)
+        return target && target.handle(self, Fox.MKUINT(message, SEL_DOUBLECLICKED), ptr)
       end
 
       # Triple-clicked on canvas
       def onTripleClicked(sender, sel, ptr)
-        return target && target.handle(self, MKUINT(message, SEL_TRIPLECLICKED), ptr)
+        return target && target.handle(self, Fox.MKUINT(message, SEL_TRIPLECLICKED), ptr)
       end
     end
   end

data/lib/fox16/core.rb

@@ -421,24 +421,24 @@ module Fox
     #
     def FXStreamError.makeStreamError(status)
       case status
-	when FXStreamEnd
-	  FXStreamEndError
-	when FXStreamFull
-	  FXStreamFullError
-	when FXStreamNoWrite
-	  FXStreamNoWriteError
-	when FXStreamNoRead
-	  FXStreamNoReadError
-	when FXStreamFormat
-	  FXStreamFormatError
-	when FXStreamUnknown
-	  FXStreamUnknownError
-	when FXStreamAlloc
-	  FXStreamAllocError
-	when FXStreamFailure
-	  FXStreamFailureError
-	else
-	  FXStreamError
+      when FXStreamEnd
+        FXStreamEndError
+      when FXStreamFull
+        FXStreamFullError
+      when FXStreamNoWrite
+        FXStreamNoWriteError
+      when FXStreamNoRead
+        FXStreamNoReadError
+      when FXStreamFormat
+        FXStreamFormatError
+      when FXStreamUnknown
+        FXStreamUnknownError
+      when FXStreamAlloc
+        FXStreamAllocError
+      when FXStreamFailure
+        FXStreamFailureError
+      else
+        FXStreamError
       end
     end
   end

data/lib/fox16/undolist.rb

@@ -344,9 +344,9 @@ module Fox
 
     def onUpdUndo(sender, sel, ptr) # :nodoc:
       if canUndo?
-	sender.handle(self, MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
+	sender.handle(self, Fox.MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
       else
-	sender.handle(self, MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
+	sender.handle(self, Fox.MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
       end
       return 1
     end
@@ -358,9 +358,9 @@ module Fox
 
     def onUpdRedo(sender, sel, ptr) # :nodoc:
       if canRedo?
-	sender.handle(self, MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
+	sender.handle(self, Fox.MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
       else
-	sender.handle(self, MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
+	sender.handle(self, Fox.MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
       end
       return 1
     end
@@ -372,9 +372,9 @@ module Fox
 
     def onUpdClear(sender, sel, ptr) # :nodoc:
       if canUndo? || canRedo?
-	sender.handle(self, MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
+	sender.handle(self, Fox.MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
       else
-	sender.handle(self, MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
+	sender.handle(self, Fox.MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
       end
       return 1
     end
@@ -386,9 +386,9 @@ module Fox
 
     def onUpdRevert(sender, sel, ptr) # :nodoc:
       if canRevert?
-	sender.handle(self, MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
+	sender.handle(self, Fox.MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
       else
-	sender.handle(self, MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
+	sender.handle(self, Fox.MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
       end
       return 1
     end

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.39"
+    "1.6.40"
   end
 end

data/rdoc-sources/FXImage.rb

@@ -45,6 +45,11 @@ module Fox
     # [deprecated] Pixel data {FXMemoryBuffer}
     attr_reader :data
 
+    # The pointer to the raw color representation of all image pixels.
+    #
+    # It can be used to pass raw image data to FFI, Fiddle or OpenGL.
+    attr_reader :dataPtr
+
     # Array of colors of all image pixels. Can also be written as String of raw [RGBA] values.
     attr_accessor :pixels
 

data/swig-interfaces/FXImage.i

@@ -58,7 +58,7 @@ public:
     FXImage(FXApp* a,VALUE string_or_ary=Qnil,FXuint opts=0,FXint w=1,FXint h=1){
       FXColor* pix=0;
       if(!NIL_P(string_or_ary)){
-        FXuint len=FXRbNumberOfFXColors(string_or_ary);
+        FXint len=FXRbNumberOfFXColors(string_or_ary);
         if(w*h != len){
           rb_raise( rb_eArgError, "Array size does not match image size" );
         }
@@ -76,6 +76,11 @@ public:
         return 0;
       }
     }
+
+    /// Get a pointer to the pixel data
+    VALUE getDataPtr() const {
+      return ULL2NUM((uintptr_t)self->getData());
+    }
   }
 
   /// To get to the option flags
@@ -92,9 +97,9 @@ public:
     * This can be done by calling render().
     */
     void setPixels(VALUE string_or_ary,FXuint opts=0,VALUE w=Qnil,VALUE h=Qnil){
-      FXuint len=FXRbNumberOfFXColors(string_or_ary);
+      FXint len=FXRbNumberOfFXColors(string_or_ary);
       if( ( (NIL_P(w) || NIL_P(h)) && self->getWidth()*self->getHeight() != len) ||
-          (!(NIL_P(w) || NIL_P(h)) && NUM2UINT(w)*NUM2UINT(h) != len)){
+          (!(NIL_P(w) || NIL_P(h)) && NUM2INT(w)*NUM2INT(h) != len)){
         rb_raise( rb_eArgError, "Array size does not match image size" );
       }
 
@@ -111,7 +116,7 @@ public:
       if (data) {
         FXuint size = self->getWidth()*self->getHeight();
         VALUE ary = rb_ary_new2(size);
-        for (int i = 0; i < size; i++)
+        for (FXuint i = 0; i < size; i++)
           rb_ary_store(ary, i, UINT2NUM(data[i]));
         return ary;
       } else {

data/swig-interfaces/FXMemoryBuffer.i

@@ -27,7 +27,7 @@
 class FXMemoryBuffer {
 public:
   // Create an memory buffer object
-  FXMemoryBuffer(FXColor *data,FXuint size);
+  FXMemoryBuffer(FXColor *data,FXint size);
 
   // Returns the size (in bytes)
   FXuint getSize() const;
@@ -39,7 +39,7 @@ public:
       if (data) {
         FXuint size = self->getSize();
         VALUE ary = rb_ary_new2(size);
-        for (int i = 0; i < size; i++)
+        for (FXuint i = 0; i < size; i++)
           rb_ary_store(ary, i, UINT2NUM(data[i]));
         return ary;
         }

data/test/TC_FXImage.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'testcase'
 require 'fox16'
+require 'fiddle'
 
 class TC_FXImage < Fox::TestCase
   include Fox
@@ -80,6 +81,13 @@ class TC_FXImage < Fox::TestCase
     assert_equal("rgbaRGBA", img.pixel_string)
   end
 
+  def test_dataPtr
+    img = FXImage.new(app, nil, 0, 2, 1)
+    img.pixels = "rgbaRGBA"
+    assert_equal(0, img.options)
+    assert_equal("rgbaRGBA", Fiddle::Pointer.new(img.dataPtr)[0, 8])
+  end
+
   def test_create
     #
     # If the image owns its pixel data and IMAGE_KEEP was not specified,

data/test/TC_FXList.rb

@@ -46,17 +46,17 @@ class TC_FXList < Fox::TestCase
 
   def test_appendItem_byText
     assert_equal(0, @list.numItems)
-    itemIndex = @list.appendItem("")
+    assert_equal 0, @list.appendItem("")
     assert_equal(1, @list.numItems)
-    itemIndex = @list.appendItem("anItem")
+    assert_equal 1, @list.appendItem("anItem")
     assert_equal(2, @list.numItems)
-    itemIndex = @list.appendItem("anItem", nil)
+    assert_equal 2, @list.appendItem("anItem", nil)
     assert_equal(3, @list.numItems)
-    itemIndex = @list.appendItem("anItem", nil, "someData")
+    assert_equal 3, @list.appendItem("anItem", nil, "someData")
     assert_equal(4, @list.numItems)
-    itemIndex = @list.appendItem("anItem", nil, "someData", true)
+    assert_equal 4, @list.appendItem("anItem", nil, "someData", true)
     assert_equal(5, @list.numItems)
-    itemIndex = @list.appendItem("anItem", nil, "someData", false)
+    assert_equal 5, @list.appendItem("anItem", nil, "someData", false)
     assert_equal(6, @list.numItems)
     assert_raises(ArgumentError) do
       @list.appendItem("anItem", nil, "someData", 42) # last argument must be true or false
@@ -103,9 +103,9 @@ class TC_FXList < Fox::TestCase
   end
 
   def test_makeItemVisible
-    items = []
     0.upto(2) { |i|
-      items << @list.appendItem("item#{i}")
+      itemIndex = @list.appendItem("item#{i}")
+      assert_equal i, itemIndex
     }
     assert_raises(IndexError) {
       @list.makeItemVisible(-1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fxruby
 version: !ruby/object:Gem::Version
-  version: 1.6.39
+  version: 1.6.40
 platform: x86-mingw32
 authors:
 - Lyle Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-25 00:00:00.000000000 Z
+date: 2018-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -426,12 +426,11 @@ files:
 - ext/fox16_c/unregisterOwnedObjects.cpp
 - fxruby.gemspec
 - index.html
-- lib/2.0/fox16_c.so
-- lib/2.1/fox16_c.so
 - lib/2.2/fox16_c.so
 - lib/2.3/fox16_c.so
 - lib/2.4/fox16_c.so
 - lib/2.5/fox16_c.so
+- lib/2.6/fox16_c.so
 - lib/fox16.rb
 - lib/fox16/accel_table.rb
 - lib/fox16/aliases.rb
@@ -1004,10 +1003,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.2'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: 2.7.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1015,7 +1014,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: FXRuby is the Ruby binding to the FOX GUI toolkit.