[Fxruby-commits] CVS: FXRuby/lib/fox canvas.rb,1.1,1.2 scintilla.rb,1.1,1.2 aliases.rb,1.24,1.25 ove
Status: Inactive
Brought to you by:
lyle
Menu
▾
▴
[Fxruby-commits] CVS: FXRuby/lib/fox canvas.rb,1.1,1.2 scintilla.rb,1.1,1.2 aliases.rb,1.24,1.25 overloads.rb,1.7,1.8
|
From: Lyle J. <ly...@us...> - 2002-07-11 13:33:16
|
Update of /cvsroot/fxruby/FXRuby/lib/fox
In directory usw-pr-cvs1:/tmp/cvs-serv26972/lib/fox
Modified Files:
aliases.rb overloads.rb
Added Files:
canvas.rb scintilla.rb
Log Message:
Merged changes from the release10 branch back onto the main trunk.
Index: aliases.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/lib/fox/aliases.rb,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** aliases.rb 3 Apr 2002 21:40:57 -0000 1.24
--- aliases.rb 11 Jul 2002 13:33:13 -0000 1.25
***************
*** 125,129 ****
class FX_ColorWell
alias rgba= setRGBA
! alias rbga getRGBA
alias opaqueOnly= setOpaqueOnly
alias opaqueOnly? isOpaqueOnly
--- 125,129 ----
class FX_ColorWell
alias rgba= setRGBA
! alias rgba getRGBA
alias opaqueOnly= setOpaqueOnly
alias opaqueOnly? isOpaqueOnly
***************
*** 183,186 ****
--- 183,192 ----
alias hotY getHotY
end
+ class FX_DataTarget
+ alias target getTarget
+ alias target= setTarget
+ alias selector getSelector
+ alias selector= setSelector
+ end
class FXDataTarget
alias value getValue
***************
*** 209,216 ****
alias function getFunction
alias function= setFunction
alias tile getTile
alias stippleBitmap getStippleBitmap
alias stipplePattern getStipplePattern
! alias clipRegion setClipRegion
alias clipRectangle getClipRectangle
alias clipX getClipX
--- 215,225 ----
alias function getFunction
alias function= setFunction
+ alias tile= setTile
alias tile getTile
+ alias stipple= setStipple
alias stippleBitmap getStippleBitmap
alias stipplePattern getStipplePattern
! alias clipRegion= setClipRegion
! alias clipRectangle= setClipRectangle
alias clipRectangle getClipRectangle
alias clipX getClipX
***************
*** 226,229 ****
--- 235,240 ----
end
class FX_Dial
+ alias range getRange
+ alias range= setRange
alias value getValue
alias value= setValue
***************
*** 244,255 ****
end
class FX_Dict
! alias length no
! alias size no
! # alias delete remove
! alias has_key? has_key
! alias include? has_key
! alias key? has_key
! alias member? has_key
! alias empty? empty
end
class FX_DirBox
--- 255,262 ----
end
class FX_Dict
! alias size length
! alias include? has_key?
! alias key? has_key?
! alias member? has_key?
end
class FX_DirBox
***************
*** 672,694 ****
end
class FX_List
! alias numItems getNumItems
! alias numVisible getNumVisible
! alias numVisible= setNumVisible
! alias currentItem getCurrentItem
! alias anchorItem= setAnchorItem
! alias anchorItem getAnchorItem
! alias cursorItem getCursorItem
! alias font= setFont
! alias font getFont
! alias textColor getTextColor
! alias textColor= setTextColor
! alias selBackColor getSelBackColor
! alias selBackColor= setSelBackColor
! alias selTextColor getSelTextColor
! alias selTextColor= setSelTextColor
! alias listStyle getListStyle
! alias listStyle= setListStyle
! alias helpText= setHelpText
! alias helpText getHelpText
end
class FX_ListBox
--- 679,705 ----
end
class FX_List
! alias numItems getNumItems
! alias numVisible getNumVisible
! alias numVisible= setNumVisible
! alias itemSelected? isItemSelected
! alias itemCurrent? isItemCurrent
! alias itemVisible? isItemVisible
! alias itemEnabled? isItemEnabled
! alias currentItem getCurrentItem
! alias anchorItem= setAnchorItem
! alias anchorItem getAnchorItem
! alias cursorItem getCursorItem
! alias font= setFont
! alias font getFont
! alias textColor getTextColor
! alias textColor= setTextColor
! alias selBackColor getSelBackColor
! alias selBackColor= setSelBackColor
! alias selTextColor getSelTextColor
! alias selTextColor= setSelTextColor
! alias listStyle getListStyle
! alias listStyle= setListStyle
! alias helpText= setHelpText
! alias helpText getHelpText
end
class FX_ListBox
***************
*** 919,926 ****
alias radioColor= setRadioColor
end
- class FXRange
- alias empty? empty
- alias contains? contains
- end
class FX_RecentFiles
alias maxFiles= setMaxFiles
--- 930,933 ----
***************
*** 933,936 ****
--- 940,946 ----
alias selector getSelector
end
+ class FXRegion
+ alias contains? contains
+ end
class FXRegistry
alias appKey getAppKey
***************
*** 958,961 ****
--- 968,972 ----
alias xPosition getXPosition
alias yPosition getYPosition
+ alias position getPosition
end
class FX_Scrollbar
***************
*** 1002,1005 ****
--- 1013,1018 ----
alias value= setValue
alias value getValue
+ alias range= setRange
+ alias range getRange
alias sliderStyle getSliderStyle
alias sliderStyle= setSliderStyle
***************
*** 1026,1029 ****
--- 1039,1044 ----
alias value= setValue
alias value getValue
+ alias range= setRange
+ alias range getRange
alias font= setFont
alias font getFont
***************
*** 1062,1066 ****
alias textHighlightColor= setTextHighlightColor
end
! class FXStream
alias swapBytes= setSwapBytes
alias swapBytes getSwapBytes
--- 1077,1084 ----
alias textHighlightColor= setTextHighlightColor
end
! class FX_Stream
! alias error= setError
! alias position= setPosition
! alias position getPosition
alias swapBytes= setSwapBytes
alias swapBytes getSwapBytes
Index: overloads.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/lib/fox/overloads.rb,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** overloads.rb 3 Apr 2002 21:40:57 -0000 1.7
--- overloads.rb 11 Jul 2002 13:33:13 -0000 1.8
***************
*** 1,299 ****
! require 'fox'
!
! module Fox
! class FX_App
! def stopModal(*args)
! if args.length > 0
! if args[0].kind_of? Fixnum
! value = args[0]
! stopModalInnermost(value)
! else
! window = args[0]
! if args.length > 1
! value = args[1]
! stopModalMatching(window, value)
! else
! stopModalMatching(window)
! end
! end
! else
! stopModalInnermost
! end
! end
! end
!
! class FX_DC
! def setStipple(*args)
! if args[0].kind_of? FXBitmap
! setStippleFromBitmap(*args)
! else
! setStippleFromPattern(*args)
! end
! end
! def setClipRectangle(*args)
! if args.length == 1
! setClipRectangle1(args[0])
! else
! setClipRectangle4(args[0], args[1], args[2], args[3])
! end
! end
! end
!
! class FXFileStream
! def FXFileStream.open(filename, save_or_load, container=nil)
! fstream = FXFileStream.new(container)
! if block_given?
! if fstream.open(filename, save_or_load)
! yield fstream
! fstream.close
! else
! # open failed; raise an exception?
! end
! nil
! else
! if fstream.open(filename, save_or_load)
! fstream
! else
! # open failed; raise an exception?
! end
! end
! end
! end
!
! class FXHMat
! def rot(*args)
! if (args.length == 1)
! rot1(args[0])
! elsif (args.length == 2)
! rot2(args[0], args[1])
! else
! rot3(args[0], args[1], args[2])
! end
! end
! def xrot(*args)
! if (args.length == 1)
! xrot1(args[0])
! else
! xrot2(args[0], args[1])
! end
! end
! def yrot(*args)
! if (args.length == 1)
! yrot1(args[0])
! else
! yrot2(args[0], args[1])
! end
! end
! def zrot(*args)
! if (args.length == 1)
! zrot1(args[0])
! else
! zrot2(args[0], args[1])
! end
! end
! def trans(*args)
! if args.length == 1
! trans1(args[0])
! else
! trans3(args[0], args[1], args[2])
! end
! end
! def scale(*args)
! if args.length == 1
! if args[0].kind_of? Float
! scalef(args[0])
! else
! scalev(args[0])
! end
! else
! scale3(args[0], args[1], args[2])
! end
! end
! end
!
! class FX_Header
! def appendItem(*args)
! if (args.length > 0) && (args[0].kind_of? String)
! appendItem2(*args)
! else
! appendItem1(*args)
! end
! end
! def insertItem(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! insertItem2(*args)
! else
! insertItem1(*args)
! end
! end
! def prependItem(*args)
! if (args.length > 0) && (args[0].kind_of? String)
! prependItem2(*args)
! else
! prependItem1(*args)
! end
! end
! def replaceItem(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! replaceItem2(*args)
! else
! replaceItem1(*args)
! end
! end
! end
!
! class FX_IconList
! def appendItem(*args)
! if (args.length > 0) && (args[0].kind_of? String)
! appendItem2(*args)
! else
! appendItem1(*args)
! end
! end
! def insertItem(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! insertItem2(*args)
! else
! insertItem1(*args)
! end
! end
! def prependItem(*args)
! if (args.length > 0) && (args[0].kind_of? String)
! prependItem2(*args)
! else
! prependItem1(*args)
! end
! end
! def replaceItem(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! replaceItem2(*args)
! else
! replaceItem1(*args)
! end
! end
! end
!
! class FX_List
! def appendItem(*args)
! if (args.length > 0) && (args[0].kind_of? String)
! appendItem2(*args)
! else
! appendItem1(*args)
! end
! end
! def insertItem(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! insertItem2(*args)
! else
! insertItem1(*args)
! end
! end
! def prependItem(*args)
! if (args.length > 0) && (args[0].kind_of? String)
! prependItem2(*args)
! else
! prependItem1(*args)
! end
! end
! def replaceItem(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! replaceItem2(*args)
! else
! replaceItem1(*args)
! end
! end
! end
!
! class FXRange
! def include(*args)
! if args.length == 3
! includePoint(*args)
! else
! if args[0].kind_of? Fox::FXRange
! includeRange(*args)
! else
! includeVec(*args)
! end
! end
! end
! end
!
! class FX_TreeList
! def addItemAfter(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! addItemAfter2(*args)
! else
! addItemAfter1(*args)
! end
! end
! def addItemBefore(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! addItemBefore2(*args)
! else
! addItemBefore1(*args)
! end
! end
! def addItemFirst(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! addItemFirst2(*args)
! else
! addItemFirst1(*args)
! end
! end
! def addItemLast(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! addItemLast2(*args)
! else
! addItemLast1(*args)
! end
! end
! end
!
! class FX_TreeListBox
! def addItemAfter(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! addItemAfter2(*args)
! else
! addItemAfter1(*args)
! end
! end
! def addItemBefore(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! addItemBefore2(*args)
! else
! addItemBefore1(*args)
! end
! end
! def addItemFirst(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! addItemFirst2(*args)
! else
! addItemFirst1(*args)
! end
! end
! def addItemLast(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! addItemLast2(*args)
! else
! addItemLast1(*args)
! end
! end
! end
!
! class FX_Window
! def repaint(*args)
! if args.length == 4
! repaintArea(args[0], args[1], args[2], args[3])
! else
! repaintWindow
! end
! end
! def update(*args)
! if args.length == 4
! updateArea(args[0], args[1], args[2], args[3])
! else
! updateWindow
! end
! end
! end
! end
--- 1,36 ----
! require 'fox'
!
! module Fox
! class FX_DC
! def setStipple(*args)
! if args[0].kind_of? FXBitmap
! setStippleFromBitmap(*args)
! else
! setStippleFromPattern(*args)
! end
! end
! def setClipRectangle(*args)
! if args.length == 1
! setClipRectangle1(args[0])
! else
! setClipRectangle4(args[0], args[1], args[2], args[3])
! end
! end
! end
!
! class FXFileStream
! def FXFileStream.open(filename, save_or_load, container=nil)
! fstream = FXFileStream.new(container)
! status = fstream.open(filename, save_or_load)
! if block_given?
! begin
! yield fstream
! ensure
! fstream.close
! end
! else
! fstream
! end
! end
! end
! end
|
