fxruby 1.6.5 → 1.6.6

data/examples/dragdrop.rb

@@ -1,29 +1,31 @@
 require 'fox16'
+require 'fox16/kwargs'
 
 include Fox
 
 class DragDropWindow < FXMainWindow
+  
   def initialize(anApp)
     # Initialize base class
-    super(anApp, "Drag and Drop", nil, nil, DECOR_ALL, 0, 0, 400, 300)
+    super(anApp, "Drag and Drop", :opts => DECOR_ALL, :width => 400, :height => 300)
     
     # Fill main window with canvas
-    @canvas = FXCanvas.new(self, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    @canvas = FXCanvas.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
     @canvas.backColor = "red"
     
     # Enable canvas for drag-and-drop messages
     @canvas.dropEnable
     
     # Handle expose events on the canvas
-    @canvas.connect(SEL_PAINT) { |sender, sel, event|
-      FXDCWindow.new(@canvas, event) { |dc|
+    @canvas.connect(SEL_PAINT) do |sender, sel, event|
+      FXDCWindow.new(@canvas, event) do |dc|
         dc.foreground = @canvas.backColor
         dc.fillRectangle(event.rect.x, event.rect.y, event.rect.w, event.rect.h)
-      }
-    }
+      end
+    end
 
     # Handle left button press
-    @canvas.connect(SEL_LEFTBUTTONPRESS) {
+    @canvas.connect(SEL_LEFTBUTTONPRESS) do
       #
       # Capture (grab) the mouse when the button goes down, so that all future
       # mouse events will be reported to this widget, even if those events occur
@@ -34,49 +36,44 @@ class DragDropWindow < FXMainWindow
       # Advertise which drag types we can offer
       dragTypes = [FXWindow.colorType]
       @canvas.beginDrag(dragTypes)
-    }
+    end
     
     # Handle mouse motion events
-    @canvas.connect(SEL_MOTION) { |sender, sel, event|
+    @canvas.connect(SEL_MOTION) do |sender, sel, event|
       if @canvas.dragging?
         @canvas.handleDrag(event.root_x, event.root_y)
-	unless @canvas.didAccept == DRAG_REJECT
-	  @canvas.dragCursor = getApp().getDefaultCursor(DEF_SWATCH_CURSOR)
-	else
-	  @canvas.dragCursor = getApp().getDefaultCursor(DEF_DNDSTOP_CURSOR)
-	end
+        unless @canvas.didAccept == DRAG_REJECT
+          @canvas.dragCursor = getApp().getDefaultCursor(DEF_SWATCH_CURSOR)
+        else
+          @canvas.dragCursor = getApp().getDefaultCursor(DEF_DNDSTOP_CURSOR)
+        end
       end
-    }
+    end
 
     # Handle SEL_DND_MOTION messages from the canvas
-    @canvas.connect(SEL_DND_MOTION) {
-      if @canvas.offeredDNDType?(FROM_DRAGNDROP, FXWindow.colorType)
-        @canvas.acceptDrop
-      end
-    }
+    @canvas.connect(SEL_DND_MOTION) do
+      @canvas.acceptDrop if @canvas.offeredDNDType?(FROM_DRAGNDROP, FXWindow.colorType)
+    end
 
     # Handle left button release
-    @canvas.connect(SEL_LEFTBUTTONRELEASE) {
+    @canvas.connect(SEL_LEFTBUTTONRELEASE) do
       @canvas.ungrab
       @canvas.endDrag
-    }
+    end
     
     # Handle SEL_DND_DROP message from the canvas
-    @canvas.connect(SEL_DND_DROP) {
+    @canvas.connect(SEL_DND_DROP) do
       # Try to obtain the data as color values first
       data = @canvas.getDNDData(FROM_DRAGNDROP, FXWindow.colorType)
-      unless data.nil?
-        # Update canvas background color
-        @canvas.backColor = Fox.fxdecodeColorData(data)
-      end
-    }
+
+      # Update canvas background color
+      @canvas.backColor = Fox.fxdecodeColorData(data) unless data.nil?
+    end
 
     # Handle request for DND data
-    @canvas.connect(SEL_DND_REQUEST) { |sender, sel, event|
-      if event.target == FXWindow.colorType
-        @canvas.setDNDData(FROM_DRAGNDROP, FXWindow.colorType, Fox.fxencodeColorData(@canvas.backColor))
-      end
-    }
+    @canvas.connect(SEL_DND_REQUEST) do |sender, sel, event|
+      @canvas.setDNDData(FROM_DRAGNDROP, FXWindow.colorType, Fox.fxencodeColorData(@canvas.backColor)) if event.target == FXWindow.colorType
+    end
   end
 
   def create

data/examples/dragsource.rb

@@ -1,26 +1,28 @@
 require 'fox16'
+require 'fox16/kwargs'
 
 include Fox
 
 class DragSource < FXMainWindow
+  
   def initialize(anApp)
     # Initialize base class
-    super(anApp, "Drag Source", nil, nil, DECOR_ALL, 0, 0, 400, 300)
+    super(anApp, "Drag Source", :opts => DECOR_ALL, :width => 400, :height => 300)
     
     # Fill main window with canvas
-    @canvas = FXCanvas.new(self, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    @canvas = FXCanvas.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
     @canvas.backColor = "red"
     
     # Handle expose events on the canvas
-    @canvas.connect(SEL_PAINT) { |sender, sel, event|
-      FXDCWindow.new(@canvas, event) { |dc|
+    @canvas.connect(SEL_PAINT) do |sender, sel, event|
+      FXDCWindow.new(@canvas, event) do |dc|
         dc.foreground = @canvas.backColor
         dc.fillRectangle(event.rect.x, event.rect.y, event.rect.w, event.rect.h)
-      }
-    }
+      end
+    end
 
     # Handle left button press
-    @canvas.connect(SEL_LEFTBUTTONPRESS) {
+    @canvas.connect(SEL_LEFTBUTTONPRESS) do
       #
       # Capture (grab) the mouse when the button goes down, so that all future
       # mouse events will be reported to this widget, even if those events occur
@@ -31,32 +33,30 @@ class DragSource < FXMainWindow
       # Advertise which drag types we can offer
       dragTypes = [FXWindow.colorType]
       @canvas.beginDrag(dragTypes)
-    }
+    end
     
     # Handle mouse motion events
-    @canvas.connect(SEL_MOTION) { |sender, sel, event|
+    @canvas.connect(SEL_MOTION) do |sender, sel, event|
       if @canvas.dragging?
         @canvas.handleDrag(event.root_x, event.root_y)
-	unless @canvas.didAccept == DRAG_REJECT
-	  @canvas.dragCursor = getApp().getDefaultCursor(DEF_SWATCH_CURSOR)
-	else
-	  @canvas.dragCursor = getApp().getDefaultCursor(DEF_DNDSTOP_CURSOR)
-	end
+        unless @canvas.didAccept == DRAG_REJECT
+          @canvas.dragCursor = getApp().getDefaultCursor(DEF_SWATCH_CURSOR)
+        else
+          @canvas.dragCursor = getApp().getDefaultCursor(DEF_DNDSTOP_CURSOR)
+        end
       end
-    }
+    end
 
     # Handle left button release
-    @canvas.connect(SEL_LEFTBUTTONRELEASE) {
+    @canvas.connect(SEL_LEFTBUTTONRELEASE) do
       @canvas.ungrab
       @canvas.endDrag
-    }
+    end
     
     # Handle request for DND data
-    @canvas.connect(SEL_DND_REQUEST) { |sender, sel, event|
-      if event.target == FXWindow.colorType
-        @canvas.setDNDData(FROM_DRAGNDROP, FXWindow.colorType, Fox.fxencodeColorData(@canvas.backColor))
-      end
-    }
+    @canvas.connect(SEL_DND_REQUEST) do |sender, sel, event|
+      @canvas.setDNDData(FROM_DRAGNDROP, FXWindow.colorType, Fox.fxencodeColorData(@canvas.backColor)) if event.target == FXWindow.colorType
+    end
   end
 
   def create

data/examples/dropsite.rb

@@ -1,42 +1,41 @@
 require 'fox16'
+require 'fox16/kwargs'
 
 include Fox
 
 class DropSite < FXMainWindow
+  
   def initialize(anApp)
     # Initialize base class
-    super(anApp, "Drop Site", nil, nil, DECOR_ALL, 0, 0, 400, 300)
+    super(anApp, "Drop Site",:opts => DECOR_ALL, :width => 400, :height => 300)
     
     # Fill main window with canvas
-    @canvas = FXCanvas.new(self, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    @canvas = FXCanvas.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
     
     # Handle expose events on the canvas
-    @canvas.connect(SEL_PAINT) { |sender, sel, event|
-      FXDCWindow.new(@canvas, event) { |dc|
+    @canvas.connect(SEL_PAINT) do |sender, sel, event|
+      FXDCWindow.new(@canvas, event) do |dc|
         dc.foreground = @canvas.backColor
         dc.fillRectangle(event.rect.x, event.rect.y, event.rect.w, event.rect.h)
-      }
-    }
+      end
+    end
 
     # Enable canvas for drag-and-drop messages
     @canvas.dropEnable
     
     # Handle SEL_DND_MOTION messages from the canvas
-    @canvas.connect(SEL_DND_MOTION) {
-      if @canvas.offeredDNDType?(FROM_DRAGNDROP, FXWindow.colorType)
-        @canvas.acceptDrop
-      end
-    }
+    @canvas.connect(SEL_DND_MOTION) do
+      @canvas.acceptDrop if @canvas.offeredDNDType?(FROM_DRAGNDROP, FXWindow.colorType)
+    end
 
     # Handle SEL_DND_DROP message from the canvas
-    @canvas.connect(SEL_DND_DROP) {
+    @canvas.connect(SEL_DND_DROP) do
       # Try to obtain the data as color values first
       data = @canvas.getDNDData(FROM_DRAGNDROP, FXWindow.colorType)
-      unless data.nil?
-        # Update canvas background color
-        @canvas.backColor = Fox.fxdecodeColorData(data)
-      end
-    }
+
+      # Update canvas background color
+      @canvas.backColor = Fox.fxdecodeColorData(data) unless data.nil?
+    end
   end
 
   def create

data/examples/foursplit.rb

@@ -1,13 +1,14 @@
 #!/usr/bin/env ruby
 
 require 'fox16'
+require 'fox16/kwargs'
 
 include Fox
 
 class FourSplitWindow < FXMainWindow
   def initialize(app)
     # Call the base class initialize() first
-    super(app, "4-Way Splitter Test", nil, nil, DECOR_ALL, 0, 0, 800, 600, 0, 0)
+    super(app, "4-Way Splitter Test", :opts => DECOR_ALL, :width => 800, :height => 600)
 
     # Menu bar, along the top
     menubar = FXMenuBar.new(self, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
@@ -47,14 +48,11 @@ class FourSplitWindow < FXMainWindow
     # but the fourth is itself another 4-splitter. There is no
     # restriction on nesting these kinds of widgets.
 
-    FXButton.new(splitter, "Top &Left\tThis splitter tracks", nil,
-      nil, 0, FRAME_RAISED|FRAME_THICK)
+    FXButton.new(splitter, "Top &Left\tThis splitter tracks", :opts => FRAME_RAISED|FRAME_THICK)
 
-    FXButton.new(splitter, "Top &Right\tThis splitter tracks", nil,
-      nil, 0, FRAME_RAISED|FRAME_THICK)
+    FXButton.new(splitter, "Top &Right\tThis splitter tracks", :opts => FRAME_RAISED|FRAME_THICK)
 
-    FXButton.new(splitter, "&Bottom Left\tThis splitter tracks", nil,
-      nil, 0, FRAME_SUNKEN|FRAME_THICK)
+    FXButton.new(splitter, "&Bottom Left\tThis splitter tracks", :opts => FRAME_SUNKEN|FRAME_THICK)
 
     subsplitter = FX4Splitter.new(splitter, LAYOUT_FILL_X|LAYOUT_FILL_Y)
 
@@ -66,20 +64,17 @@ class FourSplitWindow < FXMainWindow
     end
 
     button = FXButton.new(subsplitter,
-      "the&y CAN\tThis splitter does NOT track", nil,
-      nil, 0, FRAME_SUNKEN|FRAME_THICK)
+      "the&y CAN\tThis splitter does NOT track", :opts => FRAME_SUNKEN|FRAME_THICK)
     button.backColor = FXRGB(128, 0, 0)
     button.textColor = FXRGB(255, 255, 255)
 
     button = FXButton.new(subsplitter,
-      "be &NESTED\tThis splitter does NOT track", nil,
-      nil, 0, FRAME_SUNKEN|FRAME_THICK)
+      "be &NESTED\tThis splitter does NOT track", :opts => FRAME_SUNKEN|FRAME_THICK)
     button.backColor = FXRGB(0, 0, 200)
     button.textColor = FXRGB(255, 255, 255)
 
     button = FXButton.new(subsplitter,
-      "&arbitrarily!\tThis splitter does NOT track", nil,
-      nil, 0, FRAME_SUNKEN|FRAME_THICK)
+      "&arbitrarily!\tThis splitter does NOT track", :opts => FRAME_SUNKEN|FRAME_THICK)
     button.backColor = FXRGB(128, 128, 0)
     button.textColor = FXRGB(255, 255, 255)
     

data/examples/gltest.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'fox16'
+require 'fox16/kwargs'
 begin
   require 'opengl'
 rescue LoadError
@@ -193,7 +194,7 @@ class GLTestWindow < FXMainWindow
 
   def initialize(app)
     # Invoke the base class initializer
-    super(app, "OpenGL Test Application", nil, nil, DECOR_ALL, 0, 0, 800, 600)
+    super(app, "OpenGL Test Application", :opts => DECOR_ALL, :width => 800, :height => 600)
 
     # Construct the main window elements
     frame = FXHorizontalFrame.new(self, LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y)
@@ -223,17 +224,14 @@ class GLTestWindow < FXMainWindow
     @glvisual = FXGLVisual.new(getApp(), VISUAL_DOUBLEBUFFER)
   
     # Drawing glcanvas
-    @glcanvas = FXGLCanvas.new(glpanel, @glvisual, nil, 0,
-      LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_TOP|LAYOUT_LEFT)
-    @glcanvas.connect(SEL_PAINT) {
-      drawScene
-    }
-    @glcanvas.connect(SEL_CONFIGURE) {
+    @glcanvas = FXGLCanvas.new(glpanel, @glvisual, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_TOP|LAYOUT_LEFT)
+    @glcanvas.connect(SEL_PAINT) { drawScene }
+    @glcanvas.connect(SEL_CONFIGURE) do
       if @glcanvas.makeCurrent
         GL.Viewport(0, 0, @glcanvas.width, @glcanvas.height)
         @glcanvas.makeNonCurrent
       end
-    }
+    end
   
     # Right pane for the buttons
     buttonFrame = FXVerticalFrame.new(frame, LAYOUT_FILL_Y|LAYOUT_TOP|LAYOUT_LEFT)
@@ -251,37 +249,36 @@ class GLTestWindow < FXMainWindow
     spinTimerBtn = FXButton.new(buttonFrame, "Spin &Timer\tSpin using interval timers\nNote the app blocks until the interal has elapsed...",nil,nil,0,FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_LEFT)
     spinTimerBtn.padLeft, spinTimerBtn.padRight = 10, 10
     spinTimerBtn.padTop, spinTimerBtn.padBottom = 5, 5
-    spinTimerBtn.connect(SEL_COMMAND) {
+    spinTimerBtn.connect(SEL_COMMAND) do
       @spinning = true
       @timer = getApp().addTimeout(TIMER_INTERVAL, method(:onTimeout))
-    }
-    spinTimerBtn.connect(SEL_UPDATE) { |sender, sel, ptr|
+    end
+    spinTimerBtn.connect(SEL_UPDATE) do |sender, sel, ptr|
       @spinning ? sender.disable : sender.enable
-    }
+    end
 
     # Spin according to chore
     spinChoreBtn = FXButton.new(buttonFrame,
       "Spin &Chore\tSpin as fast as possible using chores\nNote even though the
       app is very responsive, it never blocks;\nthere is always something to
-      do...", nil,
-      nil, 0, FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_LEFT)
+      do...", :opts => FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_LEFT)
     spinChoreBtn.padLeft, spinChoreBtn.padRight = 10, 10
     spinChoreBtn.padTop, spinChoreBtn.padBottom = 5, 5
-    spinChoreBtn.connect(SEL_COMMAND) {
+    spinChoreBtn.connect(SEL_COMMAND) do
       @spinning = true
       @chore = getApp().addChore(method(:onChore))
-    }
-    spinChoreBtn.connect(SEL_UPDATE) { |sender, sel, ptr|
+    end
+    spinChoreBtn.connect(SEL_UPDATE) do |sender, sel, ptr|
       @spinning ? sender.disable : sender.enable
-    }
+    end
   
     # Stop spinning
     stopBtn = FXButton.new(buttonFrame,
-      "&Stop Spin\tStop this mad spinning, I'm getting dizzy", nil,
-      nil, 0, FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_LEFT)
+      "&Stop Spin\tStop this mad spinning, I'm getting dizzy",
+      :opts => FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_LEFT)
     stopBtn.padLeft, stopBtn.padRight = 10, 10
     stopBtn.padTop, stopBtn.padBottom = 5, 5
-    stopBtn.connect(SEL_COMMAND) {
+    stopBtn.connect(SEL_COMMAND) do
       @spinning = false
       if @timer
         getApp().removeTimeout(@timer)
@@ -291,10 +288,10 @@ class GLTestWindow < FXMainWindow
         getApp().removeChore(@chore)
         @chore = nil
       end
-    }
-    stopBtn.connect(SEL_UPDATE) { |sender, sel, ptr|
+    end
+    stopBtn.connect(SEL_UPDATE) do |sender, sel, ptr|
       @spinning ? sender.enable : sender.disable
-    }
+    end
   
     # Exit button
     exitBtn = FXButton.new(buttonFrame, "&Exit\tExit the application", nil,

data/examples/glviewer.rb

@@ -2,6 +2,7 @@
 
 require 'fox16'
 require 'fox16/responder'
+require 'fox16/kwargs'
 begin
   require 'fox16/glshapes'
 rescue LoadError
@@ -23,67 +24,67 @@ class TabBook < FXTabBook
       "Angles\tCamera Angles\tSwitch to camera angles panel.")
 
     # Angles page
-    angles = FXMatrix.new(panels, 3, (FRAME_THICK|FRAME_RAISED|
-      MATRIX_BY_COLUMNS|LAYOUT_FILL_Y|LAYOUT_TOP|LAYOUT_LEFT))
-    angles.padLeft = 10
-    angles.padRight = 10
-    angles.padTop = 10
-    angles.padBottom = 10
+    angles = FXMatrix.new(panels, 3,
+      :opts => FRAME_THICK|FRAME_RAISED|MATRIX_BY_COLUMNS|LAYOUT_FILL_Y|LAYOUT_TOP|LAYOUT_LEFT,
+      :padding => 10)
 
     FXLabel.new(angles, "X:")
-    FXTextField.new(angles, 6, mdiclient, FXGLViewer::ID_ROLL,
+    FXTextField.new(angles, 6,
+      mdiclient, FXGLViewer::ID_ROLL,
       TEXTFIELD_INTEGER|JUSTIFY_RIGHT|FRAME_SUNKEN|FRAME_THICK)
-    x_dial = FXDial.new(angles, mdiclient, FXGLViewer::ID_DIAL_X,
-      (FRAME_SUNKEN|FRAME_THICK|DIAL_CYCLIC|DIAL_HORIZONTAL|
-       LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_CENTER_Y),
-      0, 0, 160, 14, 0, 0, 0, 0)
+    x_dial = FXDial.new(angles,
+      mdiclient, FXGLViewer::ID_DIAL_X,
+      :opts => FRAME_SUNKEN|FRAME_THICK|DIAL_CYCLIC|DIAL_HORIZONTAL|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_CENTER_Y,
+      :width => 160, :height => 14, :padding => 0)
     x_dial.tipText = "Rotate about X"
     x_dial.notchOffset = 900
 
     FXLabel.new(angles, "Y:")
-    FXTextField.new(angles, 6, mdiclient, FXGLViewer::ID_PITCH,
+    FXTextField.new(angles, 6,
+      mdiclient, FXGLViewer::ID_PITCH,
       TEXTFIELD_INTEGER|JUSTIFY_RIGHT|FRAME_SUNKEN|FRAME_THICK)
-    y_dial = FXDial.new(angles, mdiclient, FXGLViewer::ID_DIAL_Y,
-      (FRAME_SUNKEN|FRAME_THICK|DIAL_CYCLIC|DIAL_HORIZONTAL|
-       LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_CENTER_Y),
-      0, 0, 160, 14, 0, 0, 0, 0)
+    y_dial = FXDial.new(angles,
+      mdiclient, FXGLViewer::ID_DIAL_Y,
+      :opts => FRAME_SUNKEN|FRAME_THICK|DIAL_CYCLIC|DIAL_HORIZONTAL|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_CENTER_Y,
+      :width => 160, :height => 14, :padding => 0)
     y_dial.tipText = "Rotate about Y"
     y_dial.notchOffset = 900
 
     FXLabel.new(angles, "Z:")
-    FXTextField.new(angles, 6, mdiclient, FXGLViewer::ID_YAW,
+    FXTextField.new(angles, 6,
+      mdiclient, FXGLViewer::ID_YAW,
       TEXTFIELD_INTEGER|JUSTIFY_RIGHT|FRAME_SUNKEN|FRAME_THICK)
-    z_dial = FXDial.new(angles, mdiclient, FXGLViewer::ID_DIAL_Z,
-      (FRAME_SUNKEN|FRAME_THICK|DIAL_CYCLIC|DIAL_HORIZONTAL|
-       LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_CENTER_Y),
-      0, 0, 160, 14, 0, 0, 0, 0)
+    z_dial = FXDial.new(angles,
+      mdiclient, FXGLViewer::ID_DIAL_Z,
+      :opts => FRAME_SUNKEN|FRAME_THICK|DIAL_CYCLIC|DIAL_HORIZONTAL|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_CENTER_Y,
+      :width => 160, :height => 14, :padding => 0)
     z_dial.tipText = "Rotate about Z"
     z_dial.notchOffset = 900
 
     FXLabel.new(angles, "FOV:")
     fov = FXTextField.new(angles, 5, mdiclient, FXGLViewer::ID_FOV,
       JUSTIFY_RIGHT|FRAME_SUNKEN|FRAME_THICK)
-    FXFrame.new(angles, 0)
+    FXFrame.new(angles, :opts => FRAME_NONE)
     fov.tipText = "Field of view"
 
     FXLabel.new(angles, "Zoom:")
     zz = FXTextField.new(angles, 5, mdiclient, FXGLViewer::ID_ZOOM,
       JUSTIFY_RIGHT|FRAME_SUNKEN|FRAME_THICK)
-    FXFrame.new(angles, 0)
+    FXFrame.new(angles, :opts => FRAME_NONE)
     zz.tipText = "Zooming"
 
     FXLabel.new(angles, "Scale X:")
     FXTextField.new(angles, 5, mdiclient, FXGLViewer::ID_SCALE_X,
       JUSTIFY_RIGHT|FRAME_SUNKEN|FRAME_THICK)
-    FXFrame.new(angles, 0)
+    FXFrame.new(angles, :opts => FRAME_NONE)
     FXLabel.new(angles, "Scale Y:")
     FXTextField.new(angles, 5, mdiclient, FXGLViewer::ID_SCALE_Y,
       JUSTIFY_RIGHT|FRAME_SUNKEN|FRAME_THICK)
-    FXFrame.new(angles, 0)
+    FXFrame.new(angles, :opts => FRAME_NONE)
     FXLabel.new(angles, "Scale Z:")
     FXTextField.new(angles, 5, mdiclient, FXGLViewer::ID_SCALE_Z,
       JUSTIFY_RIGHT|FRAME_SUNKEN|FRAME_THICK)
-    FXFrame.new(angles, 0)
+    FXFrame.new(angles, :opts => FRAME_NONE)
   end
 
   def createColorsPage(panels, mdiclient)
@@ -91,33 +92,30 @@ class TabBook < FXTabBook
     FXTabItem.new(panels, "Colors\tColors\tSwitch to color panel.")
 
     # Colors page
-    colors = FXMatrix.new(panels, 2, (MATRIX_BY_COLUMNS|FRAME_THICK|
-      FRAME_RAISED|LAYOUT_FILL_Y|LAYOUT_CENTER_X|LAYOUT_TOP|LAYOUT_LEFT))
-    colors.padLeft = 10
-    colors.padRight = 10
-    colors.padTop = 10
-    colors.padBottom = 10
+    colors = FXMatrix.new(panels, 2,
+      MATRIX_BY_COLUMNS|FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_Y|LAYOUT_CENTER_X|LAYOUT_TOP|LAYOUT_LEFT,
+      :padding => 10)
     FXLabel.new(colors, "Background:", nil,
       LAYOUT_RIGHT|LAYOUT_CENTER_Y|JUSTIFY_RIGHT)
     FXColorWell.new(colors, 0, mdiclient, FXGLViewer::ID_BACK_COLOR,
-      COLORWELL_OPAQUEONLY|LAYOUT_TOP|LAYOUT_LEFT, 0, 0, 0, 0, 0, 0, 0, 0)
+      COLORWELL_OPAQUEONLY|LAYOUT_TOP|LAYOUT_LEFT, :padding => 0)
     FXLabel.new(colors, "Ambient:", nil,
       LAYOUT_RIGHT|LAYOUT_CENTER_Y|JUSTIFY_RIGHT)
     FXColorWell.new(colors, 0, mdiclient, FXGLViewer::ID_AMBIENT_COLOR,
-      COLORWELL_OPAQUEONLY|LAYOUT_TOP|LAYOUT_LEFT, 0, 0, 0, 0, 0, 0, 0, 0)
+      COLORWELL_OPAQUEONLY|LAYOUT_TOP|LAYOUT_LEFT, :padding => 0)
 
     FXLabel.new(colors, "Light Amb:", nil,
       LAYOUT_RIGHT|LAYOUT_CENTER_Y|JUSTIFY_RIGHT)
     FXColorWell.new(colors, 0, mdiclient, FXGLViewer::ID_LIGHT_AMBIENT,
-      COLORWELL_OPAQUEONLY|LAYOUT_TOP|LAYOUT_LEFT, 0, 0, 0, 0, 0, 0, 0, 0)
+      COLORWELL_OPAQUEONLY|LAYOUT_TOP|LAYOUT_LEFT, :padding => 0)
     FXLabel.new(colors, "Light Diff:", nil,
       LAYOUT_RIGHT|LAYOUT_CENTER_Y|JUSTIFY_RIGHT)
     FXColorWell.new(colors, 0, mdiclient, FXGLViewer::ID_LIGHT_DIFFUSE,
-      COLORWELL_OPAQUEONLY|LAYOUT_TOP|LAYOUT_LEFT, 0, 0, 0, 0, 0, 0, 0, 0)
+      COLORWELL_OPAQUEONLY|LAYOUT_TOP|LAYOUT_LEFT, :padding => 0)
     FXLabel.new(colors, "Light Spec:", nil,
       LAYOUT_RIGHT|LAYOUT_CENTER_Y|JUSTIFY_RIGHT)
     FXColorWell.new(colors, 0, mdiclient, FXGLViewer::ID_LIGHT_SPECULAR,
-      COLORWELL_OPAQUEONLY|LAYOUT_TOP|LAYOUT_LEFT, 0, 0, 0, 0, 0, 0, 0, 0)
+      COLORWELL_OPAQUEONLY|LAYOUT_TOP|LAYOUT_LEFT, :padding => 0)
   end
 
   def createSwitchesPage(panels, mdiclient)
@@ -125,12 +123,9 @@ class TabBook < FXTabBook
     FXTabItem.new(panels, "Settings\tSettings\tSwitche to settings panel.")
 
     # Settings page
-    settings = FXVerticalFrame.new(panels, (FRAME_THICK|FRAME_RAISED|
-      LAYOUT_FILL_Y|LAYOUT_CENTER_X|LAYOUT_TOP|LAYOUT_LEFT))
-    settings.padLeft = 10
-    settings.padRight = 10
-    settings.padTop = 10
-    settings.padBottom = 10
+    settings = FXVerticalFrame.new(panels,
+      FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_Y|LAYOUT_CENTER_X|LAYOUT_TOP|LAYOUT_LEFT,
+      :padding => 10)
     FXCheckButton.new(settings, "Lighting", mdiclient, FXGLViewer::ID_LIGHTING,
       ICON_BEFORE_TEXT)
     FXCheckButton.new(settings, "Fog", mdiclient, FXGLViewer::ID_FOG,
@@ -161,9 +156,9 @@ class GLViewWindow < FXMainWindow
     begin
       filename = File.join("icons", filename) + ".png"
       icon = nil
-      File.open(filename, "rb") { |f|
+      File.open(filename, "rb") do |f|
         icon = FXPNGIcon.new(getApp(), f.read)
-      }
+      end
       icon
     rescue
       raise RuntimeError, "Couldn't load icon: #{filename}"
@@ -172,7 +167,7 @@ class GLViewWindow < FXMainWindow
 
   def initialize(app)
     # Initialize base class first
-    super(app, "OpenGL Example Application", nil, nil, DECOR_ALL, 0, 0, 800, 600)
+    super(app, "OpenGL Example Application", :opts => DECOR_ALL, :width => 800, :height => 600)
 
     # Define message identifiers for this class
 
@@ -194,22 +189,25 @@ class GLViewWindow < FXMainWindow
     FXHorizontalSeparator.new(self,
       LAYOUT_SIDE_TOP|SEPARATOR_GROOVE|LAYOUT_FILL_X);
     toolbar = FXToolBar.new(self, LAYOUT_SIDE_TOP|LAYOUT_FILL_X,
-      0, 0, 0, 0, 4, 4, 0, 0, 0, 0)
+      :padLeft => 4, :padRight => 4, :padTop => 0, :padBottom => 0,
+      :hSpacing => 0, :vSpacing => 0)
 
     # Make status bar
     statusbar = FXStatusBar.new(self,
       LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|STATUSBAR_WITH_DRAGCORNER)
 
     # The good old penguin, what would we be without it?
-    FXButton.new(statusbar, "\tHello, I'm Tux...\nThe symbol for the Linux Operating System.\nAnd all it stands for.", peng, nil, 0, LAYOUT_RIGHT)
+    FXButton.new(statusbar,
+      "\tHello, I'm Tux...\nThe symbol for the Linux Operating System.\nAnd all it stands for.",
+      :icon => peng, :opts => LAYOUT_RIGHT)
 
     # Contents
     frame = FXHorizontalFrame.new(self,
-      LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+      LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0, :hSpacing => 0, :vSpacing => 0)
 
     # Nice sunken box around GL viewer
     box = FXVerticalFrame.new(frame,
-      FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y, 0, 0, 0, 0, 0, 0, 0)
+      FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
 
     # MDI Client
     @mdiclient = FXMDIClient.new(box, LAYOUT_FILL_X|LAYOUT_FILL_Y)
@@ -299,14 +297,14 @@ class GLViewWindow < FXMainWindow
 
     # Print
     FXFrame.new(toolbar,
-      LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, 0, 0, 4, 20)
+      LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, :width => 4, :height => 20)
     FXButton.new(toolbar, "\tPrint Image\tPrint shapshot image.",
       loadIcon("printicon"), @mdiclient, FXGLViewer::ID_PRINT_IMAGE,
       BUTTON_AUTOGRAY|FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
   
     # Editing
     FXFrame.new(toolbar,
-      LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, 0, 0, 4, 20)
+      LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, :width => 4, :height => 20)
     FXButton.new(toolbar, "\tCut", loadIcon("cut"), @mdiclient,
       FXGLViewer::ID_CUT_SEL, (BUTTON_AUTOGRAY|FRAME_THICK|FRAME_RAISED|
       LAYOUT_TOP|LAYOUT_LEFT))
@@ -319,7 +317,7 @@ class GLViewWindow < FXMainWindow
   
     # Projections
     FXFrame.new(toolbar, (LAYOUT_TOP|LAYOUT_LEFT|
-      LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT), 0, 0, 8, 20)
+      LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT), :width => 8, :height => 20)
     FXButton.new(toolbar, "\tPerspective\tSwitch to perspective projection.",
       loadIcon("perspective"), @mdiclient, FXGLViewer::ID_PERSPECTIVE,
       BUTTON_AUTOGRAY|FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
@@ -329,7 +327,7 @@ class GLViewWindow < FXMainWindow
   
     # Shading model
     FXFrame.new(toolbar, (LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|
-      LAYOUT_FIX_HEIGHT), 0, 0, 8, 20)
+      LAYOUT_FIX_HEIGHT), :width => 8, :height => 20)
     FXButton.new(toolbar, "\tNo shading\tTurn light sources off.",
       loadIcon("nolight"), @mdiclient, FXGLShape::ID_SHADEOFF,
       BUTTON_AUTOGRAY|FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
@@ -340,14 +338,14 @@ class GLViewWindow < FXMainWindow
       loadIcon("smoothlight"), @mdiclient, FXGLShape::ID_SHADESMOOTH,
       BUTTON_AUTOGRAY|FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
     FXFrame.new(toolbar, (LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|
-      LAYOUT_FIX_HEIGHT), 0, 0, 8, 20)
+      LAYOUT_FIX_HEIGHT), :width => 8, :height => 20)
     FXToggleButton.new(toolbar, "\tToggle Light\tToggle light source.", nil,
       loadIcon("nolight"), loadIcon("light"), nil, 0,
       FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
   
     # View orientation
     FXFrame.new(toolbar, (LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|
-      LAYOUT_FIX_HEIGHT), 0, 0, 8, 20)
+      LAYOUT_FIX_HEIGHT), :width => 8, :height => 20)
     FXButton.new(toolbar, "\tFront View\tView objects from the front.",
       loadIcon("frontview"), @mdiclient, FXGLViewer::ID_FRONT,
       BUTTON_AUTOGRAY|FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
@@ -369,7 +367,7 @@ class GLViewWindow < FXMainWindow
   
     # Miscellaneous buttons
     FXFrame.new(toolbar, (LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|
-      LAYOUT_FIX_HEIGHT), 0, 0, 8, 20)
+      LAYOUT_FIX_HEIGHT), :width => 8, :height => 20)
     FXButton.new(toolbar, nil, loadIcon("zoom"), nil, 0,
       FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
     FXButton.new(toolbar, "\tColors\tDisplay color dialog.",
@@ -382,7 +380,7 @@ class GLViewWindow < FXMainWindow
   
     # Dangerous delete a bit on the side
     FXFrame.new(toolbar, (LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|
-      LAYOUT_FIX_HEIGHT), 0, 0, 10, 20)
+      LAYOUT_FIX_HEIGHT), :width => 10, :height => 20)
     FXButton.new(toolbar, "\tDelete\tDelete the selected object.",
       loadIcon("kill"), @mdiclient, FXGLViewer::ID_DELETE_SEL,
       BUTTON_AUTOGRAY|FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)