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

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.20"
+    "1.6.22.pre2"
   end
 end

data/scripts/generate_kwargs_lib.rb

@@ -108,9 +108,7 @@ class Generator
 
   def generate_preamble(out)
     out.puts <<-END
-require 'fox16'
-
-$VERBOSE = nil
+old_verbose = $VERBOSE; $VERBOSE = nil
 
 module Fox
 
@@ -132,7 +130,7 @@ END
   def generate_closing(out)
     out.puts "end"
     out.puts ""
-    out.puts "$VERBOSE = true"
+    out.puts "$VERBOSE = old_verbose"
   end
   
   def scan_for_descriptions(filename)

data/swig-interfaces/FXMemoryStream.i

@@ -44,7 +44,7 @@ public:
         return self->open(save_or_load,data);
         }
       }
-  
+
     // Take buffer away from stream
     VALUE takeBuffer() {
       FXuchar* buffer;
@@ -54,19 +54,23 @@ public:
       FXFREE(&buffer);
       return result;
       }
-  
+
     /// Give buffer to stream
     void giveBuffer(VALUE str){
+      FXuchar* copy = NULL;
       Check_Type(str,T_STRING);
       FXuchar* buffer=reinterpret_cast<FXuchar*>(StringValuePtr(str));
       FXuval sp=RSTRING_LEN(str);
-      self->giveBuffer(buffer,sp);
+      if( FXMALLOC(&copy, FXuchar *, sp)) {
+        memcpy(copy, buffer, sp);
+        self->giveBuffer(copy,sp);
+        }
       }
   }
-  
+
   /// Get position
   FXlong position() const;
-  
+
   /// Destructor
   virtual ~FXMemoryStream();
   };

data/swig-interfaces/ruby-typemaps.i

@@ -184,7 +184,7 @@ inline FXbool to_FXbool(VALUE obj){
   $1 = NULL;
   if(!NIL_P($input)){
     Check_Type($input, T_ARRAY);
-    if (FXMALLOC(&$1, FXchar *, RARRAY_LEN($input))+1) {
+    if (FXMALLOC(&$1, FXchar *, RARRAY_LEN($input)+1)) {
       for (long i = 0; i < RARRAY_LEN($input); i++) {
         VALUE e = rb_ary_entry($input, i);
         $1[i] = (FXchar *) StringValuePtr(e);
@@ -201,7 +201,7 @@ inline FXbool to_FXbool(VALUE obj){
   $1 = NULL;
   if(!NIL_P($input)){
     Check_Type($input, T_ARRAY);
-    if (FXMALLOC(&$1, FXColor, RARRAY_LEN($input))+1) {
+    if (FXMALLOC(&$1, FXColor, RARRAY_LEN($input)+1)) {
       for (long i = 0; i < RARRAY_LEN($input); i++) {
         $1[i] = static_cast<FXColor>(NUM2ULONG(rb_ary_entry($input, i)));
       }
@@ -599,7 +599,7 @@ inline void* to_FXEvent(VALUE obj){
 
 /* Output typemap for FXViewport instances */
 %typemap(out) FXViewport {
-    FXViewport* resultptr = new FXViewport($1); 
+    FXViewport* resultptr = new FXViewport($1);
     $result = FXRbGetRubyObj(resultptr, "FXViewport *");
 }
 
@@ -731,7 +731,7 @@ inline void* to_FXEvent(VALUE obj){
  * be able to pass either zero, -1, or a window to that function and get
  * the same behavior as in FOX.
  */
- 
+
 %typemap(in) FXWindow* TOOLBAR_DOCK_AFTER {
     if (TYPE($input) == T_FIXNUM) {
         $1 = reinterpret_cast<FXWindow *>(static_cast<long>(NUM2INT($input)));

data/test/TC_FXAccelTable.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 
 require 'fox16'
 
-include Fox
-
 class TC_FXAccelTable < Test::Unit::TestCase
+  include Fox
+
   def setup
     @accelTable = FXAccelTable.new
     @hotKey = fxparseHotKey('&q')

data/test/TC_FXApp.rb

@@ -1,9 +1,11 @@
 require 'test/unit'
 require 'fox16'
-
-include Fox
+require 'testcase'
+require 'socket'
 
 class TC_FXApp < Test::Unit::TestCase
+  include Fox
+
   def test_exception_for_second_app
     app = FXApp.new
     mainWindow = FXMainWindow.new(app, "")
@@ -14,3 +16,47 @@ class TC_FXApp < Test::Unit::TestCase
   end
 end
 
+class TC_FXApp2 < Fox::TestCase
+  include Fox
+
+  def setup
+    super(self.class.name)
+  end
+
+  def check_events(pipe_rd, pipe_wr)
+    app.addInput(pipe_wr, INPUT_WRITE, app, FXApp::ID_QUIT)
+    app.run
+    app.removeInput(pipe_wr, INPUT_WRITE)
+
+    app.addInput(pipe_rd, INPUT_READ, app, FXApp::ID_QUIT)
+    data_sent = false
+    app.addTimeout(1) do
+      data_sent = true
+      pipe_wr.write " "
+    end
+    app.run
+    assert data_sent, "the read input event shouldn't fire before some data is available"
+
+    app.removeInput(pipe_rd, INPUT_READ)
+    pipe_wr.close
+    pipe_rd.close unless pipe_rd.closed?
+  end
+
+  def test_addInput_on_pipe
+    check_events *IO.pipe
+  end
+
+  def test_addInput_on_socket
+    s = TCPServer.open 'localhost', 0
+    pipe_wr = TCPSocket.open 'localhost', s.addr[1]
+    pipe_rd = s.accept
+    s.close
+
+    check_events pipe_rd, pipe_wr
+  end
+
+  def test_addInput_on_popen
+    pipe_rdwr = IO.popen("cat", "r+")
+    check_events pipe_rdwr, pipe_rdwr
+  end
+end

data/test/TC_FXArc.rb

@@ -1,9 +1,9 @@
 require 'test/unit'
 require 'fox16'
 
-include Fox
-
 class TC_FXArc < Test::Unit::TestCase
+  include Fox
+
   def test_new
     anArc = FXArc.new
     assert_equal(0, anArc.x)

data/test/TC_FXBMPIcon.rb

@@ -2,9 +2,9 @@ require 'fox16'
 require 'test/unit'
 require 'testcase'
 
-include Fox
+class TC_FXBMPIcon < Fox::TestCase
+  include Fox
 
-class TC_FXBMPIcon < TestCase
   def setup
     super(self.class.name)
   end

data/test/TC_FXBMPImage.rb

@@ -2,9 +2,9 @@ require 'fox16'
 require 'test/unit'
 require 'testcase'
 
-include Fox
+class TC_FXBMPImage < Fox::TestCase
+  include Fox
 
-class TC_FXBMPImage < TestCase
   def setup
     super(self.class.name)
   end

data/test/TC_FXButton.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 require 'fox16'
 require 'testcase'
 
-include Fox
+class TC_FXButton < Fox::TestCase
+  include Fox
 
-class TC_FXButton < TestCase
   def setup
     super("TC_FXButton")
     @button = FXButton.new(mainWindow, "buttonText")

data/test/TC_FXCheckButton.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 require 'testcase'
 require 'fox16'
 
-include Fox
+class TC_FXCheckButton < Fox::TestCase
+  include Fox
 
-class TC_FXCheckButton < TestCase
   def setup
     super("TC_FXCheckButton")
     @checkButton = FXCheckButton.new(mainWindow, "cbText")

data/test/TC_FXComboBox.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 require 'testcase'
 require 'fox16'
 
-include Fox
+class TC_FXComboBox < Fox::TestCase
+  include Fox
 
-class TC_FXComboBox < TestCase
   def setup
     super(self.class.name)
     @comboBox = FXComboBox.new(mainWindow, 1)

data/test/TC_FXDC.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 
 require 'fox16'
 
-include Fox
-
 class TC_FXDC < Test::Unit::TestCase
+  include Fox
+
   def setup
     if FXApp.instance.nil?
       @app = FXApp.new('TC_FXDC', 'FXRuby')

data/test/TC_FXDCPrint.rb

@@ -1,10 +1,11 @@
 require 'test/unit'
 
 require 'fox16'
-
-include Fox
+require 'fileutils'
 
 class TC_FXDCPrint < Test::Unit::TestCase
+  include Fox
+
 private
   def printJob
     job = FXPrinter.new
@@ -25,7 +26,7 @@ private
     job.flags = PRINT_DEST_FILE
     job
   end
-  
+
   def hexdump(ios)
     count = 0
     ios.each_byte do |byte|
@@ -48,7 +49,7 @@ private
     File.open(actual, 'rb')   { |f| actual_contents = crlf_to_lf(f.read) }
     assert_equal(expected_contents, actual_contents)
   end
-  
+
 public
   def setup
     if FXApp.instance.nil?
@@ -92,7 +93,7 @@ public
     end
 #   assert_same_file_contents("howdypage.ps", printJob.name)
   end
-  
+
   def teardown
     if File.exists?("output.ps")
       FileUtils.rm_f("output.ps")

data/test/TC_FXDCWindow.rb

@@ -2,21 +2,23 @@ require 'test/unit'
 require 'testcase'
 require 'fox16'
 
-include Fox
+class TC_FXDCWindow < Fox::TestCase
+  include Fox
 
-class TC_FXDCWindow < TestCase
   def setup
     super(self.class.name)
     app.create
     mainWindow.create
   end
+
   def test_new
     dc = FXDCWindow.new(mainWindow)
     dc.drawPoint(0, 0)
     dc.end
   end
+
   def test_new_with_block
-    dc = FXDCWindow.new(mainWindow) do |dc|
+    FXDCWindow.new(mainWindow) do |dc|
       dc.drawPoint(0, 0)
     end
   end

data/test/TC_FXDataTarget.rb

@@ -1,9 +1,9 @@
 require 'test/unit'
 require 'fox16'
 
-include Fox
-
 class TC_FXDataTarget < Test::Unit::TestCase
+  include Fox
+
   def setup
     @nilTarget    = FXDataTarget.new
     @intTarget    = FXDataTarget.new(42)

data/test/TC_FXDialogBox.rb

@@ -1,9 +1,9 @@
 require 'test/unit'
 require 'fox16'
 
-include Fox
-
 class TC_FXDialogBox < Test::Unit::TestCase
+  include Fox
+
   def test_nil_app_raises_argument_error
     assert_raise ArgumentError do
       FXDialogBox.new(nil, "title")

data/test/TC_FXDirList.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 require 'testcase'
 require 'fox16'
 
-include Fox
+class TC_FXDirList < Fox::TestCase
+  include Fox
 
-class TC_FXDirList < TestCase
   def setup
     super(self.class.name)
     @dirList = FXDirList.new(mainWindow)

data/test/TC_FXExtentd.rb

@@ -1,9 +1,9 @@
 require 'test/unit'
 require 'fox16'
 
-include Fox
-
 class TC_FXExtentd < Test::Unit::TestCase
+  include Fox
+
   def test_lower_always_returns_same_instance
     e = FXExtentd.new(0, 1, 0, 1)
     assert_same e.lower, e.lower

data/test/TC_FXExtentf.rb

@@ -1,9 +1,9 @@
 require 'test/unit'
 require 'fox16'
 
-include Fox
-
 class TC_FXExtentf < Test::Unit::TestCase
+  include Fox
+
   def test_lower_always_returns_same_instance
     e = FXExtentf.new(0, 1, 0, 1)
     assert_same e.lower, e.lower

data/test/TC_FXFileAssoc.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 
 require 'fox16'
 
-include Fox
-
 class TC_FXFileAssoc < Test::Unit::TestCase
+  include Fox
+
   def setup
     @app = FXApp.instance || FXApp.new
     @icon = FXIcon.new(@app)

data/test/TC_FXFileStream.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 require 'fox16'
 require 'tempfile'
 
-include Fox
-
 class TC_FXFileStream < Test::Unit::TestCase
+  include Fox
+
   def setup
     @filestream = FXFileStream.new
   end

data/test/TC_FXFoldingList.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 require 'testcase'
 require 'fox16'
 
-include Fox
+class TC_FXFoldingList < Fox::TestCase
+  include Fox
 
-class TC_FXFoldingList < TestCase
   
   def setup
     super(self.class.name)

data/test/TC_FXFont.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 
 require 'fox16'
 
-include Fox
-
 class TC_FXFont < Test::Unit::TestCase
+  include Fox
+
   def setup
     if FXApp.instance.nil?
       @app = FXApp.new('TC_FXFont', 'FoxTest') 

data/test/TC_FXFontDesc.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 
 require 'fox16'
 
-include Fox
-
 class TC_FXFontDesc < Test::Unit::TestCase
+  include Fox
+
   def setup
     @fontdesc = FXFontDesc.new
   end

data/test/TC_FXGLGroup.rb

@@ -1,9 +1,9 @@
 require 'test/unit'
 require 'fox16'
 
-include Fox
-
 class TC_FXGLGroup < Test::Unit::TestCase
+  include Fox
+
   def setup
     @group = FXGLGroup.new
   end

data/test/TC_FXGLShape.rb

@@ -1,9 +1,9 @@
 require 'test/unit'
 require 'fox16'
 
-include Fox
-
 class TC_FXGLShape < Test::Unit::TestCase
+  include Fox
+
 
   DELTA = 1.0e-5
 

data/test/TC_FXGLViewer.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 require 'fox16'
 require 'testcase'
 
-include Fox
+class TC_FXGLViewer < Fox::TestCase
+  include Fox
 
-class TC_FXGLViewer < TestCase
   def setup
     super(self.class.name)
     vis = FXGLVisual.new(app, VISUAL_DOUBLEBUFFER)

data/test/TC_FXGradientBar.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 require 'fox16'
 require 'testcase'
 
-include Fox
+class TC_FXGradientBar < Fox::TestCase
+  include Fox
 
-class TC_FXGradientBar < TestCase
   def setup
     super(self.class.name)
     @gradientBar = FXGradientBar.new(mainWindow)

data/test/TC_FXHeader.rb

@@ -2,9 +2,9 @@ require 'fox16'
 require 'test/unit'
 require 'testcase'
 
-include Fox
+class TC_FXHeader < Fox::TestCase
+  include Fox
 
-class TC_FXHeader < TestCase
 
   def setup
     super(self.class.name)

data/test/TC_FXHiliteStyle.rb

@@ -1,9 +1,9 @@
 require 'fox16'
 require 'test/unit'
 
-include Fox
-
 class TC_FXHiliteStyle < Test::Unit::TestCase
+  include Fox
+
 
   def setup
     @style = FXHiliteStyle.new

data/test/TC_FXIconDict.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 require 'fox16'
 require 'testcase'
 
-include Fox
+class TC_FXIconDict < Fox::TestCase
+  include Fox
 
-class TC_FXIconDict < TestCase
   def setup
     super(self.class.name)
   end

data/test/TC_FXIconList.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 require 'testcase'
 require 'fox16'
 
-include Fox
+class TC_FXIconList < Fox::TestCase
+  include Fox
 
-class TC_FXIconList < TestCase
 
 private
 

data/test/TC_FXId.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 require 'fox16'
 require 'testcase'
 
-include Fox
+class TC_FXId < Fox::TestCase
+  include Fox
 
-class TC_FXId < TestCase
   def setup
     super(self.class.name)
   end

data/test/TC_FXImage.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 require 'testcase'
 require 'fox16'
 
-include Fox
+class TC_FXImage < Fox::TestCase
+  include Fox
 
-class TC_FXImage < TestCase
   def setup
     super(self.class.name)
   end

data/test/TC_FXLight.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 
 require 'fox16'
 
-include Fox
-
 class TC_FXLight < Test::Unit::TestCase
+  include Fox
+
   def setup
     @light = FXLight.new
   end

data/test/TC_FXList.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 require 'testcase'
 require 'fox16'
 
-include Fox
+class TC_FXList < Fox::TestCase
+  include Fox
 
-class TC_FXList < TestCase
   def setup
     super(self.class.name)
     @list = FXList.new(mainWindow)

data/test/TC_FXListBox.rb

@@ -2,9 +2,9 @@ require 'test/unit'
 require 'testcase'
 require 'fox16'
 
-include Fox
+class TC_FXListBox < Fox::TestCase
+  include Fox
 
-class TC_FXListBox < TestCase
   def setup
     super(self.class.name)
     @listBox = FXListBox.new(mainWindow)

data/test/TC_FXMainWindow.rb

@@ -1,9 +1,9 @@
 require 'test/unit'
 require 'fox16'
 
-include Fox
-
 class TC_FXMainWindow < Test::Unit::TestCase
+  include Fox
+
   def test_nil_app_raises_argument_error
     assert_raise ArgumentError do
       FXMainWindow.new(nil, "title")

data/test/TC_FXMat4f.rb

@@ -1,9 +1,9 @@
 require 'test/unit'
 require 'fox16'
 
-include Fox
-
 class TC_FXMat4f < Test::Unit::TestCase
+  include Fox
+
   def setup
     @hmat = FXMat4f.new
   end