fxruby 1.6.22.pre2-x86-mingw32 → 1.6.22.pre3-x86-mingw32

data/History.txt

@@ -7,4 +7,4 @@
 === 1.6.19 / 2009-03-06
 
 * Please see http://www.fxruby.org/doc/changes.html
-  for a complete list of the changes in this release.
+  for a complete list of the changes in this release.

data/README.txt

@@ -82,7 +82,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-
+
   Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -138,7 +138,7 @@ modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-
+
 		  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -173,7 +173,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -185,7 +185,7 @@ Library.
   You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
+
   2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
@@ -243,7 +243,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-
+
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -294,7 +294,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
+
   6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -356,7 +356,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
+
   7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -397,7 +397,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-
+
   11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -449,7 +449,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
+
   14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -480,4 +480,4 @@ LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
 RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
 FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
+DAMAGES.

data/Rakefile

@@ -125,10 +125,11 @@ namespace :swig do
 
   # add dependencies for compile *.i to *_wrap.cpp
   SWIG_MODULES.each do |ifile, cppfile|
-    ifile_path = File.join("swig-interfaces", ifile)
     cppfile_path = File.join("ext/fox16", cppfile)
 
-    file cppfile_path => [ifile_path] do
+    file cppfile_path => [ifile, 'macros.i', 'common.i', 'fxdefs.i', 'ruby-typemaps.i',
+                          'markfuncs.i', 'exceptions.i', 'freefuncs.i', 'macros.i', 'handlers.i'
+                         ].map{|f| File.join("swig-interfaces", f) } do
       Dir.chdir "swig-interfaces" do
         swig(ifile, cppfile)
       end

data/doap.rdf

@@ -77,8 +77,8 @@
     <doap:release>
       <doap:Version>
         <doap:branch>fox16</doap:branch>
-        <doap:created>2012-01-30</doap:created>
-        <doap:revision>1.6.22.pre1</doap:revision>
+        <doap:created>2012-01-29</doap:created>
+        <doap:revision>1.6.22</doap:revision>
       </doap:Version>
     </doap:release>
 

data/examples/babelfish.rb

@@ -16,7 +16,7 @@ class Babelfish < FXMainWindow
     super(app, "Babelfish", :opts => DECOR_ALL, :width => 600, :height => 400)
 
     @translator = Tranexp::Http.new
-    
+
     # Controls area along the bottom
     controlsFrame = FXHorizontalFrame.new(self,
       LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X)
@@ -56,7 +56,7 @@ class Babelfish < FXMainWindow
       FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y)
     @translatedText = FXText.new(sunkenFrame, :opts => TEXT_READONLY|LAYOUT_FILL_X|LAYOUT_FILL_Y)
   end
-  
+
   def create
     super
     show(PLACEMENT_SCREEN)

data/examples/bounce.rb

@@ -28,7 +28,7 @@ class Ball
     @dir = FXPoint.new(-1, 0)
     setWorldSize(1000, 1000)
   end
-  
+
   # Draw the ball into this device context
   def draw(dc)
     dc.setForeground(color)
@@ -37,11 +37,11 @@ class Ball
     dc.fillArc(x, y, w, h, 64*180, 64*270)
     dc.fillArc(x, y, w, h, 64*270, 64*360)
   end
-  
+
   def bounce
     @dir = -@dir
   end
-  
+
   def collision?
     (x < 0) || (x+w > worldWidth) || (y < 0) || (y+h > worldHeight)
   end
@@ -50,7 +50,7 @@ class Ball
     @worldWidth = ww
     @worldHeight = wh
   end
-    
+
   def move(units)
     dx = dir.x*units
     dy = dir.y*units
@@ -68,24 +68,24 @@ end
 class BounceWindow < FXMainWindow
 
   include Responder
-  
+
   def initialize(app)
     # Initialize base class first
     super(app, "Bounce", :opts => DECOR_ALL, :width => 400, :height => 300)
-    
+
     # Set up the canvas
     @canvas = FXCanvas.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
-    
+
     # Set up the back buffer
     @backBuffer = FXImage.new(app, nil, IMAGE_KEEP)
-    
+
     # Handle expose events (by blitting the image to the canvas)
     @canvas.connect(SEL_PAINT) { |sender, sel, evt|
       FXDCWindow.new(sender, evt) { |dc|
         dc.drawImage(@backBuffer, 0, 0)
       }
     }
-    
+
     # Handle resize events
     @canvas.connect(SEL_CONFIGURE) { |sender, sel, evt|
       @backBuffer.create unless @backBuffer.created?
@@ -93,10 +93,10 @@ class BounceWindow < FXMainWindow
       @ball.setWorldSize(sender.width, sender.height)
       drawScene(@backBuffer)
     }
-    
+
     @ball = Ball.new(20)
   end
-  
+
   #
   # Draws the scene into the back buffer
   #
@@ -107,43 +107,43 @@ class BounceWindow < FXMainWindow
       @ball.draw(dc)
     }
   end
-  
+
   def updateCanvas
     @ball.move(10)
     drawScene(@backBuffer)
     @canvas.update
   end
-  
+
   #
   # Handle timeout events
   #
   def onTimeout(sender, sel, ptr)
     # Move the ball and re-draw the scene
     updateCanvas
-    
+
     # Re-register the timeout
     getApp().addTimeout(ANIMATION_TIME, method(:onTimeout))
-    
+
     # Done
     return 1
   end
-  
+
   #
   # Create server-side resources
   #
   def create
     # Create base class
     super
-    
+
     # Create the image used as the back-buffer
     @backBuffer.create
-    
+
     # Draw the initial scene into the back-buffer
     drawScene(@backBuffer)
-    
+
     # Register the timer used for animation
     getApp().addTimeout(ANIMATION_TIME, method(:onTimeout))
-    
+
     # Show the main window
     show(PLACEMENT_SCREEN)
   end

data/examples/charts.rb

@@ -11,7 +11,7 @@ class ChartsWindow < FXMainWindow
       f.image = FXPNGImage.new(app, open(bar_chart.to_escaped_url, "rb").read)
     end
   end
-  
+
   def bar_chart
     GoogleChart::BarChart.new('600x200', 'My Chart', :vertical) do |bc|
       bc.data 'Trend 1', [5,4,3,1,3,5], '0000ff'
@@ -32,4 +32,4 @@ if __FILE__ == $0
     app.create
     app.run
   end
-end
+end

data/examples/custom_table_item.rb

@@ -19,7 +19,7 @@ class CustomTableItem < FXTableItem
 		beg, tw, th = 0, 0, 0
 		begin
 			_end = beg;
-			_end += 1 while _end < lbl.length && lbl[_end].chr != '\n' 
+			_end += 1 while _end < lbl.length && lbl[_end].chr != '\n'
 			t = font.getTextWidth(lbl[beg..._end])
 			tw = t if t > tw
 			th += font.fontHeight
@@ -117,7 +117,7 @@ class CustomTableItem < FXTableItem
 
 		# Paint icon
 		dc.drawIcon(icn, ix, iy) unless icn.nil?
-			
+
 		# Text color
 		if selected?
 			dc.foreground = table.selTextColor
@@ -131,7 +131,7 @@ class CustomTableItem < FXTableItem
 		beg = 0
 		begin
 			_end = beg
-			_end += 1 while _end < lbl.length && lbl[_end].chr != '\n' 
+			_end += 1 while _end < lbl.length && lbl[_end].chr != '\n'
 			if justify & LEFT == 1
 			  xx = tx
 			elsif justify & RIGHT == 1

data/examples/datatarget.rb

@@ -46,7 +46,7 @@ class DataTargetWindow < FXMainWindow
 
     # Menubar
     menubar = FXMenuBar.new(self, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
-    
+
     # File menu
     filemenu = FXMenuPane.new(self)
     FXMenuCommand.new(filemenu, "Progress dialog...").connect(SEL_COMMAND) do
@@ -179,7 +179,7 @@ class DataTargetWindow < FXMainWindow
   def onTimeout(sender, sel, ptr)
     # Increment the progress modulo 100
     @progressTarget.value = (@progressTarget.value + 1) % 100
-  
+
     # Reset the timer for next time
     getApp().addTimeout(80, method(:onTimeout))
   end

data/examples/dctest.rb

@@ -46,9 +46,9 @@ $bitmap_bits = [
    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0xff, 0xff, 0x00, 0x00,
    0x00, 0x00, 0x00, 0xa0, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]
-   
+
 $bitmap_bits = $bitmap_bits.pack("c*")
-   
+
 $blit_modes = {
   BLT_CLR => "Clear\tBLT_CLR",
   BLT_SRC_AND_DST => "And\tBLT_SRC_AND_DST",
@@ -108,14 +108,14 @@ class DCTestWindow < FXMainWindow
   def initialize(app)
     # Initialize base class first
     super(app, "Device Context Test", :opts => DECOR_ALL, :width => 850, :height => 740)
-        
+
     opts = FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y
-        
+
     # Preferred line attributes
     @lineStyle = LINE_SOLID
     @capStyle = CAP_BUTT
     @joinStyle = JOIN_MITER
-        
+
     # Create a tooltip
     tooltip = FXToolTip.new(getApp())
 
@@ -135,7 +135,7 @@ class DCTestWindow < FXMainWindow
     FXLabel.new(controls, "BLIT Function:", nil, LAYOUT_LEFT)
     blitgrid = FXMatrix.new(controls, 4, FRAME_RIDGE|MATRIX_BY_COLUMNS|LAYOUT_FILL_X|PACK_UNIFORM_WIDTH,
       :padLeft => 2, :padRight => 2, :padTop => 2, :padBottom => 2)
-	
+
     # One button for each mode
     $blit_modes.each do |blit_mode, desc|
       btn = FXButton.new(blitgrid, desc, :opts => BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_FILL_COLUMN)
@@ -152,7 +152,7 @@ class DCTestWindow < FXMainWindow
         end
       end
     end
-	
+
     # Line dash style
     FXLabel.new(controls, "Line Style:", nil, LAYOUT_LEFT)
     linestyle = FXMatrix.new(controls, 3, FRAME_RIDGE|MATRIX_BY_COLUMNS|LAYOUT_FILL_X,
@@ -193,7 +193,7 @@ class DCTestWindow < FXMainWindow
         sender.handle(self, MKUINT(ID_UNCHECK, SEL_COMMAND), nil)
       end
     end
-    
+
     # Line cap style
     FXLabel.new(controls, "Cap Style:", nil, LAYOUT_LEFT)
     capstyle = FXMatrix.new(controls, 4, FRAME_RIDGE|MATRIX_BY_COLUMNS|LAYOUT_FILL_X)
@@ -249,7 +249,7 @@ class DCTestWindow < FXMainWindow
         sender.handle(self, MKUINT(ID_UNCHECK, SEL_COMMAND), nil)
       end
     end
-  	
+
     # Line join style
     FXLabel.new(controls, "Join Style:", nil, LAYOUT_LEFT)
     joinstyle = FXMatrix.new(controls, 3, FRAME_RIDGE|MATRIX_BY_COLUMNS|LAYOUT_FILL_X)
@@ -293,7 +293,7 @@ class DCTestWindow < FXMainWindow
         sender.handle(self, MKUINT(ID_UNCHECK, SEL_COMMAND), nil)
       end
     end
-  
+
     # Colors
     FXLabel.new(controls, "Colors:", nil, LAYOUT_LEFT)
     pairs = FXMatrix.new(controls, 2, FRAME_RIDGE|MATRIX_BY_COLUMNS|LAYOUT_FILL_X)
@@ -303,7 +303,7 @@ class DCTestWindow < FXMainWindow
     pairs.padBottom = 2
     pairs.hSpacing = 5
     pairs.vSpacing = 5
-    
+
     # Back Color
     FXLabel.new(pairs, "Back Color:")
     @backWell = FXColorWell.new(pairs, FXRGB(0, 0, 255), nil, 0, FRAME_SUNKEN|FRAME_THICK|ICON_AFTER_TEXT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
@@ -322,7 +322,7 @@ class DCTestWindow < FXMainWindow
     @backWell.connect(SEL_UPDATE) do |sender, sel, ptr|
       sender.handle(self, MKUINT(ID_SETVALUE, SEL_COMMAND), @backcolor)
     end
-  
+
     # Fore Color
     FXLabel.new(pairs, "Fore Color:")
     @foreWell = FXColorWell.new(pairs, FXRGB(255, 0, 0), nil, 0, FRAME_SUNKEN|FRAME_THICK|ICON_AFTER_TEXT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
@@ -341,7 +341,7 @@ class DCTestWindow < FXMainWindow
     @foreWell.connect(SEL_UPDATE) do |sender, sel, ptr|
       sender.handle(self, MKUINT(ID_SETVALUE, SEL_COMMAND), @forecolor)
     end
-    
+
     # Erase Color
     FXLabel.new(pairs, "Erase Color:")
     @eraseWell = FXColorWell.new(pairs, FXRGB(255, 255, 255), nil, 0, FRAME_SUNKEN|FRAME_THICK|ICON_AFTER_TEXT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
@@ -360,19 +360,19 @@ class DCTestWindow < FXMainWindow
     @eraseWell.connect(SEL_UPDATE) do |sender, sel, ptr|
       sender.handle(self, MKUINT(ID_SETVALUE, SEL_COMMAND), @erasecolor)
     end
-    
+
     # Line width
     linew = FXMatrix.new(controls, 2, FRAME_RIDGE|MATRIX_BY_COLUMNS|LAYOUT_FILL_X)
     linew.padLeft = 2
     linew.padRight = 2
     linew.padTop = 2
-    linew.padBottom = 2    
+    linew.padBottom = 2
     FXLabel.new(linew, "Line Width:")
     @lineWidthSpinner = FXSpinner.new(linew, 4, nil, 0, SPIN_NORMAL|FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
     @lineWidthSpinner.connect(SEL_COMMAND) { @linesCanvas.update(0, 0, @linesCanvas.width, @linesCanvas.height) }
     @lineWidthSpinner.range = 1..255
     @lineWidthSpinner.value = 1
-  
+
     # Stipple
     stip = FXMatrix.new(controls, 2, FRAME_RIDGE|MATRIX_BY_COLUMNS|LAYOUT_FILL_X)
     stip.padLeft = 2
@@ -381,7 +381,7 @@ class DCTestWindow < FXMainWindow
     stip.padBottom = 2
     FXLabel.new(stip, "Stipples:")
     pop = FXPopup.new(self)
-    
+
     $stipples.each do |pat, desc|
       opt = FXOption.new(pop, desc, nil, nil, 0, JUSTIFY_HZ_APART|ICON_AFTER_TEXT)
       opt.userData = pat
@@ -391,7 +391,7 @@ class DCTestWindow < FXMainWindow
       end
     end
     FXOptionMenu.new(stip, pop, LAYOUT_TOP|FRAME_RAISED|FRAME_THICK|JUSTIFY_HZ_APART|ICON_AFTER_TEXT)
-  
+
     # Fill Style
     FXLabel.new(controls, "Fill Style:", nil, LAYOUT_LEFT)
     fillstyle = FXMatrix.new(controls, 2, FRAME_RIDGE|MATRIX_BY_COLUMNS|LAYOUT_FILL_X)
@@ -414,7 +414,7 @@ class DCTestWindow < FXMainWindow
         end
       end
     end
-  
+
     # Angles for arcs
     FXLabel.new(controls, "Arc angles:", nil, LAYOUT_LEFT)
     arcangles = FXMatrix.new(controls, 3, FRAME_RIDGE|MATRIX_BY_COLUMNS|LAYOUT_FILL_X)
@@ -430,13 +430,13 @@ class DCTestWindow < FXMainWindow
     FXTextField.new(arcangles, 4, @ang1, FXDataTarget::ID_VALUE, TEXTFIELD_INTEGER|JUSTIFY_RIGHT|FRAME_SUNKEN|FRAME_THICK)
     sang1 = FXSlider.new(arcangles, @ang1, FXDataTarget::ID_VALUE, LAYOUT_CENTER_Y|LAYOUT_FILL_X|SLIDER_INSIDE_BAR|LAYOUT_FILL_COLUMN)
     sang1.range = -360..360
-    
+
     @ang2 = FXDataTarget.new(90)
     FXLabel.new(arcangles, "Ang2:", nil, LAYOUT_LEFT)
     FXTextField.new(arcangles, 4, @ang2, FXDataTarget::ID_VALUE, TEXTFIELD_INTEGER|JUSTIFY_RIGHT|FRAME_SUNKEN|FRAME_THICK)
     sang2 = FXSlider.new(arcangles, @ang2, FXDataTarget::ID_VALUE, LAYOUT_CENTER_Y|LAYOUT_FILL_X|SLIDER_INSIDE_BAR|LAYOUT_FILL_COLUMN)
     sang2.range = -360..360
-  
+
     # Font
     fonts = FXHorizontalFrame.new(controls, FRAME_RIDGE|LAYOUT_FILL_X|PACK_UNIFORM_WIDTH)
     fonts.padLeft = 2
@@ -445,7 +445,7 @@ class DCTestWindow < FXMainWindow
     fonts.padBottom = 2
     btn = FXButton.new(fonts, "Font Dialog...\tChange the text font", nil, nil, 0, BUTTON_TOOLBAR|JUSTIFY_CENTER_X|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_FILL_Y)
     btn.connect(SEL_COMMAND, method(:onCmdFont))
-  
+
     # Printing
     printer = FXHorizontalFrame.new(controls, FRAME_RIDGE|LAYOUT_FILL_X|PACK_UNIFORM_WIDTH)
     printer.padLeft = 2
@@ -454,7 +454,7 @@ class DCTestWindow < FXMainWindow
     printer.padBottom = 2
     btn = FXButton.new(printer, "Print Dialog...\tPrint it out", nil, nil, 0, BUTTON_TOOLBAR|JUSTIFY_CENTER_X|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_FILL_Y)
     btn.connect(SEL_COMMAND, method(:onCmdPrint))
-  
+
     # Quit
     quitter = FXHorizontalFrame.new(controls, FRAME_RIDGE|LAYOUT_FILL_X|PACK_UNIFORM_WIDTH)
     quitter.padLeft = 2
@@ -462,10 +462,10 @@ class DCTestWindow < FXMainWindow
     quitter.padTop = 2
     quitter.padBottom = 2
     FXButton.new(quitter, "Bye Bye!\tHasta la vista, baby!", nil, getApp(), FXApp::ID_QUIT, BUTTON_TOOLBAR|JUSTIFY_CENTER_X|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_FILL_Y)
-  
+
     # Switcher
     tabbook = FXTabBook.new(contents, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_RIGHT)
-    
+
     # First page shows various line styles
     linesTab = FXTabItem.new(tabbook, "&Lines", nil)
     linesPage = FXPacker.new(tabbook, FRAME_THICK|FRAME_RAISED)
@@ -479,7 +479,7 @@ class DCTestWindow < FXMainWindow
       dc = FXDCWindow.new(canvas, ev)
       drawPage(dc, canvas.width, canvas.height)
     end
-  
+
     # Second page shows various shapes
     shapesTab = FXTabItem.new(tabbook, "&Shapes", nil)
     shapesPage = FXPacker.new(tabbook, FRAME_THICK|FRAME_RAISED)
@@ -493,22 +493,22 @@ class DCTestWindow < FXMainWindow
       dc = FXDCWindow.new(canvas, ev)
       dc.foreground = @eraseWell.rgba
       dc.fillRectangle(0, 0, canvas.width, canvas.height)
-      
+
       dc.foreground = @foreWell.rgba
       dc.background = @backWell.rgba
       dc.drawRectangle(5, 5, 50, 50)
       dc.fillRectangle(60, 5, 50, 50)
-      
+
       dc.foreground = @foreWell.rgba
       dc.background = @backWell.rgba
       dc.drawArc(5, 60, 50, 50, 0, 64*90)
       dc.fillArc(60, 60, 50, 50, 64*90, 64*180)
-      
+
       dc.foreground = @foreWell.rgba
       dc.background = @backWell.rgba
       dc.drawBitmap(@bitmap, 115, 5)
     end
-    
+
     # Third page shows images
     imagesTab = FXTabItem.new(tabbook, "&Images", nil)
     imagesPage = FXPacker.new(tabbook, FRAME_THICK|FRAME_RAISED)
@@ -524,17 +524,17 @@ class DCTestWindow < FXMainWindow
       dc.fillRectangle(0, 0, canvas.width, canvas.height)
       dc.drawImage(@birdImage, 0, 0)
     end
-  
+
     # File menu
     @filemenu = FXMenuPane.new(self)
     FXMenuCommand.new(@filemenu, "&Print...\tCtl-P").connect(SEL_COMMAND, method(:onCmdPrint))
     FXMenuCommand.new(@filemenu, "&Font...\tCtl-F").connect(SEL_COMMAND, method(:onCmdFont))
     FXMenuCommand.new(@filemenu, "&Quit\tCtl-Q", nil, getApp(), FXApp::ID_QUIT)
     FXMenuTitle.new(menubar, "&File", nil, @filemenu)
-    
+
     @birdImage = FXPNGImage.new(getApp(), File.open("icons/dippy.png", "rb").read)
     @bitmap = FXBitmap.new(getApp(), $bitmap_bits, 0, 64, 64)
-    
+
     @function = BLT_SRC
     @lineStyle = LINE_SOLID
     @capStyle = CAP_BUTT
@@ -547,7 +547,7 @@ class DCTestWindow < FXMainWindow
     @erasecolor = FXRGB(255, 255, 255) # white
     @testFont = FXFont.new(getApp(), "helvetica", 20)
   end
-  
+
   def create
     super
     @birdImage.create
@@ -555,33 +555,33 @@ class DCTestWindow < FXMainWindow
     @bitmap.create
     show(PLACEMENT_SCREEN)
   end
-  
+
   def detach
     super
     @birdImage.detach
     @testFont.detach
     @bitmap.detach
   end
-  
+
   def drawPage(dc, w, h)
     dc.foreground = @erasecolor
     dc.fillRectangle(0, 0, w, h)
-    
+
     dc.foreground = @forecolor
     dc.background = @backcolor
-    
+
     dc.lineStyle = @lineStyle
     dc.lineCap = @capStyle
     dc.lineJoin = @joinStyle
     dc.function = @function
-    
+
     dc.stipple = @stipple
     dc.fillStyle = @fillStyle
     dc.lineWidth = @lineWidthSpinner.value
-    
+
     # Here's a single line
     dc.drawLine(20, 200, w - 20, 200)
-    
+
     # Here are some connected lines (to show join styles)
     points = []
     points << FXPoint.new(10, 3*h/4)
@@ -591,22 +591,22 @@ class DCTestWindow < FXMainWindow
     points << FXPoint.new(points[3].x+w/6, points[0].y)
     points << FXPoint.new(points[4].x+w/6, points[1].y)
     dc.drawLines(points)
-    
+
     dc.font = @testFont
     dc.foreground = @forecolor
     dc.background = @backcolor
     s = "Font: #{@testFont.name}  Size: #{@testFont.size/10}"
     dc.drawText(30, h-70, s)
     dc.drawImageText(30, h-30, s)
-    
+
     dc.foreground = @forecolor
     dc.background = @backcolor
     dc.drawRectangle(20, 20, 200, 100)
     dc.fillRectangle(300, 20, 200, 100)
-    
+
     dc.drawArc(20, 120, 100, 100, 64*@ang1.value, 64*@ang2.value)
     dc.fillArc(300, 120, 100, 100, 64*@ang1.value, 64*@ang2.value)
-    
+
     poly = []
     poly << FXPoint.new(200, 230)
     poly << FXPoint.new(poly[0].x+40, poly[0].y+20)
@@ -614,7 +614,7 @@ class DCTestWindow < FXMainWindow
     poly << FXPoint.new(poly[0].x-30, poly[0].y+60)
     poly << FXPoint.new(poly[0].x-40, poly[0].y+20)
     dc.fillPolygon(poly)
-    
+
     poly = []
     poly << FXPoint.new(300, 230)
     poly << FXPoint.new(poly[0].x+30, poly[0].y+60)
@@ -631,19 +631,19 @@ class DCTestWindow < FXMainWindow
     poly << FXPoint.new(poly[0].x-30, poly[0].y+60)
     dc.fillRule = RULE_WINDING
     dc.fillComplexPolygon(poly)
-    
+
     concave = []
     concave << FXPoint.new(w-100, h-100)
     concave << FXPoint.new(concave[0].x+40, concave[0].y-20)
     concave << FXPoint.new(concave[0].x   , concave[0].y+40)
     concave << FXPoint.new(concave[0].x-40, concave[0].y-20)
     dc.fillConcavePolygon(concave)
-    
+
     # Draw a pale blue dot ;)
     dc.foreground = FXRGB(128, 128, 255)
     dc.drawPoint(w-20, h-20)
   end
-  
+
   def onCmdFont(sender, sel, ptr)
     fontdlg = FXFontDialog.new(self, "Change Font", DECOR_BORDER|DECOR_TITLE)
     fontdlg.fontSelection = @testFont.fontDesc
@@ -654,7 +654,7 @@ class DCTestWindow < FXMainWindow
     end
     return 1
   end
-  
+
   def onCmdPrint(sender, sel, ptr)
     dlg = FXPrintDialog.new(self, "Print Graphics")
     if dlg.execute != 0
@@ -671,7 +671,7 @@ class DCTestWindow < FXMainWindow
     end
     return 1
   end
-  
+
   # Load the named icon from a file
   def loadIcon(filename, clr = FXRGB(192, 192, 192), opts = 0)
     begin