fxruby 1.2.3 → 1.2.4

data/rdoc-sources/FXMemoryStream.rb

@@ -1,45 +1,48 @@
 module Fox
-  # Memory Store Definition
-  class FXMemoryStream : public FXStream {
+  #
+  # A FXMemoryStream is a stream that reads from (or writes to) a buffer of bytes in memory.
+  # That buffer may "owned" by either the application code or by the stream object itself.
+  # In the latter case, the stream object will dispose of the buffer contents when the stream
+  # is closed.
+  #
+  class FXMemoryStream < FXStream
 
     #
-    # Return an initialized FXMemoryStream instance.
+    # Construct a new memory stream with given container object.
+    # The container object is an object that will itself not be
+    # saved to or loaded from the stream, but which may be referenced
+    # by other objects. These references will be properly saved and restored.
+    #
+    # ==== Parameters:
+    #
+    # +cont+::	the container object, or +nil+ if there is none [FXObject].
     #
     def initialize(cont=nil) # :yields: theMemoryStream
     end
   
     #
     # Open memory stream for reading or writing.
-    # Returns true if successful, false otherwise.
+    # Returns +true+ if successful, +false+ otherwise.
     #
     # ==== Parameters:
     #
-    # +save_or_load+::	access mode, either +FXStreamSave+ or +FXStreamLoad+ [Integer]
-    # +data+::		memory buffer used for the stream [String]
+    # +save_or_load+:: access mode, either +FXStreamSave+ or +FXStreamLoad+ [Integer]
+    # +data+::         memory buffer to be used for the stream, or +nil+ if the stream object should allocate its own buffer [String]
     #
     def open(save_or_load, data); end
     
     #
-    # Open memory stream for reading or writing.
-    # Returns true if successful, false otherwise.
-    #
-    # ==== Parameters:
-    #
-    # +save_or_load+::	access mode, either +FXStreamSave+ or +FXStreamLoad+ [Integer]
-    # +size+::		what is it? [Integer]
-    # +data+::		memory buffer used for the stream [String]
-    #
-    def open(save_or_load, size, data); end
-  
-    #
-    # Take buffer away from stream; returns a String containing the buffer contents.
+    # Take buffer away from stream, thus transferring ownership of the buffer
+    # from the stream object to the caller.
+    # Returns a string containing the buffer contents.
     #
     def takeBuffer; end
     
     #
-    # Give buffer to stream
+    # Give buffer (a string) to this stream, thus transferring ownership of
+    # the buffer from the caller to the stream object.
     #
-    def giveBuffer(buffer, sp); end
+    def giveBuffer(buffer); end
   end
 end
 

data/rdoc-sources/fxdefs.rb

@@ -38,23 +38,23 @@ module Fox
   # of the modifiers _Ctrl_, _Alt_ and _Shift_, plus the key of interest.
   # For example, to get the accelerator key for Ctrl+Alt+F7, you'd use:
   #
-  #   hotKey = fxparseaccel("Ctrl+Alt+F7")
+  #   hotKey = fxparseAccel("Ctrl+Alt+F7")
   #
-  def Fox.fxparseaccel(str); end
+  def Fox.fxparseAccel(str); end
   
   #
   # Return a hot key value that represents the hot key described in
   # the string _str_. This method is less flexible than the similar
-  # Fox.fxparseaccel, and is mainly used internally for parsing the
+  # Fox.fxparseAccel, and is mainly used internally for parsing the
   # labels for FXButton and FXMenuCommand widgets. For example, this:
   #
-  #   fxparsehotkey("&File")
+  #   fxparseHotKey("&File")
   #
   # returns the equivalent of:
   #
-  #   fxparseaccel("Alt+F")
+  #   fxparseAccel("Alt+F")
   #
-  def Fox.fxparsehotkey(s); end
+  def Fox.fxparseHotKey(s); end
   
   # Locate hot key underline offset from begin of string
   def Fox.fxfindhotkeyoffset(s); end

data/tests/TC_FXImage.rb

@@ -8,46 +8,55 @@ class TC_FXImage < TestCase
   def setup
     super(self.class.name)
   end
-  
-  def test_default_constructor_args
+
+  def test_default_constructor_args_1
     img = FXImage.new(app)
     assert_same(nil, img.data)
     assert_equal(0, img.options)
     assert_equal(1, img.width)
     assert_equal(1, img.height)
-
+  end
+  
+  def test_default_constructor_args_2
     img = FXImage.new(app, nil)
     assert_same(nil, img.data)
     assert_equal(0, img.options)
     assert_equal(1, img.width)
     assert_equal(1, img.height)
+  end
 
+  def test_default_constructor_args_3
     img = FXImage.new(app, nil, 0)
     assert_same(nil, img.data)
     assert_equal(0, img.options)
     assert_equal(1, img.width)
     assert_equal(1, img.height)
+  end
 
+  def test_default_constructor_args_4
     img = FXImage.new(app, nil, 0, 1)
     assert_same(nil, img.data)
     assert_equal(0, img.options)
     assert_equal(1, img.width)
     assert_equal(1, img.height)
+  end
 
+  def test_default_constructor_args_5
     img = FXImage.new(app, nil, 0, 1, 1)
     assert_same(nil, img.data)
     assert_equal(0, img.options)
     assert_equal(1, img.width)
     assert_equal(1, img.height)
   end
-  
-  def test_image_owned
-    img = FXImage.new(app, nil, IMAGE_OWNED, 2, 2)
-    assert_equal(2, img.width)
-    assert_equal(2, img.height)
+
+  def test_new_image_nil_pixels_owned
+    img = FXImage.new(app, nil, IMAGE_OWNED)
+    assert_equal(1, img.width)
+    assert_equal(1, img.height)
     data = img.data
     assert_instance_of(FXMemoryBuffer, data)
-    assert_equal(2*2, data.size)
+    assert_equal(1*1, data.size)
+    assert_equal(IMAGE_OWNED, img.options)
   end
 
   def test_create
@@ -94,7 +103,7 @@ class TC_FXImage < TestCase
     img = FXImage.new(app)
     img.render
   end
-  
+
 =begin
 
   def test_scale
@@ -140,5 +149,7 @@ class TC_FXImage < TestCase
   
   def test_loadPixels
   end
+  
 =end
+
 end

data/tests/TC_FXMemoryStream.rb

@@ -15,44 +15,54 @@ class TC_FXMemoryStream < Test::Unit::TestCase
 
   public
 
-  def test_open
-    s1 = FXMemoryStream.new
-    assert(s1.open(FXStreamLoad, nil))
-    assert_equal(DEFAULT_BUFFER_SIZE, s1.space)
-    s1.close
-
-    s2 = FXMemoryStream.new
-    assert(s2.open(FXStreamSave, nil))
-    assert_equal(DEFAULT_BUFFER_SIZE, s2.space)
-    s2.close
-
-    s3 = FXMemoryStream.new
-    assert(s3.open(FXStreamLoad, "foo"))
-    assert_equal(3, s3.space)
-    s3.close
-
-    s4 = FXMemoryStream.new
-    assert(s4.open(FXStreamSave, "foo"))
-    assert_equal(3, s4.space)
-    s4.close
+  def test_open_streamload_nil_data
+    s = FXMemoryStream.new
+    assert(s.open(FXStreamLoad, nil))
+    assert_equal(DEFAULT_BUFFER_SIZE, s.space)
+    s.close
   end
 
-  def test_open_s
-    s1 = FXMemoryStream.open(FXStreamLoad, nil)
-    assert_equal(DEFAULT_BUFFER_SIZE, s1.space)
-    s1.close
+  def test_open_streamsave_nil_data
+    s = FXMemoryStream.new
+    assert(s.open(FXStreamSave, nil))
+    assert_equal(DEFAULT_BUFFER_SIZE, s.space)
+    s.close
+  end
 
-    s2 = FXMemoryStream.open(FXStreamSave, nil)
-    assert_equal(DEFAULT_BUFFER_SIZE, s2.space)
-    s2.close
+  def test_open_streamload_unknown_size
+  	s = FXMemoryStream.new
+  	assert(s.open(FXStreamLoad, "foo"))
+  	s.close
+	end
+
+	def test_open_streamsave_unknown_size
+		s = FXMemoryStream.new
+		assert(s.open(FXStreamSave, "foo"))
+		s.close
+	end
+
+  def test_open_s_load_nil_buffer
+    s = FXMemoryStream.open(FXStreamLoad, nil)
+    assert_equal(DEFAULT_BUFFER_SIZE, s.space)
+    s.close
+  end
 
-    s3 = FXMemoryStream.open(FXStreamLoad, "foo")
-    assert_equal(3, s3.space)
-    s3.close
+  def test_open_s_save_nil_buffer
+    s = FXMemoryStream.open(FXStreamSave, nil)
+    assert_equal(DEFAULT_BUFFER_SIZE, s.space)
+    s.close
+  end
+
+  def test_open_s_load_unknown_buffer_size
+    s = FXMemoryStream.open(FXStreamLoad, "foo")
+    assert_equal(3, s.space)
+    s.close
+  end
 
-    s4 = FXMemoryStream.open(FXStreamSave, "foo")
-    assert_equal(3, s4.space)
-    s4.close
+  def test_open_s_save_unknown_buffer_size
+    s = FXMemoryStream.open(FXStreamSave, "foo")
+    assert_equal(3, s.space)
+    s.close
   end
 
   def test_open_s_with_block
@@ -73,7 +83,7 @@ class TC_FXMemoryStream < Test::Unit::TestCase
   def test_takeBuffer_empty
     FXMemoryStream.open(FXStreamSave, nil) do |stream|
       buffer = stream.takeBuffer
-      assert_equal("\0", buffer)
+      assert_equal("\0" * 16, buffer)
     end
   end
 

data/tests/testcase.rb

@@ -13,12 +13,11 @@ module Fox
 	if FXApp.instance.nil?
 	  @theApp = FXApp.new(appName, 'FXRuby')
 	  @theApp.init([])
-	  FXMainWindow.new(@theApp, appName)
 	else
 	  @theApp = FXApp.instance
 	end
-      end
-      @theMainWindow = FXMainWindow.new(@theApp, appName)
+	@theMainWindow = FXMainWindow.new(@theApp, appName)
+      end      
     end
     
     # Return a reference to the application

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: fxruby
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
-date: 2005-01-22
+  version: 1.2.4
+date: 2005-02-23
 summary: FXRuby is the Ruby binding to the FOX GUI toolkit.
 require_paths: 
   - ext/fox12
@@ -30,7 +30,6 @@ authors:
 files: 
   - ANNOUNCE
   - ChangeLog
-  - INSTALL
   - LICENSE
   - README
   - index.html
@@ -127,6 +126,7 @@ files:
   - examples/inputs.rb
   - examples/iRAA.rb
   - examples/mditest.rb
+  - examples/mditest2.rb
   - examples/pig.rb
   - examples/RAA.rb
   - examples/raabrowser.rb

data/INSTALL

@@ -1,50 +0,0 @@
-                             **** WAIT! ****
-
-If you're planning to use FXRuby on Windows, be aware that the Pragmatic
-Programmers' Ruby installer for Windows contains a version of FXRuby,
-although it may not be the most recent one.
-
-                             The Basics
-                            ============
-
-This is more or less a plain text transcription of the first part of the
-build instructions found in the FXRuby User's Guide here:
-
-    http://www.fxruby.org/doc/build.html
-
-If you have additional questions about how the build and installation process
-works you might want to also read that document.
-
-These instructions assume that you've already downloaded, compiled and
-installed FOX. And if you're reading this, you must have already downloaded
-and unpacked the FXRuby source tarball. The next step is to change directories
-to the top-level and type:
-
-    ruby install.rb config
-
-By default, the install.rb script will look for the FOX include files and
-library in the standard /usr/local/include/fox and /usr/local/lib directories,
-respectively. You can override these locations by passing a few additional
-arguments to install.rb during this step, e.g.
-
-    ruby install.rb config -- \
-        --with-fox-include=/home/lyle/fox-1.0.42/include \
-        --with-fox-lib=/home/lyle/fox-1.0.42/src/.libs
-
-Once the build has been configured, you can start the build by typing:
-
-    ruby install.rb setup
-
-It will take quite awhile to build FXRuby, even on a fast machine, so this
-might be a good time to take a coffee break. If you run into problems during
-the compilation, please check the list of things that go wrong:
-
-    http://www.fxruby.org/doc/build.html#TRAGEDIES
-
-before sending Lyle an e-mail. There's a good chance that someone else has
-run into this problem already and that we've documented the workaround(s).
-
-Once it's finished compiling, install FXRuby by typing:
-
-    ruby install.rb install
-