fxruby 1.6.39-x64-mingw32 → 1.6.44-x64-mingw32

data/ext/fox16_c/make_impl.rb

@@ -1,6 +1,6 @@
 #!/bin/env ruby
 
-$special_stubclasses = ["FXGLSHAPE", "FXICONITEM", "FXTABLE", "FXTABLEITEM", "FXTREEITEM"]
+$special_stubclasses = ["FXGLSHAPE", "FXICONITEM", "FXTABLE", "FXTABLEITEM", "FXTEXT", "FXTREEITEM"]
 
 class Processor
   def initialize

data/fxruby.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["lyle@lylejohnson.name", "lars@greiz-reinsdorf.de"]
 
   spec.summary       = %q{FXRuby is the Ruby binding to the FOX GUI toolkit.}
-  spec.homepage      = "http://fxruby.org/"
+  spec.homepage      = "https://github.com/larskanis/fxruby"
   spec.license       = 'LGPL-2.1'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -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.3", "< 4"]
 
   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

@@ -133,6 +133,13 @@ module Fox
       # Default: make 6 control points
       def makeControlPoints
       end
+
+      protected def apply_dc(dc)
+        oldForeground = dc.foreground
+        dc.foreground = foreground
+        yield
+        dc.foreground = oldForeground
+      end
     end
 
     class ShapeGroup
@@ -191,29 +198,28 @@ module Fox
       end
 
       def draw(dc)
-        # Save old values
-        oldForeground = dc.foreground
-        oldLineWidth = dc.lineWidth
-        oldLineCap = dc.lineCap
-        oldLineJoin = dc.lineJoin
-        oldLineStyle = dc.lineStyle
-
-        # Set properties for this line
-        dc.foreground = foreground
-        dc.lineWidth = lineWidth
-        dc.lineCap = lineCap
-        dc.lineJoin = lineJoin
-        dc.lineStyle = lineStyle
-
-        # Draw the line
-        dc.drawLine(x1, y1, x2, y2)
-
-        # Restore old properties
-        dc.lineWidth = oldLineWidth
-        dc.lineCap = oldLineCap
-        dc.lineJoin = oldLineJoin
-        dc.lineStyle = oldLineStyle
-        dc.foreground = oldForeground
+        apply_dc(dc) do
+          # Save old values
+          oldLineWidth = dc.lineWidth
+          oldLineCap = dc.lineCap
+          oldLineJoin = dc.lineJoin
+          oldLineStyle = dc.lineStyle
+
+          # Set properties for this line
+          dc.lineWidth = lineWidth
+          dc.lineCap = lineCap
+          dc.lineJoin = lineJoin
+          dc.lineStyle = lineStyle
+
+          # Draw the line
+          dc.drawLine(x1, y1, x2, y2)
+
+          # Restore old properties
+          dc.lineWidth = oldLineWidth
+          dc.lineCap = oldLineCap
+          dc.lineJoin = oldLineJoin
+          dc.lineStyle = oldLineStyle
+        end
       end
     end
 
@@ -228,31 +234,42 @@ module Fox
       end
 
       def draw(dc)
-        oldForeground = dc.foreground
-        dc.foreground = foreground
-        dc.drawRectangle(x, y, width, height)
-        dc.foreground = oldForeground
+        apply_dc(dc) do
+          dc.lineWidth = 5 if selected?
+          dc.drawRectangle(x, y, width, height)
+        end
       end
     end
 
-    class TextShape < RectangleShape
+    class TextShape < Shape
 
       attr_reader :font, :text
+      attr_accessor :width, :height
 
       def initialize(x, y, w, h, text=nil)
-        super(x, y, w, h)
+        super(x, y)
+        @width = w
+        @height = h
         @text = text
         @font = FXApp.instance.normalFont
       end
 
       def draw(dc)
-        super(dc)
-        oldForeground = dc.foreground
-        oldTextFont = dc.font
-        dc.font = @font
-        dc.drawImageText(x, y, text)
-        dc.font = oldTextFont if oldTextFont
-        dc.foreground = oldForeground
+        old_foreground = dc.foreground
+        apply_dc(dc) do
+          if selected?
+            dc.lineWidth = 5
+            dc.drawRectangle(x - 3, y - 3, width + 6, height + 6)
+          end
+
+          old_background = dc.background
+          dc.background = old_foreground
+          oldTextFont = dc.font
+          dc.font = @font
+          dc.drawImageText(x, y + height, text)
+          dc.font = oldTextFont if oldTextFont
+          dc.background = old_foreground
+        end
       end
     end
 
@@ -274,14 +291,13 @@ module Fox
       end
 
       def draw(dc)
-        oldForeground = dc.foreground
-        oldLineWidth = dc.lineWidth
-        dc.foreground = foreground
-        dc.lineWidth = 5 if selected?
-        dc.drawArc(x, y, width, height,      0, 64*180)
-        dc.drawArc(x, y, width, height, 64*180, 64*360)
-        dc.foreground = oldForeground
-        dc.lineWidth = oldLineWidth
+        apply_dc(dc) do
+          oldLineWidth = dc.lineWidth
+          dc.lineWidth = 5 if selected?
+          dc.drawArc(x, y, width, height,      0, 64*180)
+          dc.drawArc(x, y, width, height, 64*180, 64*360)
+          dc.lineWidth = oldLineWidth
+        end
       end
     end
 
@@ -293,11 +309,26 @@ module Fox
       attr_accessor :image
 
       def initialize(x, y, image)
+        super(x, y)
         @image = image
       end
 
+      def width
+        @image.width
+      end
+
+      def height
+        @image.height
+      end
+
       def draw(dc)
-        dc.drawImage(image)
+        apply_dc(dc) do
+          if selected?
+            dc.lineWidth = 5
+            dc.drawRectangle(x - 3, y - 3, width + 5, height + 5)
+          end
+          dc.drawImage(image, x, y)
+        end
       end
     end
 
@@ -312,7 +343,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 +353,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 +494,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 +517,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 +525,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 +535,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 +579,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 +596,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 +615,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/glgroup.rb

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

data/lib/fox16/glshapes.rb

@@ -9,6 +9,7 @@ module Fox
   # OpenGL point object
   #
   class FXGLPoint < FXGLObject
+    include OpenGL
 
     # Point position, in model coordinates (a 3-element array)
     attr_accessor :pos
@@ -47,20 +48,20 @@ module Fox
     # Draw this point into _viewer_ (an FXGLViewer instance).
     #
     def draw(viewer)
-      GL::Color(0.0, 0.0, 1.0)
-      GL::PointSize(HANDLE_SIZE)
-      GL::Begin(GL::POINTS)
-      GL::Vertex(@pos)
-      GL::End()
+      glColor3d(0.0, 0.0, 1.0)
+      glPointSize(HANDLE_SIZE)
+      glBegin(GL_POINTS)
+      glVertex3d(*@pos)
+      glEnd()
     end
 
     #
     # Perform hit test for this point in _viewer_ (an FXGLViewer instance).
     #
     def hit(viewer)
-      GL::Begin(GL::POINTS)
-      GL::Vertex(@pos)
-      GL::End()
+      glBegin(GL_POINTS)
+      glVertex3d(*@pos)
+      glEnd()
     end
   end
 
@@ -68,6 +69,7 @@ module Fox
   # OpenGL line object
   #
   class FXGLLine < FXGLObject
+    include OpenGL
 
     # Starting point for line [FXGLPoint]
     attr_accessor :fm
@@ -93,14 +95,14 @@ module Fox
     def initialize(*args)
       super()
       if args.length == 0
-	@fm = FXGLPoint.new(-0.5, 0.0, 0.0)
-	@to = FXGLPoint.new( 0.5, 0.0, 0.0)
+        @fm = FXGLPoint.new(-0.5, 0.0, 0.0)
+        @to = FXGLPoint.new( 0.5, 0.0, 0.0)
       elsif args.length == 1
-	@fm = args[0].fm
-	@to = args[0].to
+        @fm = args[0].fm
+        @to = args[0].to
       else
-	@fm = FXGLPoint.new(args[0], args[1], args[2])
-	@to = FXGLPoint.new(args[3], args[4], args[5])
+        @fm = FXGLPoint.new(args[0], args[1], args[2])
+        @to = FXGLPoint.new(args[3], args[4], args[5])
       end
     end
 
@@ -120,22 +122,22 @@ module Fox
     # Draw this line into _viewer_ (an FXGLViewer instance).
     #
     def draw(viewer)
-      GL::Color(1.0, 0.0, 0.0)
-      GL::PointSize(HANDLE_SIZE)
-      GL::Begin(GL::LINES)
-      GL::Vertex(@fm.pos)
-      GL::Vertex(@to.pos)
-      GL::End()
+      glColor3d(1.0, 0.0, 0.0)
+      glPointSize(HANDLE_SIZE)
+      glBegin(GL_LINES)
+      glVertex3d(*@fm.pos)
+      glVertex3d(*@to.pos)
+      glEnd()
     end
 
     #
     # Perform hit-test for this line in _viewer_ (an FXGLViewer instance).
     #
     def hit(viewer)
-      GL::Begin(GL::LINES)
-      GL::Vertex(@fm.pos)
-      GL::Vertex(@to.pos)
-      GL::End()
+      glBegin(GL_LINES)
+      glVertex3d(*@fm.pos)
+      glVertex3d(*@to.pos)
+      glEnd()
     end
   end
 
@@ -143,6 +145,7 @@ module Fox
   # OpenGL cube object
   #
   class FXGLCube < FXGLShape
+    include OpenGL
 
     # Cube width [Float]
     attr_accessor :width
@@ -173,17 +176,17 @@ module Fox
     #
     def initialize(*args)
       if args.length == 7
-	super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE,
+        super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE,
               args[6], args[6])
       else
-	super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE)
+        super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE)
       end
       @width = args[3] ? args[3] : 1.0
       @height = args[4] ? args[4] : 1.0
       @depth = args[5] ? args[5] : 1.0
       setRange(FXRangef.new(-0.5*@width, 0.5*@width,
-                           -0.5*@height, 0.5*@height,
-                           -0.5*@depth, 0.5*@depth))
+                          -0.5*@height, 0.5*@height,
+                          -0.5*@depth, 0.5*@depth))
     end
 
     #
@@ -195,58 +198,58 @@ module Fox
       zmin, zmax = -0.5*@depth, 0.5*@depth
 
       # Draw low face
-      GL::Begin(GL::TRIANGLE_STRIP)
-	GL::Normal(0.0, 0.0, -1.0)
-	GL::Vertex(xmin, ymin, zmin)
-	GL::Vertex(xmin, ymax, zmin)
-	GL::Vertex(xmax, ymin, zmin)
-	GL::Vertex(xmax, ymax, zmin)
-      GL::End()
+      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()
 
       # Draw east face
-      GL::Begin(GL::TRIANGLE_STRIP)
-	GL::Normal(1.0, 0.0, 0.0)
-	GL::Vertex(xmax, ymin, zmin)
-	GL::Vertex(xmax, ymax, zmin)
-	GL::Vertex(xmax, ymin, zmax)
-	GL::Vertex(xmax, ymax, zmax)
-      GL::End()
+      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()
 
       # Draw high face
-      GL::Begin(GL::TRIANGLE_STRIP)
-	GL::Normal(0.0, 0.0, 1.0)
-	GL::Vertex(xmax, ymin, zmax)
-	GL::Vertex(xmax, ymax, zmax)
-	GL::Vertex(xmin, ymin, zmax)
-	GL::Vertex(xmin, ymax, zmax)
-      GL::End()
+      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()
 
       # Draw west face
-      GL::Begin(GL::TRIANGLE_STRIP)
-	GL::Normal(-1.0, 0.0, 0.0)
-	GL::Vertex(xmin, ymin, zmax)
-	GL::Vertex(xmin, ymax, zmax)
-	GL::Vertex(xmin, ymin, zmin)
-	GL::Vertex(xmin, ymax, zmin)
-      GL::End()
+      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()
 
       # Draw north face
-      GL::Begin(GL::TRIANGLE_STRIP)
-	GL::Normal(0.0, 1.0, 0.0)
-	GL::Vertex(xmin, ymax, zmin)
-	GL::Vertex(xmin, ymax, zmax)
-	GL::Vertex(xmax, ymax, zmin)
-	GL::Vertex(xmax, ymax, zmax)
-      GL::End()
+      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()
 
       # Draw south face
-      GL::Begin(GL::TRIANGLE_STRIP)
-	GL::Normal(0.0, -1.0, 0.0)
-	GL::Vertex(xmin, ymin, zmax)
-	GL::Vertex(xmin, ymin, zmin)
-	GL::Vertex(xmax, ymin, zmax)
-	GL::Vertex(xmax, ymin, zmin)
-      GL::End()
+      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()
     end
   end
 
@@ -254,6 +257,9 @@ module Fox
   # OpenGL cone object
   #
   class FXGLCone < FXGLShape
+    include OpenGL
+    include GLU
+
     # Cone fidelity
     SLICES_NUMBER = 20
     STACKS_NUMBER = 20
@@ -293,9 +299,9 @@ module Fox
     #
     def initialize(*args)
       if args.length == 5
-	super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE)
+        super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE)
       elsif args.length == 6
-	super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE,
+        super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE,
               args[5], args[5])
       end
       @height = args[3] ? args[3] : 1.0
@@ -310,15 +316,15 @@ module Fox
     # Draw this cone into _viewer_ (an FXGLViewer instance).
     #
     def drawshape(viewer)
-      quad = GLU::NewQuadric()
-      GLU::QuadricDrawStyle(quad, GLU::FILL)
-      GL::PushMatrix()
-      GL::Rotate(-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()
+      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()
     end
   end
 
@@ -326,6 +332,9 @@ module Fox
   # OpenGL cylinder object
   #
   class FXGLCylinder < FXGLShape
+    include OpenGL
+    include GLU
+
     # Cylinder fidelity
     SLICES_NUMBER = 20
     STACKS_NUMBER = 20
@@ -365,9 +374,9 @@ module Fox
     #
     def initialize(*args)
       if args.length == 5
-	super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE)
+        super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE)
       else
-	super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE,
+        super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE,
               args[5], args[5])
       end
       @height = args[3] ? args[3] : 1.0
@@ -382,18 +391,18 @@ module Fox
     # Draw this cylinder into _viewer_ (an FXGLViewer instance).
     #
     def drawshape(viewer)
-      quad = GLU::NewQuadric()
-      GLU::QuadricDrawStyle(quad, GLU::FILL)
-      GL::PushMatrix()
-      GL::Rotate(-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::Translate(0, 0, @height)
-      GLU::QuadricOrientation(quad, GLU::OUTSIDE)
-      GLU::Disk(quad, 0, @radius, @slices, @loops)
-      GL::PopMatrix()
-      GLU::DeleteQuadric(quad)
+      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)
     end
   end
 
@@ -401,6 +410,9 @@ module Fox
   # OpenGL sphere object
   #
   class FXGLSphere < FXGLShape
+    include OpenGL
+    include GLU
+
     # Sphere fidelity
     SLICES_NUMBER = 20
     STACKS_NUMBER = 20
@@ -448,10 +460,10 @@ module Fox
     # Draw this sphere into _viewer_ (an FXGLViewer instance).
     #
     def drawshape(viewer)
-      quad = GLU::NewQuadric()
-      GLU::QuadricDrawStyle(quad, GLU::FILL)
-      GLU::Sphere(quad, @radius, @slices, @stacks)
-      GLU::DeleteQuadric(quad)
+      quad = gluNewQuadric()
+      gluQuadricDrawStyle(quad, GLU_FILL)
+      gluSphere(quad, @radius, @slices, @stacks)
+      gluDeleteQuadric(quad)
     end
   end
 end