fxruby 1.6.22.pre2 → 1.6.22.pre3

data/test/TC_FXTreeList.rb

@@ -11,7 +11,7 @@ class TC_FXTreeList < Fox::TestCase
       (TREELIST_BROWSESELECT|TREELIST_SHOWS_LINES|TREELIST_SHOWS_BOXES|
        TREELIST_ROOT_BOXES|LAYOUT_FILL_X|LAYOUT_FILL_Y))
   end
-  
+
   def test_firstItem
     assert_nil(@treeList.firstItem)
     item = @treeList.prependItem(nil, "first")
@@ -70,7 +70,7 @@ class TC_FXTreeList < Fox::TestCase
     theItem = @treeList.appendItem(nil, "", nil, nil, nil, true)
     assert_same(theItem, anItem)
   end
-  
+
   def test_SEL_DELETED
     theItem = @treeList.appendItem(nil, "")
     anItem = nil
@@ -86,7 +86,7 @@ class TC_FXTreeList < Fox::TestCase
     @treeList.each { |item| count += 1 }
     assert_equal(0, count, "count for empty list should be zero")
   end
-  
+
   def test_each
     @treeList.appendItem(nil, "1")
     @treeList.appendItem(nil, "2")
@@ -96,5 +96,5 @@ class TC_FXTreeList < Fox::TestCase
     @treeList.each { |item| count += 1 }
     assert_equal(4, count, "count didn't match expected number of items")
   end
-  
+
 end

data/test/TC_FXTreeListBox.rb

@@ -5,7 +5,7 @@ require 'fox16'
 class TC_FXTreeListBox < Fox::TestCase
   include Fox
 
-  
+
   def setup
     super(self.class.name)
     @treeListBox = FXTreeListBox.new(mainWindow)
@@ -26,7 +26,7 @@ class TC_FXTreeListBox < Fox::TestCase
     @treeListBox.each { |item| count += 1 }
     assert_equal(0, count, "count for empty list should be zero")
   end
-  
+
   def test_each
     @treeListBox.appendItem(nil, "1")
     @treeListBox.appendItem(nil, "2")
@@ -36,6 +36,6 @@ class TC_FXTreeListBox < Fox::TestCase
     @treeListBox.each { |item| count += 1 }
     assert_equal(4, count, "count didn't match expected number of items")
   end
-  
+
 end
 

data/test/TC_FXVec2d.rb

@@ -22,7 +22,7 @@ class TC_FXVec2d < Test::Unit::TestCase
     assert_equal(3.0, vec[1])
     assert_equal(3.0, vec.y)
   end
-  
+
   def test_getitem
     vec = FXVec2d.new(2.0, 3.0)
     assert_equal(2.0, vec[0])
@@ -95,12 +95,12 @@ class TC_FXVec2d < Test::Unit::TestCase
   # that fix is made to FOX.
   def test_length
     v = FXVec2d.new(1.0, 1.0)
-    assert_in_delta(Math.sqrt(2), v.length, 1.0e-12) 
+    assert_in_delta(Math.sqrt(2), v.length, 1.0e-12)
   end
 
   def test_length2
     v = FXVec2d.new(1.0, 1.0)
-    assert_equal(2.0, v.length2) 
+    assert_equal(2.0, v.length2)
   end
 
   def test_normalize

data/test/TC_FXVec2f.rb

@@ -21,7 +21,7 @@ class TC_FXVec2f < Test::Unit::TestCase
     assert_equal(3.0, vec[1])
     assert_equal(3.0, vec.y)
   end
-  
+
   def test_getitem
     vec = FXVec2f.new(2.0, 3.0)
     assert_equal(2.0, vec[0])
@@ -90,12 +90,12 @@ class TC_FXVec2f < Test::Unit::TestCase
 
   def test_length
     v = FXVec2f.new(1.0, 1.0)
-    assert_in_delta(Math.sqrt(2), v.length, 1.0e-7) 
+    assert_in_delta(Math.sqrt(2), v.length, 1.0e-7)
   end
 
   def test_length2
     v = FXVec2f.new(1.0, 1.0)
-    assert_equal(2.0, v.length2) 
+    assert_equal(2.0, v.length2)
   end
 
   def test_normalize

data/test/TC_FXVec3d.rb

@@ -23,7 +23,7 @@ class TC_FXVec3d < Test::Unit::TestCase
     assert_equal(3, vec[2])
     assert_equal(3, vec.z)
   end
-  
+
   def test_construct_from_color
     vec = FXVec3d.new(FXRGB(1, 1, 1))
     assert_in_delta(0.003921568627, vec.x, 1.0e-12)
@@ -44,7 +44,7 @@ class TC_FXVec3d < Test::Unit::TestCase
     assert_equal(2, v[1] = 2)
     assert_equal(3, v[2] = 3)
   end
-  
+
   def test_bounds_checks
     vec = FXVec3d.new
     assert_raises(IndexError) { vec[-1] }
@@ -52,7 +52,7 @@ class TC_FXVec3d < Test::Unit::TestCase
     assert_raises(IndexError) { vec[-1] = 0.0 }
     assert_raises(IndexError) { vec[3]  = 0.0 }
   end
-  
+
   def test_unary_minus
     assert_equal(FXVec3d.new(-1, -2, -3), -FXVec3d.new(1, 2, 3))
   end
@@ -100,12 +100,12 @@ class TC_FXVec3d < Test::Unit::TestCase
 
   def test_length
     v = FXVec3d.new(1, 1, 1)
-    assert_in_delta(Math.sqrt(3), v.length, 1.0e-12) 
+    assert_in_delta(Math.sqrt(3), v.length, 1.0e-12)
   end
 
   def test_length2
     v = FXVec3d.new(1, 1, 1)
-    assert_equal(3, v.length2) 
+    assert_equal(3, v.length2)
   end
 
   def test_normalize

data/test/TC_FXVec3f.rb

@@ -23,7 +23,7 @@ class TC_FXVec3f < Test::Unit::TestCase
     assert_equal(3, vec[2])
     assert_equal(3, vec.z)
   end
-  
+
   def test_construct_from_color
     vec = FXVec3f.new(FXRGB(1, 1, 1))
     assert_in_delta(0.003921568627,  vec.x, 1.0e-7)
@@ -44,7 +44,7 @@ class TC_FXVec3f < Test::Unit::TestCase
     assert_equal(2, v[1] = 2)
     assert_equal(3, v[2] = 3)
   end
-  
+
   def test_bounds_checks
     vec = FXVec3f.new
     assert_raises(IndexError) { vec[-1] }
@@ -52,7 +52,7 @@ class TC_FXVec3f < Test::Unit::TestCase
     assert_raises(IndexError) { vec[-1] = 0.0 }
     assert_raises(IndexError) { vec[3]  = 0.0 }
   end
-  
+
   def test_unary_minus
     assert_equal(FXVec3f.new(-1, -2, -3), -FXVec3f.new(1, 2, 3))
   end
@@ -100,12 +100,12 @@ class TC_FXVec3f < Test::Unit::TestCase
 
   def test_length
     v = FXVec3f.new(1, 1, 1)
-    assert_in_delta(Math.sqrt(3), v.length, 1.0e-7) 
+    assert_in_delta(Math.sqrt(3), v.length, 1.0e-7)
   end
 
   def test_length2
     v = FXVec3f.new(1, 1, 1)
-    assert_equal(3, v.length2) 
+    assert_equal(3, v.length2)
   end
 
   def test_normalize

data/test/TC_FXVec4f.rb

@@ -9,12 +9,12 @@ class TC_FXVec4f < Test::Unit::TestCase
   def test_new
     FXVec4f.new
   end
-  
+
   def test_new2
     vec1 = FXVec4f.new(1.0, 2.0, 3.0, 4.0)
     assert_equal(vec1, FXVec4f.new(vec1))
   end
-  
+
   def test_new3
     a = FXVec3f.new(1, 2, 3)
     b = FXVec4f.new(a)
@@ -23,7 +23,7 @@ class TC_FXVec4f < Test::Unit::TestCase
     assert_equal(3, b[2])
     assert_equal(1, b[3])
   end
-  
+
   def test_new4
     a = FXVec4f.new(1, 2, 3)
     assert_equal(1, a[0])
@@ -37,7 +37,7 @@ class TC_FXVec4f < Test::Unit::TestCase
     assert_equal(3, b[2])
     assert_equal(4, b[3])
   end
-  
+
   def test_new5
     c = FXVec4f.new(FXRGB(128, 128, 128))
   end
@@ -90,7 +90,7 @@ class TC_FXVec4f < Test::Unit::TestCase
     v2 = FXVec4f.new(6.0, 12.0, 18.0, 24.0)
     assert_equal(v2, v1 * 2)
   end
-  
+
   def test_mul2 # same as dot product
     v1 = FXVec4f.new(3.0, 6.0, 9.0, 12.0)
     v2 = FXVec4f.new(2.0, 4.0, 6.0, 8.0)
@@ -116,7 +116,7 @@ class TC_FXVec4f < Test::Unit::TestCase
 
   def test_length
     v = FXVec4f.new(1.0, 1.0, 1.0, 1.0)
-    assert_equal(2.0, v.length) 
+    assert_equal(2.0, v.length)
   end
 
   def test_normalize

data/test/TC_Misc.rb

@@ -143,15 +143,19 @@ class TC_Misc < Test::Unit::TestCase
     assert_in_delta(1.0, s, DELTA)
     assert_in_delta(1.0, v, DELTA)
   end
-  
+
   def test_fxversion
     assert_instance_of(String, Fox.fxversion)
   end
-  
+
   def test_fxrubyversion
     assert_instance_of(String, Fox.fxrubyversion)
   end
 
   def test_fxTraceLevel
+    old = Fox.fxTraceLevel
+    Fox.fxTraceLevel = 10
+    assert_equal 10, Fox.fxTraceLevel
+    Fox.fxTraceLevel = old
   end
 end

data/test/TS_All.rb

@@ -1,25 +1,9 @@
 require 'fox16'
 require 'test/unit'
 
-class TS_All
-  def TS_All.suite
-    suite = Test::Unit::TestSuite.new
-    Object.constants.sort.each do |k|
-      next if /^TC_/ !~ k
-      constant = Object.const_get(k)
-      if constant.kind_of?(Class)
-#       puts "adding tests for #{constant.to_s}"
-	suite << constant.suite
-      end
-    end
-    suite
-  end
-end
-
 if __FILE__ == $0
-  require 'test/unit/ui/console/testrunner'
+  $: << File.dirname(__FILE__)
   Dir.glob("TC_*.rb").each do |testcase|
     require "#{testcase}"
   end
-  Test::Unit::UI::Console::TestRunner.run(TS_All)
 end

data/test/stress1.rb

@@ -57,10 +57,10 @@ class Application < FXApp
     init(ARGV)
 
     @mainWindow = FXMainWindow.new(self, appName, nil, nil, DECOR_ALL, 0, 0, 400, 600)
-    @dirTree = DirTree.new(@mainWindow) 
+    @dirTree = DirTree.new(@mainWindow)
 
     @count = 0
-  end 
+  end
 
   def create
     super
@@ -83,10 +83,10 @@ end
 if __FILE__ == $0
 # Make application
   application = Application.new
-  
-  # Create app  
+
+  # Create app
   application.create()
-  
+
   # Run
   application.run()
 end

data/test/stress2.rb

@@ -10,7 +10,7 @@ class TC_stress2 < Test::Unit::TestCase
     @countLabel = FXLabel.new(theMainWindow, "0", nil, LAYOUT_FILL_X|LAYOUT_FILL_Y)
     theMainWindow
   end
-  
+
   def on_timeout(sender, sel, ptr)
     safeToQuit = false
     $lock.synchronize {
@@ -27,7 +27,7 @@ class TC_stress2 < Test::Unit::TestCase
       @theApp.addTimeout(100, method(:on_timeout))
     end
   end
-  
+
   def test_run
     # Set up the counter thread
     $count = 0
@@ -48,4 +48,4 @@ class TC_stress2 < Test::Unit::TestCase
     @theApp.run
   end
 end
- 
+

data/test/stress3.rb

@@ -37,7 +37,7 @@ class ShutterWindow < FXMainWindow
     @shutter = FXShutter.new(splitter, nil, 0,
       FRAME_SUNKEN|LAYOUT_FILL_X|LAYOUT_FILL_Y,
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
-    
+
     shutterItem = ShutterItem.new(@shutter, "Shutter Item 1", nil, LAYOUT_FILL_Y)
     ShutterButton.new(shutterItem.content, "1-1")
     ShutterButton.new(shutterItem.content, "1-2")
@@ -46,19 +46,19 @@ class ShutterWindow < FXMainWindow
     ShutterButton.new(shutterItem.content, "1-5")
     ShutterButton.new(shutterItem.content, "1-6")
     ShutterButton.new(shutterItem.content, "1-7")
-  
+
     shutterItem = ShutterItem.new(@shutter, "Shutter Item 2")
     ShutterButton.new(shutterItem.content, "2-1")
     ShutterButton.new(shutterItem.content, "2-2")
     ShutterButton.new(shutterItem.content, "2-3")
     ShutterButton.new(shutterItem.content, "2-4")
     ShutterButton.new(shutterItem.content, "2-5")
-  
+
     shutterItem = ShutterItem.new(@shutter, "Shutter Item 3")
     ShutterButton.new(shutterItem.content, "3-1")
     ShutterButton.new(shutterItem.content, "3-2")
     ShutterButton.new(shutterItem.content, "3-3")
-      
+
     # Right pane is a switcher
     # For a real application, each panel in the switcher would have real, working contents...
     @switcher = FXSwitcher.new(splitter,
@@ -71,10 +71,10 @@ class ShutterWindow < FXMainWindow
   def create
     # Create base class
     super
-    
+
     # Run the garbage collector now
     GC.start
-    
+
     # Safe to drop out any time now...
     getApp().addChore(getApp(), FXApp::ID_QUIT)
   end
@@ -87,29 +87,29 @@ class TC_stress3 < Test::Unit::TestCase
     shutterWindow = ShutterWindow.new(theApp)
     theApp.create
     theApp.run
-    
+
     #
     # Check to see if anyone's missing in action.
     # First, the shutter itself should have three
     # shutter items as its children.
     #
     assert_equal(3, shutterWindow.shutter.numChildren)
-    
+
     # Each shutter item has two children
     shutterWindow.shutter.each_child { |c|
       assert_equal(2, c.numChildren)
     }
-    
+
     # First item's content should have 7 children
     shutterItem1 = shutterWindow.shutter.first
     assert_equal(7, shutterItem1.content.numChildren)
-    
+
     # Second item's content should have 5 children
-    shutterItem2 = shutterItem1.next 
+    shutterItem2 = shutterItem1.next
     assert_equal(5, shutterItem2.content.numChildren)
 
     # Third item's content should have 3 children
-    shutterItem3 = shutterItem2.next 
+    shutterItem3 = shutterItem2.next
     assert_equal(3, shutterItem3.content.numChildren)
   end
 end

data/test/testcase.rb

@@ -17,19 +17,19 @@ module Fox
       	  @theApp = FXApp.instance
       	end
       	@theMainWindow = FXMainWindow.new(@theApp, appName)
-      end      
+      end
     end
-    
+
     # Return a reference to the application
     def app
       @theApp
     end
-    
+
     # Return a reference to the main window
     def mainWindow
       @theMainWindow
     end
-    
+
     # Override the base class version of default_test() so that
     # a test case with no tests doesn't trigger an error.
     def default_test; end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: fxruby
 version: !ruby/object:Gem::Version 
-  hash: 1923831901
+  hash: 854953483
   prerelease: 7
   segments: 
   - 1
   - 6
   - 22
   - pre
-  - 2
-  version: 1.6.22.pre2
+  - 3
+  version: 1.6.22.pre3
 platform: ruby
 authors: 
 - Lyle Johnson
@@ -17,36 +17,36 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-31 00:00:00 Z
+date: 2012-02-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rdoc
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 19
         segments: 
-        - 2
-        - 12
-        version: "2.12"
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: hoe
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 25
         segments: 
-        - 3
-        - 10
-        version: "3.10"
+        - 2
+        - 13
+        version: "2.13"
   type: :development
   version_requirements: *id002
 description: FXRuby is the Ruby binding to the FOX GUI toolkit.
@@ -1022,84 +1022,84 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fxruby
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: FXRuby is the Ruby binding to the FOX GUI toolkit.
 test_files: 
-- test/TC_FXVec2d.rb
-- test/TC_FXListBox.rb
-- test/TC_FXCheckButton.rb
-- test/TC_FXVec4f.rb
+- test/TC_FXMenuRadio.rb
+- test/TC_FXLight.rb
+- test/TC_FXMainWindow.rb
+- test/TC_FXFont.rb
+- test/TC_FXMenuCheck.rb
+- test/TC_FXAccelTable.rb
+- test/TC_FXHiliteStyle.rb
+- test/TC_FXTreeListBox.rb
+- test/TC_FXComboBox.rb
+- test/TC_FXVec2f.rb
+- test/TC_FXDialogBox.rb
+- test/TC_FXStream.rb
+- test/TC_FXVec3d.rb
+- test/TC_Misc.rb
 - test/TC_FXIconList.rb
-- test/TC_FXXPMIcon.rb
-- test/TC_FXSegment.rb
 - test/TC_FXMemoryStream.rb
-- test/TC_FXComboBox.rb
+- test/TC_FXExtentd.rb
+- test/TC_downcast.rb
+- test/TC_FXList.rb
 - test/TC_FXShell.rb
-- test/TC_FXRangef.rb
-- test/TC_FXTreeListBox.rb
-- test/TC_Misc.rb
-- test/TC_FXMaterial.rb
-- test/TC_FXMenuCommand.rb
-- test/TC_FXRectangle.rb
-- test/TC_FXGLShape.rb
-- test/TC_FXTreeList.rb
-- test/TC_FXGradientBar.rb
-- test/TC_FXUndoList.rb
-- test/TC_FXImage.rb
+- test/TC_FXRadioButton.rb
+- test/TC_FXDCPrint.rb
 - test/TC_FXTableItem.rb
-- test/TC_FXVec3f.rb
 - test/TC_FXIconDict.rb
-- test/TC_FXStream.rb
-- test/TC_FXBMPImage.rb
-- test/TC_FXGLGroup.rb
-- test/TC_FXRanged.rb
-- test/TC_FXTopWindow.rb
-- test/TC_FXHiliteStyle.rb
-- test/TC_FXHeader.rb
-- test/TC_FXPoint.rb
-- test/TC_FXRegistry.rb
-- test/TC_FXFileStream.rb
-- test/TC_FXXBMIcon.rb
-- test/TC_FXScrollArea.rb
-- test/TC_FXSettings.rb
-- test/TC_FXSize.rb
-- test/TC_FXApp.rb
-- test/TC_FXVec3d.rb
-- test/TC_FXExtentd.rb
-- test/TC_FXDC.rb
-- test/TC_FXMenuCheck.rb
-- test/TC_FXDCWindow.rb
-- test/TC_FXFont.rb
+- test/TC_FXXBMImage.rb
+- test/TC_FXVec4f.rb
+- test/TC_FXId.rb
+- test/TC_FXQuatf.rb
 - test/TC_FXTable.rb
-- test/TC_FXMenuRadio.rb
-- test/TC_FXExtentf.rb
-- test/TC_FXFontDesc.rb
-- test/TC_FXGLViewer.rb
+- test/TC_FXSize.rb
+- test/TC_FXVec3f.rb
 - test/TC_FXViewport.rb
-- test/TC_FXArc.rb
+- test/TC_FXUndoList.rb
 - test/TC_FXText.rb
-- test/TC_FXId.rb
-- test/TC_FXXPMImage.rb
 - test/TC_FXMessageBox.rb
-- test/TC_FXLight.rb
-- test/TC_FXVec2f.rb
-- test/TC_downcast.rb
-- test/TC_FXQuatf.rb
-- test/TC_FXRadioButton.rb
-- test/TC_FXDCPrint.rb
-- test/TC_FXRegion.rb
+- test/TC_FXScrollArea.rb
+- test/TC_FXTreeList.rb
+- test/TC_FXVec2d.rb
+- test/TC_FXSettings.rb
+- test/TC_FXRectangle.rb
+- test/TC_FXGradientBar.rb
+- test/TC_FXMaterial.rb
+- test/TC_FXImage.rb
+- test/TC_FXScrollWindow.rb
+- test/TC_FXFileStream.rb
 - test/TC_FXFoldingList.rb
+- test/TC_FXTopWindow.rb
+- test/TC_FXXBMIcon.rb
+- test/TC_FXMenuCommand.rb
+- test/TC_FXRegion.rb
+- test/TC_FXRanged.rb
+- test/TC_FXListBox.rb
+- test/TC_FXDCWindow.rb
+- test/TC_FXSegment.rb
+- test/TC_FXArc.rb
 - test/TC_FXMat4f.rb
-- test/TC_FXAccelTable.rb
+- test/TC_FXCheckButton.rb
+- test/TC_FXPoint.rb
+- test/TC_FXRegistry.rb
+- test/TC_FXDC.rb
 - test/TC_FXButton.rb
-- test/TC_FXList.rb
-- test/TC_FXDialogBox.rb
-- test/TC_FXBMPIcon.rb
-- test/TC_FXMainWindow.rb
-- test/TC_FXXBMImage.rb
 - test/TC_FXFileAssoc.rb
-- test/TC_FXScrollWindow.rb
+- test/TC_FXGLGroup.rb
+- test/TC_FXBMPImage.rb
 - test/TC_FXDirList.rb
+- test/TC_FXBMPIcon.rb
+- test/TC_FXGLViewer.rb
+- test/TC_FXExtentf.rb
+- test/TC_FXHeader.rb
+- test/TC_FXGLShape.rb
+- test/TC_FXXPMIcon.rb
+- test/TC_FXFontDesc.rb
+- test/TC_FXRangef.rb
+- test/TC_FXXPMImage.rb
+- test/TC_FXApp.rb
 - test/TC_FXDataTarget.rb