fxruby 1.4.1 → 1.4.2

data/lib/fox14/core.rb

@@ -23,18 +23,36 @@ module Fox
       warn "addItemFirst() is deprecated; use prependItem() instead"
       prependItem(*args)
     end
+
     def addItemLast(*args) # :nodoc:
       warn "addItemLast() is deprecated; use appendItem() instead"
       appendItem(*args)
     end
+
     def addItemAfter(other, *args) # :nodoc:
       warn "addItemAfter() is deprecated; use insertItem() instead"
       insertItem(other.next, other.parent, *args)
     end
+
     def addItemBefore(other, *args) # :nodoc:
       warn "addItemBefore() is deprecated; use insertItem() instead"
       insertItem(other, other.parent, *args)
     end
+
+    def reparentItem(item, father) # :nodoc:
+      warn "reparentItem() is deprecated; use moveItem() instead"
+      moveItem(nil, father, item)
+    end
+  
+    def moveItemBefore(other, item) # :nodoc:
+      warn "moveItemBefore() is deprecated; use moveItem() instead"
+      moveItem(other, other.parent, item)
+    end
+  
+    def moveItemAfter(other, item) # :nodoc:
+      warn "moveItemAfter() is deprecated; use moveItem() instead"
+      moveItem(other.next, other.parent, item)
+    end
   end
 
   class FXTreeListBox
@@ -323,6 +341,74 @@ module Fox
   # General failure
   class FXStreamFailureError < FXStreamError ; end
   
+  class FXCheckButton
+    # Return +true+ if this check button is in the checked state.
+    def checked?
+      self.checkState == TRUE
+    end
+    
+    # Return +true+ if this check button is in the unchecked state.
+    def unchecked?
+      self.checkState == FALSE
+    end
+    
+    # Return +true+ if this check button is in the indeterminate, or "maybe", state.
+    def maybe?
+      self.checkState == MAYBE
+    end
+  end
+  
+  class FXMenuCheck
+    # Return +true+ if this menu check button is in the checked state.
+    def checked?
+      self.checkState == TRUE
+    end
+    
+    # Return +true+ if this menu check button is in the unchecked state.
+    def unchecked?
+      self.checkState == FALSE
+    end
+    
+    # Return +true+ if this menu check button is in the indeterminate, or "maybe", state.
+    def maybe?
+      self.checkState == MAYBE
+    end
+  end
+  
+  class FXRadioButton
+    # Return +true+ if this radio button is in the checked state.
+    def checked?
+      self.checkState == TRUE
+    end
+
+    # Return +true+ if this radio button is in the unchecked state.
+    def unchecked?
+      self.checkState == FALSE
+    end
+
+    # Return +true+ if this radio button is in the indeterminate, or "maybe", state.
+    def maybe?
+      self.checkState == MAYBE
+    end
+  end
+  
+  class FXMenuRadio
+    # Return +true+ if this menu radio button is in the checked state.
+    def checked?
+      self.checkState == TRUE
+    end
+
+    # Return +true+ if this menu radio button is in the unchecked state.
+    def unchecked?
+      self.checkState == FALSE
+    end
+
+    # Return +true+ if this menu radio button is in the indeterminate, or "maybe", state.
+    def maybe?
+      self.checkState == MAYBE
+    end
+  end
+
   class FXDC
     #
     # Draw a circle centered at (_x_, _y_), with specified radius.

data/lib/fox14/version.rb

@@ -5,7 +5,7 @@ module Fox
   # Returns the FXRuby version number as a string, e.g. "1.0.19".
   #
   def Fox.fxrubyversion
-    "1.4.1"
+    "1.4.2"
   end
 end
 

data/rdoc-sources/FXCheckButton.rb

@@ -47,20 +47,5 @@ module Fox
     # Construct new check button
     def initialize(parent, text, target=nil, selector=0, opts=CHECKBUTTON_NORMAL, x=0, y=0, width=0, height=0, padLeft=DEFAULT_PAD, padRight=DEFAULT_PAD, padTop=DEFAULT_PAD, padBottom=DEFAULT_PAD) # :yields: theCheckButton
     end
-
-    # Return +true+ if the check button state is +TRUE+
-    def checked?
-      self.check == TRUE
-    end
-    
-    # Return +true+ if the check button state is +FALSE+
-    def unchecked?
-      self.check == FALSE
-    end
-    
-    # Return +true+ if the check button state is +MAYBE+
-    def maybe?
-      self.check == MAYBE
-    end
   end
 end

data/rdoc-sources/FXDC.rb

@@ -193,7 +193,7 @@ module Fox
     attr_reader	:clipHeight
     
     # Font to draw text with [FXFont]
-    attr_accessor :textFont
+    attr_accessor :font
 
     # Construct dummy DC
     def initialize(app) ; end

data/rdoc-sources/FXDockSite.rb

@@ -4,28 +4,28 @@ module Fox
   # Dock site widgets are typically embedded inside the main window, placed
   # against those sides where docking of toolbars is to be allowed.
   # Dock bars placed inside a dock site are laid out in horizontal or vertical bands
-  # called galleys.  A toolbar with the LAYOUT_DOCK_SAME hint is preferentially placed
-  # on the same galley as its previous sibling.  A dock bar with the LAYOUT_DOCK_NEXT is
+  # called _galleys_. A toolbar with the +LAYOUT_DOCK_SAME+ hint is preferentially placed
+  # on the same galley as its previous sibling. A dock bar with the +LAYOUT_DOCK_NEXT+ is
   # always placed on the next galley.
-  # Each galley will have at least one dock bar shown in it.  Several dock bars
+  # Each galley will have at least one dock bar shown in it. Several dock bars
   # may be placed side-by-side inside one galley, unless there is insufficient
-  # room.  If there is insufficient room to place another dock bar, that dock bar
-  # will be moved to the next galley, even though its LAYOUT_DOCK_NEXT option
-  # is not set.  This implies that when the main window is resized and more room
+  # room. If there is insufficient room to place another dock bar, that dock bar
+  # will be moved to the next galley, even though its +LAYOUT_DOCK_NEXT+ option
+  # is not set. This implies that when the main window is resized, and more room
   # becomes available, it will jump back to its preferred galley.
   # Within a galley, dock bars will be placed from left to right, at the given
   # x and y coordinates, with the constraints that the dock bar will stay within
-  # the galley, and do not overlap each other.  It is possible to use LAYOUT_FILL_X
-  # and/or LAYOUT_FILL_Y to stretch a toolbar to the available space on its galley.
+  # the galley, and do not overlap each other. It is possible to use +LAYOUT_FILL_X+
+  # and/or +LAYOUT_FILL_Y+ to stretch a toolbar to the available space on its galley.
   # The galleys are oriented horizontally if the dock site is placed inside
-  # a top level window using LAYOUT_SIDE_TOP or LAYOUT_SIDE_BOTTOM, and
-  # vertically oriented if placed with LAYOUT_SIDE_LEFT or LAYOUT_SIDE_RIGHT.
+  # a top level window using +LAYOUT_SIDE_TOP+ or +LAYOUT_SIDE_BOTTOM+, and
+  # vertically oriented if placed with +LAYOUT_SIDE_LEFT+ or +LAYOUT_SIDE_RIGHT+.
   #
   class FXDockSite < FXPacker
     #
-    # Construct a toolbar dock layout manager.  Passing LAYOUT_SIDE_TOP or LAYOUT_SIDE_BOTTOM
-    # causes the toolbar dock to be oriented horizontally.  Passing LAYOUT_SIDE_LEFT or
-    # LAYOUT_SIDE_RIGHT causes it to be oriented vertically.
+    # Construct a toolbar dock layout manager. Passing +LAYOUT_SIDE_TOP+ or +LAYOUT_SIDE_BOTTOM+
+    # causes the toolbar dock to be oriented horizontally. Passing +LAYOUT_SIDE_LEFT+ or
+    # +LAYOUT_SIDE_RIGHT+ causes it to be oriented vertically.
     #
     def initialize(p, opts=0, x=0, y=0, w=0, h=0, pl=0, pr=0, pt=0, pb=0, hs=0, vs=0) # :yields: theDockSite
     end

data/rdoc-sources/FXFont.rb

@@ -311,7 +311,14 @@ module Fox
     def fontMono? ; end
   
     #
-    # Return +true+ if font has glyph for _ch_.
+    # Return +true+ if font has glyph for _ch_. Here, _ch_ can either be an
+    # ordinal value, e.g.
+    #
+    #     aFont.hasChar?(?a)
+    #
+    # or a string of length one (i.e. a single character), e.g.
+    #
+    #     aFont.hasChar?('a')
     #
     def hasChar?(ch) ; end
 

data/rdoc-sources/FXImage.rb

@@ -23,8 +23,6 @@ module Fox
   #   Dither image to look better
   # +IMAGE_NEAREST+::
   #   Turn off dithering and map to nearest color
-  # +IMAGE_ALPHA+::
-  #   Data has alpha channel
   # +IMAGE_OPAQUE+::
   #   Force opaque background
   # +IMAGE_ALPHACOLOR+::

data/rdoc-sources/FXScrollArea.rb

@@ -44,11 +44,11 @@ module Fox
     # Scroll style [Integer]
     attr_accessor :scrollStyle
     
-    # Horizontal scrollbar [FXScrollbar]
-    attr_reader	:horizontalScrollbar
+    # Horizontal scrollbar [FXScrollBar]
+    attr_reader	:horizontalScrollBar
     
-    # Vertical scrollbar [FXScrollbar]
-    attr_reader	:verticalScrollbar
+    # Vertical scrollbar [FXScrollBar]
+    attr_reader	:verticalScrollBar
     
     # Current x-position [Integer]
     attr_reader	:xPosition

data/rdoc-sources/FXStream.rb

@@ -1,6 +1,24 @@
 module Fox
   #
-  # Persistent store definition
+  # A stream is a way to serialize data and objects into a byte stream.
+  # Each item of data that is saved or loaded from the stream may be byte-swapped,
+  # thus allowing little-endian machines to read data produced on big endian ones
+  # and vice-versa.
+  # Data is serialized exactly as-is.  There are no tags or other markers
+  # inserted into the stream; thus, the stream may be used to save or load arbitrary
+  # binary data.
+  # Objects derived from FXObjects may be serialized also; whenever a reference to an
+  # object is serialized, a table is consulted to determine if the same object has
+  # been encountered previously; if not, the object is added to the table and then
+  # its contents are serialized.  If the object has been encountered before, only a
+  # reference to the object is serialized.
+  # When loading back a serialized object, new instances are constructed using
+  # the default constructor, and subsequently the object's contents are loaded.
+  # A special container object may be passed in which is placed in the table
+  # as if it had been encountered before; this will cause only references to this
+  # object to be saved.  The container object is typically the top-level document
+  # object which manages all objects contained by it.  Additional objects may be
+  # added using addObject(); these will not be actually saved or loaded.
   #
   # === Stream status codes
   #

data/rdoc-sources/FXTable.rb

@@ -256,18 +256,6 @@ module Fox
     # Table style [Integer]
     attr_accessor	:tableStyle
     
-    # Number of leading rows [Integer]
-    attr_accessor	:leadingRows
-    
-    # Number of trailing rows [Integer]
-    attr_accessor	:trailingRows
-    
-    # Number of leading columns [Integer]
-    attr_accessor	:leadingCols
-    
-    # Number of trailing columns [Integer]
-    attr_accessor	:trailingCols
-    
     # The column header height mode is either fixed (LAYOUT_FIX_HEIGHT) or variable.
     # In variable height mode, the column header will size to fit the contents in it.
     # In fixed height mode, the size is explicitly set via the _columnHeaderHeight_

data/rdoc-sources/FXTopWindow.rb

@@ -18,6 +18,8 @@ module Fox
   # +DECOR_MAXIMIZE+::        Maximize button
   # +DECOR_CLOSE+::           Close button
   # +DECOR_BORDER+::          Border
+  # +DECOR_SHRINKABLE+::      Window can become smaller
+  # +DECOR_STRETCHABLE+::     Window can become larger
   # +DECOR_RESIZE+::          Resize handles
   # +DECOR_MENU+::            Window menu
   # +DECOR_ALL+::             All of the above
@@ -33,9 +35,12 @@ module Fox
   #
   # === Message identifiers
   #
-  # +ID_ICONIFY+::            Iconify the window
-  # +ID_DEICONIFY+::          Deiconify the window
-  # +ID_QUERY_DOCK+::         Toolbar asks to dock
+  # +ID_MAXIMIZE+::		Maximize the window
+  # +ID_MINIMIZE+::		Minimize the window
+  # +ID_RESTORE+::		Restore the window
+  # +ID_CLOSE+::		Close the window
+  # +ID_QUERY_DOCK+::		Toolbar asks to dock
+  #
 
   class FXTopWindow < FXShell
 
@@ -83,14 +88,34 @@ module Fox
     # Obtain border sizes added to our window by the window manager.
     # Returns a 4-element array containing the left, right, top and bottom border sizes (in pixels).
     def getWMBorders(); end
-  
-    # Iconify window
-    def iconify() ; end
-  
-    # Deiconify window
-    def deiconify() ; end
-  
-    # Return +true+ if window has been iconified
-    def iconified?() ; end
+    
+    # Return +true+ if window is maximized.
+    def maximized? ; end
+    
+    # Return +true+ if window is minimized.
+    def minimized? ; end
+
+    #
+    # Maximize window and return +true+ if maximized.
+    # If _notify_ is +true+, sends a +SEL_MAXIMIZE+ message to its message target.
+    #
+    def maximize(notify=false); end
+    
+    #
+    # Minimize or iconify window and return +true+ if minimized.
+    # If _notify_ is +true+, sends a +SEL_MINIMIZE+ message to its message target.
+    #
+    def minimize(notify=false); end
+    
+    #
+    # Restore window to normal and return +true+ if restored.
+    # If _notify_ is +true+, sends a +SEL_RESTORE+ message to its message target.
+    #
+    def restore(notify=false); end
+    
+    #
+    # Close window and return +true+ if actually closed.
+    #
+    def close(notify=false); end
   end
 end

data/rdoc-sources/FXTreeList.rb

@@ -259,7 +259,6 @@ module Fox
     # ==== Parameters:
     #
     # +p+::	the parent window for this tree list [FXComposite]
-    # +nvis+::	number of visible items [Integer]
     # +tgt+::	the message target, if any, for this tree list [FXObject]
     # +sel+::	the message identifier for this tree list [Integer]
     # +opts+::	tree list options [Integer]
@@ -268,7 +267,7 @@ module Fox
     # +w+::	initial width [Integer]
     # +h+::	initial height [Integer]
     #
-    def initialize(p, nvis, tgt=nil, sel=0, opts=TREELIST_NORMAL, x=0, y=0, w=0, h=0) # :yields: theTreeList
+    def initialize(p, tgt=nil, sel=0, opts=TREELIST_NORMAL, x=0, y=0, w=0, h=0) # :yields: theTreeList
     end
 
     #
@@ -475,9 +474,6 @@ module Fox
     # message target after the sub-tree is expanded.
     def expandTree(tree, notify=false); end
   
-    # Reparent _item_ under _parentItem_.
-    def reparentItem(item, parentItem); end
-  
     #
     # Change current item. If there is already a current item, that item
     # is first closed. After _item_ is set as the tree list's current item,

data/tests/TC_FXFont.rb

@@ -56,4 +56,14 @@ class TC_FXFont < Test::Unit::TestCase
     assert_instance_of(Array, fonts)
     assert(fonts.length > 0)
   end
+  
+  def test_hasChar?
+    @app.normalFont.create
+    assert(@app.normalFont.hasChar('a'))
+    assert(@app.normalFont.hasChar(?a))
+    assert(@app.normalFont.hasChar?('a'))
+    assert(@app.normalFont.hasChar?(?a))
+    assert_raises(ArgumentError) { @app.normalFont.hasChar? "" }
+    assert_raises(ArgumentError) { @app.normalFont.hasChar? "ab" }
+  end
 end

data/tests/TC_FXMenuCheck.rb

@@ -0,0 +1,57 @@
+require 'test/unit'
+require 'testcase'
+require 'fox14'
+
+include Fox
+
+class TC_FXMenuCheck < TestCase
+  def setup
+    super(self.class.name)
+    @menuCheck = FXMenuCheck.new(mainWindow, "menuCheck")
+  end
+  
+  def test_setCheck_TRUE
+    @menuCheck.check = Fox::TRUE
+    assert_equal(true, @menuCheck.check)
+    assert_equal(Fox::TRUE, @menuCheck.checkState)
+    assert(@menuCheck.checked?)
+    assert(!@menuCheck.unchecked?)
+    assert(!@menuCheck.maybe?)
+  end
+  
+  def test_setCheck_FALSE
+    @menuCheck.check = Fox::FALSE
+    assert_equal(false, @menuCheck.check)
+    assert_equal(Fox::FALSE, @menuCheck.checkState)
+    assert(!@menuCheck.checked?)
+    assert(@menuCheck.unchecked?)
+    assert(!@menuCheck.maybe?)
+  end
+  
+  def test_setCheck_MAYBE
+    @menuCheck.check = Fox::MAYBE
+    assert_equal(true, @menuCheck.check) # this is not a typo!
+    assert_equal(Fox::MAYBE, @menuCheck.checkState)
+    assert(!@menuCheck.checked?)
+    assert(!@menuCheck.unchecked?)
+    assert(@menuCheck.maybe?)
+  end
+  
+  def test_setCheck_true
+    @menuCheck.check = true
+    assert_equal(true, @menuCheck.check)
+    assert_equal(Fox::TRUE, @menuCheck.checkState)
+    assert(@menuCheck.checked?)
+    assert(!@menuCheck.unchecked?)
+    assert(!@menuCheck.maybe?)
+  end
+  
+  def test_setCheck_false
+    @menuCheck.check = false
+    assert_equal(false, @menuCheck.check)
+    assert_equal(Fox::FALSE, @menuCheck.checkState)
+    assert(!@menuCheck.checked?)
+    assert(@menuCheck.unchecked?)
+    assert(!@menuCheck.maybe?)
+  end
+end