fxruby 1.6.46-x64-mingw32 → 1.6.48-x64-mingw32

data/fxruby.gemspec

@@ -50,12 +50,12 @@ 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.5", "< 4"]
+  spec.required_ruby_version = [">= 2.6", "< 4"]
 
   spec.add_runtime_dependency 'mini_portile2', '~> 2.1'
 
   yardopts = File.read(".yardopts")
-  spec.rdoc_options  = ["--main", "README.rdoc",
+  spec.rdoc_options  = ["--main", "README.md",
                         "--title", "FXRuby API Documentation"]
   docfiles = yardopts.lines.map(&:strip).select{|r| r=~/^[^-]/ }
   spec.extra_rdoc_files = `git ls-files -z #{docfiles.join(" ")}`.split("\x0")

data/lib/fox16/glgroup.rb

@@ -9,7 +9,6 @@ module Fox
   # A group of OpenGL objects
   #
   class FXGLGroup < FXGLObject
-    include OpenGL if defined?(OpenGL)
     include Enumerable
 
     FLT_MAX =  1.0e+20
@@ -80,12 +79,12 @@ module Fox
     #
     def hit(viewer)
 #     GL.PushName(0xffffffff)
-      glPushName(1000000)
+      GL.PushName(1000000)
       @list.each_with_index do |obj, i|
-        glLoadName(i)
+        GL.LoadName(i)
         obj.hit(viewer)
       end
-      glPopName
+      GL.PopName
     end
 
     #

data/lib/fox16/glshapes.rb

@@ -9,8 +9,6 @@ module Fox
   # OpenGL point object
   #
   class FXGLPoint < FXGLObject
-    include OpenGL
-
     # Point position, in model coordinates (a 3-element array)
     attr_accessor :pos
 
@@ -48,20 +46,20 @@ module Fox
     # Draw this point into _viewer_ (an FXGLViewer instance).
     #
     def draw(viewer)
-      glColor3d(0.0, 0.0, 1.0)
-      glPointSize(HANDLE_SIZE)
-      glBegin(GL_POINTS)
-      glVertex3d(*@pos)
-      glEnd()
+      GL.Color3d(0.0, 0.0, 1.0)
+      GL.PointSize(HANDLE_SIZE)
+      GL.Begin(GL::POINTS)
+      GL.Vertex3d(*@pos)
+      GL.End()
     end
 
     #
     # Perform hit test for this point in _viewer_ (an FXGLViewer instance).
     #
     def hit(viewer)
-      glBegin(GL_POINTS)
-      glVertex3d(*@pos)
-      glEnd()
+      GL.Begin(GL::POINTS)
+      GL.Vertex3d(*@pos)
+      GL.End()
     end
   end
 
@@ -69,8 +67,6 @@ module Fox
   # OpenGL line object
   #
   class FXGLLine < FXGLObject
-    include OpenGL
-
     # Starting point for line [FXGLPoint]
     attr_accessor :fm
 
@@ -122,22 +118,22 @@ module Fox
     # Draw this line into _viewer_ (an FXGLViewer instance).
     #
     def draw(viewer)
-      glColor3d(1.0, 0.0, 0.0)
-      glPointSize(HANDLE_SIZE)
-      glBegin(GL_LINES)
-      glVertex3d(*@fm.pos)
-      glVertex3d(*@to.pos)
-      glEnd()
+      GL.Color3d(1.0, 0.0, 0.0)
+      GL.PointSize(HANDLE_SIZE)
+      GL.Begin(GL::LINES)
+      GL.Vertex3d(*@fm.pos)
+      GL.Vertex3d(*@to.pos)
+      GL.End()
     end
 
     #
     # Perform hit-test for this line in _viewer_ (an FXGLViewer instance).
     #
     def hit(viewer)
-      glBegin(GL_LINES)
-      glVertex3d(*@fm.pos)
-      glVertex3d(*@to.pos)
-      glEnd()
+      GL.Begin(GL::LINES)
+      GL.Vertex3d(*@fm.pos)
+      GL.Vertex3d(*@to.pos)
+      GL.End()
     end
   end
 
@@ -145,8 +141,6 @@ module Fox
   # OpenGL cube object
   #
   class FXGLCube < FXGLShape
-    include OpenGL
-
     # Cube width [Float]
     attr_accessor :width
 
@@ -198,58 +192,58 @@ module Fox
       zmin, zmax = -0.5*@depth, 0.5*@depth
 
       # Draw low face
-      glBegin(GL_TRIANGLE_STRIP)
-        glNormal3d(0.0, 0.0, -1.0)
-        glVertex3d(xmin, ymin, zmin)
-        glVertex3d(xmin, ymax, zmin)
-        glVertex3d(xmax, ymin, zmin)
-        glVertex3d(xmax, ymax, zmin)
-      glEnd()
+      GL.Begin(GL::TRIANGLE_STRIP)
+        GL.Normal3d(0.0, 0.0, -1.0)
+        GL.Vertex3d(xmin, ymin, zmin)
+        GL.Vertex3d(xmin, ymax, zmin)
+        GL.Vertex3d(xmax, ymin, zmin)
+        GL.Vertex3d(xmax, ymax, zmin)
+      GL.End()
 
       # Draw east face
-      glBegin(GL_TRIANGLE_STRIP)
-        glNormal3d(1.0, 0.0, 0.0)
-        glVertex3d(xmax, ymin, zmin)
-        glVertex3d(xmax, ymax, zmin)
-        glVertex3d(xmax, ymin, zmax)
-        glVertex3d(xmax, ymax, zmax)
-      glEnd()
+      GL.Begin(GL::TRIANGLE_STRIP)
+        GL.Normal3d(1.0, 0.0, 0.0)
+        GL.Vertex3d(xmax, ymin, zmin)
+        GL.Vertex3d(xmax, ymax, zmin)
+        GL.Vertex3d(xmax, ymin, zmax)
+        GL.Vertex3d(xmax, ymax, zmax)
+      GL.End()
 
       # Draw high face
-      glBegin(GL_TRIANGLE_STRIP)
-        glNormal3d(0.0, 0.0, 1.0)
-        glVertex3d(xmax, ymin, zmax)
-        glVertex3d(xmax, ymax, zmax)
-        glVertex3d(xmin, ymin, zmax)
-        glVertex3d(xmin, ymax, zmax)
-      glEnd()
+      GL.Begin(GL::TRIANGLE_STRIP)
+        GL.Normal3d(0.0, 0.0, 1.0)
+        GL.Vertex3d(xmax, ymin, zmax)
+        GL.Vertex3d(xmax, ymax, zmax)
+        GL.Vertex3d(xmin, ymin, zmax)
+        GL.Vertex3d(xmin, ymax, zmax)
+      GL.End()
 
       # Draw west face
-      glBegin(GL_TRIANGLE_STRIP)
-        glNormal3d(-1.0, 0.0, 0.0)
-        glVertex3d(xmin, ymin, zmax)
-        glVertex3d(xmin, ymax, zmax)
-        glVertex3d(xmin, ymin, zmin)
-        glVertex3d(xmin, ymax, zmin)
-      glEnd()
+      GL.Begin(GL::TRIANGLE_STRIP)
+        GL.Normal3d(-1.0, 0.0, 0.0)
+        GL.Vertex3d(xmin, ymin, zmax)
+        GL.Vertex3d(xmin, ymax, zmax)
+        GL.Vertex3d(xmin, ymin, zmin)
+        GL.Vertex3d(xmin, ymax, zmin)
+      GL.End()
 
       # Draw north face
-      glBegin(GL_TRIANGLE_STRIP)
-        glNormal3d(0.0, 1.0, 0.0)
-        glVertex3d(xmin, ymax, zmin)
-        glVertex3d(xmin, ymax, zmax)
-        glVertex3d(xmax, ymax, zmin)
-        glVertex3d(xmax, ymax, zmax)
-      glEnd()
+      GL.Begin(GL::TRIANGLE_STRIP)
+        GL.Normal3d(0.0, 1.0, 0.0)
+        GL.Vertex3d(xmin, ymax, zmin)
+        GL.Vertex3d(xmin, ymax, zmax)
+        GL.Vertex3d(xmax, ymax, zmin)
+        GL.Vertex3d(xmax, ymax, zmax)
+      GL.End()
 
       # Draw south face
-      glBegin(GL_TRIANGLE_STRIP)
-        glNormal3d(0.0, -1.0, 0.0)
-        glVertex3d(xmin, ymin, zmax)
-        glVertex3d(xmin, ymin, zmin)
-        glVertex3d(xmax, ymin, zmax)
-        glVertex3d(xmax, ymin, zmin)
-      glEnd()
+      GL.Begin(GL::TRIANGLE_STRIP)
+        GL.Normal3d(0.0, -1.0, 0.0)
+        GL.Vertex3d(xmin, ymin, zmax)
+        GL.Vertex3d(xmin, ymin, zmin)
+        GL.Vertex3d(xmax, ymin, zmax)
+        GL.Vertex3d(xmax, ymin, zmin)
+      GL.End()
     end
   end
 
@@ -257,9 +251,6 @@ module Fox
   # OpenGL cone object
   #
   class FXGLCone < FXGLShape
-    include OpenGL
-    include GLU
-
     # Cone fidelity
     SLICES_NUMBER = 20
     STACKS_NUMBER = 20
@@ -316,15 +307,15 @@ module Fox
     # Draw this cone into _viewer_ (an FXGLViewer instance).
     #
     def drawshape(viewer)
-      quad = gluNewQuadric()
-      gluQuadricDrawStyle(quad, GLU_FILL)
-      glPushMatrix()
-      glRotated(-90, 1, 0, 0)
-      gluCylinder(quad, @radius, 0, @height, @slices, @stacks)
-      gluQuadricOrientation(quad, GLU_INSIDE)
-      gluDisk(quad, 0, @radius, @slices, @loops)
-      gluDeleteQuadric(quad)
-      glPopMatrix()
+      quad = GLU.NewQuadric()
+      GLU.QuadricDrawStyle(quad, GLU::FILL)
+      GL.PushMatrix()
+      GL.Rotated(-90, 1, 0, 0)
+      GLU.Cylinder(quad, @radius, 0, @height, @slices, @stacks)
+      GLU.QuadricOrientation(quad, GLU::INSIDE)
+      GLU.Disk(quad, 0, @radius, @slices, @loops)
+      GLU.DeleteQuadric(quad)
+      GL.PopMatrix()
     end
   end
 
@@ -332,9 +323,6 @@ module Fox
   # OpenGL cylinder object
   #
   class FXGLCylinder < FXGLShape
-    include OpenGL
-    include GLU
-
     # Cylinder fidelity
     SLICES_NUMBER = 20
     STACKS_NUMBER = 20
@@ -391,18 +379,18 @@ module Fox
     # Draw this cylinder into _viewer_ (an FXGLViewer instance).
     #
     def drawshape(viewer)
-      quad = gluNewQuadric()
-      gluQuadricDrawStyle(quad, GLU_FILL)
-      glPushMatrix()
-      glRotated(-90, 1, 0, 0)
-      gluCylinder(quad, @radius, @radius, @height, @slices, @stacks)
-      gluQuadricOrientation(quad, GLU_INSIDE)
-      gluDisk(quad, 0, @radius, @slices, @loops)
-      glTranslated(0, 0, @height)
-      gluQuadricOrientation(quad, GLU_OUTSIDE)
-      gluDisk(quad, 0, @radius, @slices, @loops)
-      glPopMatrix()
-      gluDeleteQuadric(quad)
+      quad = GLU.NewQuadric()
+      GLU.QuadricDrawStyle(quad, GLU::FILL)
+      GL.PushMatrix()
+      GL.Rotated(-90, 1, 0, 0)
+      GLU.Cylinder(quad, @radius, @radius, @height, @slices, @stacks)
+      GLU.QuadricOrientation(quad, GLU::INSIDE)
+      GLU.Disk(quad, 0, @radius, @slices, @loops)
+      GL.Translated(0, 0, @height)
+      GLU.QuadricOrientation(quad, GLU::OUTSIDE)
+      GLU.Disk(quad, 0, @radius, @slices, @loops)
+      GL.PopMatrix()
+      GLU.DeleteQuadric(quad)
     end
   end
 
@@ -410,9 +398,6 @@ module Fox
   # OpenGL sphere object
   #
   class FXGLSphere < FXGLShape
-    include OpenGL
-    include GLU
-
     # Sphere fidelity
     SLICES_NUMBER = 20
     STACKS_NUMBER = 20
@@ -460,10 +445,10 @@ module Fox
     # Draw this sphere into _viewer_ (an FXGLViewer instance).
     #
     def drawshape(viewer)
-      quad = gluNewQuadric()
-      gluQuadricDrawStyle(quad, GLU_FILL)
-      gluSphere(quad, @radius, @slices, @stacks)
-      gluDeleteQuadric(quad)
+      quad = GLU.NewQuadric()
+      GLU.QuadricDrawStyle(quad, GLU::FILL)
+      GLU.Sphere(quad, @radius, @slices, @stacks)
+      GLU.DeleteQuadric(quad)
     end
   end
 end

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.46"
+    "1.6.48"
   end
 end

data/scripts/iface.rb

@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 
-require "getoptlong"
+require "optparse"
 
 ##
 # IFace data stucture
@@ -363,18 +363,14 @@ class ScintillaIFaceToRuby
 end
 
 def main
-	options = GetoptLong.new(["-i", GetoptLong::REQUIRED_ARGUMENT],
-													 ["-o", GetoptLong::REQUIRED_ARGUMENT])
-
 	input = output = nil
-	options.each do |opt, arg|
-		case opt
-		when "-i"
-			input = File.open(arg, File::RDONLY)
-		when "-o"
-			output = File.open(arg, File::CREAT|File::WRONLY|File::TRUNC)
-		end
-	end
+
+	OptionParser.new do |opts|
+		opts.banner = "Usage: #{$0} [options]"
+		opts.on("-i FILENAME", "Input file") { |arg| input = File.open(arg, File::RDONLY) }
+		opts.on("-o FILENAME", "Output file") { |arg| output = File.open(arg, File::CREAT|File::WRONLY|File::TRUNC) }
+	end.parse! ARGV
+
 	input = $stdin unless input
 	output = $stdout unless output
 

data/swig-interfaces/FXFileDialog.i

@@ -63,7 +63,7 @@ public:
         VALUE result = rb_ary_new();
         FXString *filenames = self->getFilenames();
         if (filenames) {
-            register FXString *p = filenames;
+            FXString *p = filenames;
             while ((*p) != FXString::null) {
                 rb_ary_push(result, to_ruby(*p));
                 p++;
@@ -232,7 +232,7 @@ public:
         FXString *filenames = FXFileDialog::getOpenFilenames(owner, caption,
           path, patterns, initial);
         if (filenames) {
-            register FXString *p = filenames;
+            FXString *p = filenames;
             while ((*p) != FXString::null) {
                 rb_ary_push(result, to_ruby(*p));
                 p++;

data/swig-interfaces/FXFileSelector.i

@@ -132,7 +132,7 @@ public:
         VALUE result = rb_ary_new();
         FXString *filenames = self->getFilenames();
         if (filenames) {
-            register FXString *p = filenames;
+            FXString *p = filenames;
             while ((*p) != FXString::null) {
                 rb_ary_push(result, to_ruby(*p));
                 p++;

data/swig-interfaces/FXGLViewer.i

@@ -275,7 +275,7 @@ public:
       VALUE objects = rb_ary_new();
       FXGLObject** items = self->lasso(x1, y1, x2, y2);
       if (items) {
-        register FXGLObject** p = items;
+        FXGLObject** p = items;
         while (*p) {
           rb_ary_push(objects, to_ruby(*p));
           p++;

data/swig-interfaces/ruby-typemaps.i

@@ -775,7 +775,7 @@ inline void* to_FXEvent(VALUE obj){
   $result=Qnil;
   if($1){
     $result=rb_ary_new();
-    register FXGLObject** p=$1;
+    FXGLObject** p=$1;
     while(*p){
       rb_ary_push($result,to_ruby(*p));
       p++;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fxruby
 version: !ruby/object:Gem::Version
-  version: 1.6.46
+  version: 1.6.48
 platform: x64-mingw32
 authors:
 - Lyle Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-19 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -33,6 +33,7 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - History.md
+- README.md
 - lib/fox16/accel_table.rb
 - lib/fox16/aliases.rb
 - lib/fox16/bitmapview.rb
@@ -948,7 +949,6 @@ files:
 - ext/fox16_c/unregisterOwnedObjects.cpp
 - fxruby.gemspec
 - index.html
-- lib/2.5/fox16_c.so
 - lib/2.6/fox16_c.so
 - lib/2.7/fox16_c.so
 - lib/3.0/fox16_c.so
@@ -1189,7 +1189,6 @@ files:
 - rdoc-sources/FXXBMImage.rb
 - rdoc-sources/FXXPMIcon.rb
 - rdoc-sources/FXXPMImage.rb
-- rdoc-sources/Makefile
 - rdoc-sources/README.rdoc
 - rdoc-sources/fxdefs.rb
 - scripts/build-fox.rb
@@ -1521,7 +1520,7 @@ metadata:
 post_install_message: 
 rdoc_options:
 - "--main"
-- README.rdoc
+- README.md
 - "--title"
 - FXRuby API Documentation
 require_paths:
@@ -1530,7 +1529,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
   - - "<"
     - !ruby/object:Gem::Version
       version: 3.1.dev

data/rdoc-sources/Makefile

@@ -1,23 +0,0 @@
-SOURCES = *.rb \
-        ../lib/fox/calendar.rb \
-        ../lib/fox/chore.rb \
-        ../lib/fox/core.rb \
-        ../lib/fox/glgroup.rb \
-        ../lib/fox/glshapes.rb \
-        ../lib/fox/input.rb \
-        ../lib/fox/iterators.rb \
-        ../lib/fox/responder2.rb \
-        ../lib/fox/scintilla.rb \
-        ../lib/fox/signal.rb \
-        ../lib/fox/timeout.rb \
-        ../lib/fox/undolist.rb \
-        ../lib/fox/version.rb
-
-rdoc:
- @rdoc --op ../doc/api --main README.rdoc $(SOURCES) README.rdoc
-
-ri:
- @rdoc --ri $(SOURCES)
-
-clean:
- @rm -rf ../doc/api