fxruby 1.6.5 → 1.6.6

data/examples/header.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'fox16'
+require 'fox16/kwargs'
 
 include Fox
 
@@ -13,7 +14,7 @@ class HeaderWindow < FXMainWindow
 
   def initialize(app)
     # Invoke base class initializer first
-    super(app, "Header Control Test", nil, nil, DECOR_ALL, 0, 0, 800, 600)
+    super(app, "Header Control Test", :opts => DECOR_ALL, :width => 800, :height => 600)
 
     # Menu bar stretched along the top of the main window
     menubar = FXMenuBar.new(self, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
@@ -29,34 +30,35 @@ class HeaderWindow < FXMainWindow
 
     # Help menu
     helpmenu = FXMenuPane.new(self)
-    FXMenuCommand.new(helpmenu, "&About Header...").connect(SEL_COMMAND) {
+    FXMenuCommand.new(helpmenu, "&About Header...").connect(SEL_COMMAND) do
       FXMessageBox.information(self, MBOX_OK, "About Header",
         "An example of how to work with the header control.")
-    }
+    end
     FXMenuTitle.new(menubar, "&Help", nil, helpmenu, LAYOUT_RIGHT)
 
     # Make Main Window contents
     contents = FXVerticalFrame.new(self,
       FRAME_SUNKEN|FRAME_THICK|LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y,
-      0,0,0,0, 0,0,0,0, 0,0)
+      :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0,
+      :hSpacing => 0, :vSpacing => 0)
   
     # Make header control
-    @header1 = FXHeader.new(contents, nil, 0,
-      HEADER_BUTTON|HEADER_RESIZE|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_X)
-    @header1.connect(SEL_CHANGED) { |sender, sel, which|
+    @header1 = FXHeader.new(contents, 
+      :opts => HEADER_BUTTON|HEADER_RESIZE|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_X)
+    @header1.connect(SEL_CHANGED) do |sender, sel, which|
       @lists[which].width = @header1.getItemSize(which)
-    }
-    @header1.connect(SEL_COMMAND) { |sender, sel, which|
+    end
+    @header1.connect(SEL_COMMAND) do |sender, sel, which|
       @lists[which].numItems.times do |i|
         @lists[which].selectItem(i)
       end
-    } 
+    end 
 
     # Document icon
     doc = nil
-    File.open(File.join("icons", "minidoc.png"), "rb") { |f|
+    File.open(File.join("icons", "minidoc.png"), "rb") do |f|
       doc = FXPNGIcon.new(getApp(), f.read)
-    }
+    end
   
     @header1.appendItem("Name", doc, 150)
     @header1.appendItem("Type", nil, 140)
@@ -66,18 +68,15 @@ class HeaderWindow < FXMainWindow
     # Below header
     panes = FXHorizontalFrame.new(contents,
       FRAME_SUNKEN|FRAME_THICK|LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y,
-      0,0,0,0, 0,0,0,0, 0,0)
+      :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0,
+      :hSpacing => 0, :vSpacing => 0)
 
     # Make 4 lists
     @lists = []
-    @lists.push(FXList.new(panes, nil, 0,
-      LAYOUT_FILL_Y|LAYOUT_FIX_WIDTH|LIST_BROWSESELECT, 0, 0, 150, 0))
-    @lists.push(FXList.new(panes, nil, 0,
-      LAYOUT_FILL_Y|LAYOUT_FIX_WIDTH|LIST_SINGLESELECT, 0, 0, 140, 0))
-    @lists.push(FXList.new(panes, nil, 0,
-      LAYOUT_FILL_Y|LAYOUT_FIX_WIDTH|LIST_MULTIPLESELECT, 0, 0, 230, 0))
-    @lists.push(FXList.new(panes, nil, 0,
-      LAYOUT_FILL_Y|LAYOUT_FIX_WIDTH|LIST_EXTENDEDSELECT, 0, 0, 80, 0))
+    @lists.push(FXList.new(panes, :opts => LAYOUT_FILL_Y|LAYOUT_FIX_WIDTH|LIST_BROWSESELECT,   :width => 150))
+    @lists.push(FXList.new(panes, :opts => LAYOUT_FILL_Y|LAYOUT_FIX_WIDTH|LIST_SINGLESELECT,   :width => 140))
+    @lists.push(FXList.new(panes, :opts => LAYOUT_FILL_Y|LAYOUT_FIX_WIDTH|LIST_MULTIPLESELECT, :width => 230))
+    @lists.push(FXList.new(panes, :opts => LAYOUT_FILL_Y|LAYOUT_FIX_WIDTH|LIST_EXTENDEDSELECT, :width => 80))
 
     @lists[0].backColor = FXRGB(255, 240, 240)
     @lists[1].backColor = FXRGB(240, 255, 240)
@@ -113,8 +112,8 @@ class HeaderWindow < FXMainWindow
     @lists[3].appendItem("E")
     @lists[3].appendItem("F")
 
-    @header2 = FXHeader.new(panes, nil, 0,
-      HEADER_VERTICAL|HEADER_BUTTON|HEADER_RESIZE|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_Y)
+    @header2 = FXHeader.new(panes,
+      :opts => HEADER_VERTICAL|HEADER_BUTTON|HEADER_RESIZE|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_Y)
     @header2.appendItem("Example", nil, 30)
     @header2.appendItem("Of", nil, 30)
     @header2.appendItem("Vertical", nil, 30)
@@ -125,10 +124,11 @@ class HeaderWindow < FXMainWindow
       GROUPBOX_TITLE_CENTER|LAYOUT_FILL_X|LAYOUT_FILL_Y)
     check = FXCheckButton.new(groupie,
       "Continuous Tracking\tContinuous\tTrack Header continuously",
-      nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP).connect(SEL_COMMAND) {
+      :opts => ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
+    check.connect(SEL_COMMAND) do
       @header1.headerStyle ^= HEADER_TRACKING
       @header2.headerStyle ^= HEADER_TRACKING
-    }
+    end
 
     # Whip out a tooltip control, jeez, that's hard
     FXToolTip.new(getApp())

data/examples/iconlist.rb

@@ -1,16 +1,18 @@
 require 'fox16'
+require 'fox16/kwargs'
 
 include Fox
 
 class IconListWindow < FXMainWindow
+  
   # Load the named PNG icon from a file
   def loadIcon(filename)
     begin
       filename = File.join("icons", filename)
       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}"
@@ -20,7 +22,7 @@ class IconListWindow < FXMainWindow
   # Main window constructor
   def initialize(app)
     # Initialize base class first
-    super(app, "Icon List Test", nil, nil, DECOR_ALL, 0, 0, 800, 600)
+    super(app, "Icon List Test", :opts => DECOR_ALL, :width => 800, :height => 600)
     
     # Menu bar
     menubar = FXMenuBar.new(self, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
@@ -34,14 +36,16 @@ class IconListWindow < FXMainWindow
     status = FXStatusBar.new(self, LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|STATUSBAR_WITH_DRAGCORNER)
     
     # Main window interior
-    group = FXVerticalFrame.new(self, LAYOUT_FILL_X|LAYOUT_FILL_Y, 0, 0, 0, 0, 0, 0, 0, 0)
+    group = FXVerticalFrame.new(self, LAYOUT_FILL_X|LAYOUT_FILL_Y,
+      :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0)
 
     # Files
     FXLabel.new(group, "Icon List Widget", nil, LAYOUT_TOP|LAYOUT_FILL_X|FRAME_SUNKEN)
-    subgroup = FXVerticalFrame.new(group, FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y, 0, 0, 0, 0, 0, 0, 0, 0)
+    subgroup = FXVerticalFrame.new(group, FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y,
+      :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0)
   
     # Icon list on the right
-    iconlist = FXIconList.new(subgroup, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y|ICONLIST_BIG_ICONS|ICONLIST_EXTENDEDSELECT)
+    iconlist = FXIconList.new(subgroup, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|ICONLIST_BIG_ICONS|ICONLIST_EXTENDEDSELECT)
     
     iconlist.appendHeader("Name", nil, 200)
     iconlist.appendHeader("Type", nil, 100)
@@ -54,9 +58,9 @@ class IconListWindow < FXMainWindow
     mini_folder = loadIcon("minifolder.png")
   
     iconlist.appendItem("Really BIG and wide item to test\tDocument\t10000\tJune 13, 1999\tUser\tSoftware", big_folder, mini_folder)
-    1.upto(400) { |i|
+    1.upto(400) do |i|
       iconlist.appendItem("Filename_#{i}\tDocument\t10000\tJune 13, 1999\tUser\tSoftware", big_folder, mini_folder)
-    }
+    end
     iconlist.currentItem = iconlist.numItems - 1
 
     # Arrange menu

data/examples/image.rb

@@ -2,6 +2,7 @@
 
 require 'fox16'
 require 'fox16/colors'
+require 'fox16/kwargs'
 
 include Fox
 
@@ -9,34 +10,36 @@ class ImageWindow < FXMainWindow
 
   def initialize(app)
     # Invoke base class initializer first
-    super(app, "Image Application", nil, nil, DECOR_ALL, 0, 0, 800, 600)
+    super(app, "Image Application", :opts => DECOR_ALL, :width => 800, :height => 600)
 
     # Create a color dialog for later use
     colordlg = FXColorDialog.new(self, "Color Dialog")
     
     contents = FXHorizontalFrame.new(self,
-      LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y, 0, 0, 0, 0, 0, 0, 0, 0)
+      LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y,
+      :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0)
   
     # LEFT pane to contain the canvas
     canvasFrame = FXVerticalFrame.new(contents,
       FRAME_SUNKEN|LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_TOP|LAYOUT_LEFT,
-      0, 0, 0, 0, 10, 10, 10, 10)
+      :padLeft => 10, :padRight => 10, :padTop => 10, :padBottom => 10)
   
     # Label above the canvas               
-    FXLabel.new(canvasFrame, "Canvas Frame", nil,
-      JUSTIFY_CENTER_X|LAYOUT_FILL_X)
+    FXLabel.new(canvasFrame, "Canvas Frame", :opts => JUSTIFY_CENTER_X|LAYOUT_FILL_X)
   
     # Horizontal divider line
     FXHorizontalSeparator.new(canvasFrame, SEPARATOR_GROOVE|LAYOUT_FILL_X)
 
     # Drawing canvas
-    @canvas = FXCanvas.new(canvasFrame, nil, 0, (FRAME_SUNKEN|
+    @canvas = FXCanvas.new(canvasFrame, :opts => (FRAME_SUNKEN|
       FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_TOP|LAYOUT_LEFT))
     @canvas.connect(SEL_PAINT, method(:onCanvasRepaint))
 
     # RIGHT pane for the buttons
-    buttonFrame = FXVerticalFrame.new(contents, (FRAME_SUNKEN|LAYOUT_FILL_Y|
-      LAYOUT_TOP|LAYOUT_LEFT), 0, 0, 0, 0, 10, 10, 10, 10)
+    buttonFrame = FXVerticalFrame.new(contents,
+      :opts => FRAME_SUNKEN|LAYOUT_FILL_Y|LAYOUT_TOP|LAYOUT_LEFT,
+      :padLeft => 10, :padRight => 10, :padTop => 10, :padBottom => 10)
+      
 
     # Label above the buttons  
     FXLabel.new(buttonFrame, "Button Frame", nil,
@@ -45,43 +48,42 @@ class ImageWindow < FXMainWindow
     # Horizontal divider line
     FXHorizontalSeparator.new(buttonFrame, SEPARATOR_RIDGE|LAYOUT_FILL_X)
 
-    FXLabel.new(buttonFrame, "&Background\nColor well", nil,
-      JUSTIFY_CENTER_X|LAYOUT_FILL_X)
+    FXLabel.new(buttonFrame, "&Background\nColor well", :opts => JUSTIFY_CENTER_X|LAYOUT_FILL_X)
     @backwell = FXColorWell.new(buttonFrame, FXColor::White,
-      nil, 0, (LAYOUT_CENTER_X|LAYOUT_TOP|LAYOUT_LEFT|
-      LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT), 0, 0, 100, 30)
+      :opts => LAYOUT_CENTER_X|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT,
+      :width => 100, :height => 30)
     @backwell.connect(SEL_COMMAND, method(:onCmdWell))
     
-    FXLabel.new(buttonFrame, "B&order\nColor well", nil,
-      JUSTIFY_CENTER_X|LAYOUT_FILL_X)
+    FXLabel.new(buttonFrame, "B&order\nColor well", :opts => JUSTIFY_CENTER_X|LAYOUT_FILL_X)
     @borderwell = FXColorWell.new(buttonFrame, FXColor::Black,
-      nil, 0, (LAYOUT_CENTER_X|LAYOUT_TOP|LAYOUT_LEFT|
-      LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT), 0, 0, 100, 30)
+      :opts => LAYOUT_CENTER_X|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT,
+      :width => 100, :height => 30)
     @borderwell.connect(SEL_COMMAND, method(:onCmdWell))
     
-    FXLabel.new(buttonFrame, "&Text\nColor well", nil,
-      JUSTIFY_CENTER_X|LAYOUT_FILL_X)
+    FXLabel.new(buttonFrame, "&Text\nColor well", :opts => JUSTIFY_CENTER_X|LAYOUT_FILL_X)
     @textwell = FXColorWell.new(buttonFrame, FXColor::Black,
-      nil, 0, (LAYOUT_CENTER_X|LAYOUT_TOP|LAYOUT_LEFT|
-      LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT), 0, 0, 100, 30)
+      :opts => LAYOUT_CENTER_X|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT,
+      :width => 100, :height => 30)
     @textwell.connect(SEL_COMMAND, method(:onCmdWell))
     
     # Button to draw
     FXButton.new(buttonFrame, "&Colors...\tPop the color dialog", nil,
-      colordlg, FXWindow::ID_SHOW, (FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|
-      LAYOUT_TOP|LAYOUT_LEFT), 0, 0, 0, 0, 10, 10, 5, 5)
+      colordlg, FXWindow::ID_SHOW,
+      :opts => FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_LEFT,
+      :padLeft => 10, :padRight => 10, :padTop => 5, :padBottom => 5)
 
     # Button to draw
     saveBtn = FXButton.new(buttonFrame,
       "Save Image...\tRead back image and save to file",
-      nil, nil, 0, (FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|
-      LAYOUT_TOP|LAYOUT_LEFT), 0, 0, 0, 0, 10, 10, 5, 5)
+      :opts => FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_LEFT,
+      :padLeft => 10, :padRight => 10, :padTop => 5, :padBottom => 5)
     saveBtn.connect(SEL_COMMAND, method(:onCmdRestore))
     
     # Exit button
     FXButton.new(buttonFrame, "E&xit\tQuit ImageApp", nil,
-      getApp(), FXApp::ID_QUIT, (FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|
-      LAYOUT_TOP|LAYOUT_LEFT), 0, 0, 0, 0, 10, 10, 5, 5)
+      getApp(), FXApp::ID_QUIT,
+      :opts => FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_LEFT,
+      :padLeft => 10, :padRight => 10, :padTop => 5, :padBottom => 5)
 
     # Allocate the color arrays
     imgWidth = 512
@@ -122,15 +124,15 @@ class ImageWindow < FXMainWindow
     (0...512).each { |x|
       halfX = x >> 1
       (0...50).each { |y|
-	z = (y << 9) + x
+        z = (y << 9) + x
         grey_data[z]  = FXRGB(halfX, halfX, halfX)
-	grey_nodither_data[z] = grey_data[z]
+        grey_nodither_data[z] = grey_data[z]
         red_data[z]   = FXRGB(halfX, 0, 0)
-	red_nodither_data[z] = red_data[z]
+        red_nodither_data[z] = red_data[z]
         green_data[z] = FXRGB(0, halfX, 0)
-	green_nodither_data[z] = green_data[z]
+        green_nodither_data[z] = green_data[z]
         blue_data[z]  = FXRGB(0, 0, halfX)
-	blue_nodither_data[z] = blue_data[z]
+        blue_nodither_data[z] = blue_data[z]
       }
     }
 
@@ -168,7 +170,7 @@ class ImageWindow < FXMainWindow
   end
 
   def onCanvasRepaint(sender, sel, event)
-    if event.synthetic
+    if event.synthetic?
       dc = FXDCWindow.new(@picture)
   
       # Erase the canvas, color comes from well
@@ -190,10 +192,10 @@ class ImageWindow < FXMainWindow
       dc.fillStyle = FILL_OPAQUESTIPPLED
       dc.foreground = FXColor::Black
       dc.background = FXColor::White
-      (STIPPLE_0..STIPPLE_16).each { |pat|
+      (STIPPLE_0..STIPPLE_16).each do |pat|
         dc.stipple = pat
         dc.fillRectangle(10 + (512*pat)/17, 490, 31, 50)
-      }
+      end
       dc.fillStyle = FILL_SOLID
 
       # Draw borders

data/examples/imageviewer.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'fox16'
+require 'fox16/kwargs'
 
 include Fox
 
@@ -10,8 +11,7 @@ class ImageWindow < FXMainWindow
 
   def initialize(app)
     # Invoke base class initialize first
-    super(app, "FOX Image Viewer: - untitled", nil, nil, DECOR_ALL,
-      0, 0, 850, 600, 0, 0)
+    super(app, "FOX Image Viewer: - untitled", :opts => DECOR_ALL, :width => 850, :height => 600)
 
     # Recently used files list
     @mrufiles = FXRecentFiles.new
@@ -74,22 +74,22 @@ class ImageWindow < FXMainWindow
     # Sunken border for image widget
     imagebox = FXHorizontalFrame.new(splitter,
       FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y,
-      0, 0, 0, 0, 0, 0, 0, 0)
+      :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0)
   
     # Make image widget
-    @imageview = FXImageView.new(imagebox, nil, nil, 0,
-      LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    @imageview = FXImageView.new(imagebox, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
     
     # Sunken border for file list
-    @filebox = FXHorizontalFrame.new(splitter, LAYOUT_FILL_X|LAYOUT_FILL_Y,
-      0, 0, 0, 0, 0, 0, 0, 0)
+    @filebox = FXHorizontalFrame.new(splitter,
+      LAYOUT_FILL_X|LAYOUT_FILL_Y,
+      :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0)
   
     # Make file list
     fileframe = FXHorizontalFrame.new(@filebox,
       FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
-    @filelist = FXFileList.new(fileframe, nil, 0,
-      LAYOUT_FILL_X|LAYOUT_FILL_Y|ICONLIST_MINI_ICONS|ICONLIST_AUTOSIZE)
+      :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0. :hSpacing => 0, :vSpacing => 0)
+    @filelist = FXFileList.new(fileframe,
+      :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|ICONLIST_MINI_ICONS|ICONLIST_AUTOSIZE)
     @filelist.connect(SEL_DOUBLECLICKED, method(:onCmdFileList))
     FXButton.new(@filebox, "\tUp one level\tGo up to higher directory.",
       uplevelicon, @filelist, FXFileList::ID_DIRECTORY_UP,
@@ -97,19 +97,19 @@ class ImageWindow < FXMainWindow
   
     # Toobar buttons: File manipulation
     openBtn = FXButton.new(toolbar, "&Open\tOpen Image\tOpen image file.", fileopenicon,
-      nil, 0, ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED)
+      :opts => ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED)
     openBtn.connect(SEL_COMMAND, method(:onCmdOpen))
     saveBtn = FXButton.new(toolbar, "&Save\tSave Image\tSave image file.", filesaveicon,
-      nil, 0, ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED)
+      :opts => ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED)
     saveBtn.connect(SEL_COMMAND, method(:onCmdSave))
   
     # Toobar buttons: Editing
-    FXButton.new(toolbar, "Cut\tCut", cuticon, nil, 0,
-      ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED)
-    FXButton.new(toolbar, "Copy\tCopy", copyicon, nil, 0,
-      ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED)
-    FXButton.new(toolbar, "Paste\tPaste", pasteicon, nil, 0,
-      ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED)
+    FXButton.new(toolbar, "Cut\tCut", cuticon,
+      :opts => ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED)
+    FXButton.new(toolbar, "Copy\tCopy", copyicon,
+      :opts => ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED)
+    FXButton.new(toolbar, "Paste\tPaste", pasteicon,
+      :opts => ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED)
   
     # Color
     FXButton.new(toolbar, "&Colors\tColors\tDisplay color dialog.", paletteicon,
@@ -145,13 +145,10 @@ class ImageWindow < FXMainWindow
     # Edit Menu entries
     FXMenuCommand.new(editmenu, "&Undo\tCtl-Z\tUndo last change.")
     FXMenuCommand.new(editmenu, "&Redo\tCtl-R\tRedo last undo.")
-    FXMenuCommand.new(editmenu, "&Copy\tCtl-C\tCopy selection to clipboard.",
-      copyicon, nil, 0)
-    FXMenuCommand.new(editmenu, "C&ut\tCtl-X\tCut selection to clipboard.",
-      cuticon, nil, 0)
-    FXMenuCommand.new(editmenu, "&Paste\tCtl-V\tPaste from clipboard.",
-      pasteicon, nil, 0)
-    FXMenuCommand.new(editmenu, "&Delete\t\tDelete selection.", nil, nil, 0)
+    FXMenuCommand.new(editmenu, "&Copy\tCtl-C\tCopy selection to clipboard.", copyicon)
+    FXMenuCommand.new(editmenu, "C&ut\tCtl-X\tCut selection to clipboard.", cuticon)
+    FXMenuCommand.new(editmenu, "&Paste\tCtl-V\tPaste from clipboard.", pasteicon)
+    FXMenuCommand.new(editmenu, "&Delete\t\tDelete selection.")
   
     # Manipulation Menu entries
     rotate90Cmd = FXMenuCommand.new(manipmenu, "Rotate 90\t\tRotate 90 degrees.")
@@ -247,44 +244,44 @@ class ImageWindow < FXMainWindow
     begin
       filename = File.join("icons", filename)
       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}"
     end
   end
 
-  def hasExtension(filename, ext)
+  def hasExtension?(filename, ext)
     File.basename(filename, ext) != File.basename(filename)
   end
 
   # Load the named image file
   def loadImage(file)
     img = nil
-    if hasExtension(file, ".gif")
+    if hasExtension?(file, ".gif")
       img = FXGIFImage.new(getApp(), nil, IMAGE_KEEP|IMAGE_SHMI|IMAGE_SHMP)
-    elsif hasExtension(file, ".bmp")
+    elsif hasExtension?(file, ".bmp")
       img = FXBMPImage.new(getApp(), nil, IMAGE_KEEP|IMAGE_SHMI|IMAGE_SHMP)
-    elsif hasExtension(file, ".xpm")
+    elsif hasExtension?(file, ".xpm")
       img = FXXPMImage.new(getApp(), nil, IMAGE_KEEP|IMAGE_SHMI|IMAGE_SHMP)
-    elsif hasExtension(file, ".png")
+    elsif hasExtension?(file, ".png")
       img = FXPNGImage.new(getApp(), nil, IMAGE_KEEP|IMAGE_SHMI|IMAGE_SHMP)
-    elsif hasExtension(file, ".jpg")
+    elsif hasExtension?(file, ".jpg")
       img = FXJPGImage.new(getApp(), nil, IMAGE_KEEP|IMAGE_SHMI|IMAGE_SHMP)
-    elsif hasExtension(file, ".pcx")
+    elsif hasExtension?(file, ".pcx")
       img = FXPCXImage.new(getApp(), nil, IMAGE_KEEP|IMAGE_SHMI|IMAGE_SHMP)
-    elsif hasExtension(file, ".tif")
+    elsif hasExtension?(file, ".tif")
       img = FXTIFImage.new(getApp(), nil, IMAGE_KEEP|IMAGE_SHMI|IMAGE_SHMP)
-    elsif hasExtension(file, ".tga")
+    elsif hasExtension?(file, ".tga")
       img = FXTGAImage.new(getApp(), nil, IMAGE_KEEP|IMAGE_SHMI|IMAGE_SHMP)
-    elsif hasExtension(file, ".ico")
+    elsif hasExtension?(file, ".ico")
       img = FXICOImage.new(getApp(), nil, IMAGE_KEEP|IMAGE_SHMI|IMAGE_SHMP)
     end
 
     # Perhaps failed?
-    if !img
+    if img.nil?
       FXMessageBox.error(self, MBOX_OK, "Error loading image",
         "Unsupported image type: #{file}")
       return
@@ -340,7 +337,7 @@ class ImageWindow < FXMainWindow
         if MBOX_CLICKED_NO == FXMessageBox.question(self, MBOX_YES_NO,
           "Overwrite Image", "Overwrite existing image?")
           return 1
-	end
+        end
       end
       @filename = saveDialog.filename
       @filelist.currentFile = @filename
@@ -400,9 +397,11 @@ class ImageWindow < FXMainWindow
     FXTextField.new(frame, 5, sy, FXDataTarget::ID_VALUE,
       LAYOUT_CENTER_Y|FRAME_SUNKEN|FRAME_THICK|JUSTIFY_RIGHT)
     FXButton.new(frame, "Cancel", nil, scalepanel, FXDialogBox::ID_CANCEL,
-      LAYOUT_CENTER_Y|FRAME_RAISED|FRAME_THICK, 0, 0, 0, 0, 20, 20, 4, 4)
+      LAYOUT_CENTER_Y|FRAME_RAISED|FRAME_THICK,
+      :padLeft => 20, :padRight => 20, :padTop => 4, :padBottom => 4)
     FXButton.new(frame, "OK", nil, scalepanel, FXDialogBox::ID_ACCEPT,
-      LAYOUT_CENTER_Y|FRAME_RAISED|FRAME_THICK, 0, 0, 0, 0, 30, 30, 4, 4)
+      LAYOUT_CENTER_Y|FRAME_RAISED|FRAME_THICK,
+      :padLeft => 30, :padRight => 30, :padTop => 4, :padBottom => 4)
     return 1 if (scalepanel.execute == 0)
     return 1 if (sx.value < 1 || sy.value < 1)
     image.scale(sx.value, sy.value)
@@ -432,9 +431,11 @@ class ImageWindow < FXMainWindow
     FXTextField.new(frame, 5, ch, FXDataTarget::ID_VALUE,
       LAYOUT_CENTER_Y|FRAME_SUNKEN|FRAME_THICK|JUSTIFY_RIGHT)
     FXButton.new(frame, "Cancel", nil, croppanel, FXDialogBox::ID_CANCEL,
-      LAYOUT_CENTER_Y|FRAME_RAISED|FRAME_THICK, 0, 0, 0, 0, 20, 20, 4, 4)
+      LAYOUT_CENTER_Y|FRAME_RAISED|FRAME_THICK,
+      :padLeft => 20, :padRight => 20, :padTop => 4, :padBottom => 4)
     FXButton.new(frame, "OK", nil, croppanel, FXDialogBox::ID_ACCEPT,
-      LAYOUT_CENTER_Y|FRAME_RAISED|FRAME_THICK, 0, 0, 0, 0, 30, 30, 4, 4)
+      LAYOUT_CENTER_Y|FRAME_RAISED|FRAME_THICK,
+      :padLeft => 30, :padRight => 30, :padTop => 4, :padBottom => 4)
     return 1 if (croppanel.execute == 0)
     return 1 if (cx.value < 0 || cy.value < 0 ||
         cx.value+cw.value > image.width ||