Update of /cvsroot/fxruby/FXRuby/examples
In directory usw-pr-cvs1:/tmp/cvs-serv23733/examples
Modified Files:
Tag: release10
dctest.rb groupbox.rb
Log Message:
Modified the range and range= methods for FXDial, FXSlider and FXSpinner
to work with Ruby Range objects instead of (lo, hi) Fixnum pairs.
Index: dctest.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/Attic/dctest.rb,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** dctest.rb 13 May 2002 21:58:37 -0000 1.1.2.2
--- dctest.rb 14 May 2002 14:15:41 -0000 1.1.2.3
***************
*** 377,381 ****
@lineWidthSpinner = FXSpinner.new(linew, 4, nil, 0, SPIN_NORMAL|FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
@lineWidthSpinner.connect(SEL_COMMAND) { @linesCanvas.update(0, 0, @linesCanvas.width, @linesCanvas.height) }
! @lineWidthSpinner.setRange(1, 255)
@lineWidthSpinner.value = 1
--- 377,381 ----
@lineWidthSpinner = FXSpinner.new(linew, 4, nil, 0, SPIN_NORMAL|FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
@lineWidthSpinner.connect(SEL_COMMAND) { @linesCanvas.update(0, 0, @linesCanvas.width, @linesCanvas.height) }
! @lineWidthSpinner.range = 1..255
@lineWidthSpinner.value = 1
***************
*** 436,440 ****
FXTextField.new(arcangles, 4, @ang1, FXDataTarget::ID_VALUE, TEXTFIELD_INTEGER|JUSTIFY_RIGHT|FRAME_SUNKEN|FRAME_THICK)
sang1 = FXSlider.new(arcangles, @ang1, FXDataTarget::ID_VALUE, LAYOUT_CENTER_Y|LAYOUT_FILL_X|SLIDER_INSIDE_BAR|LAYOUT_FILL_COLUMN)
! sang1.setRange(-360, 360)
@ang2 = FXDataTarget.new(90)
--- 436,440 ----
FXTextField.new(arcangles, 4, @ang1, FXDataTarget::ID_VALUE, TEXTFIELD_INTEGER|JUSTIFY_RIGHT|FRAME_SUNKEN|FRAME_THICK)
sang1 = FXSlider.new(arcangles, @ang1, FXDataTarget::ID_VALUE, LAYOUT_CENTER_Y|LAYOUT_FILL_X|SLIDER_INSIDE_BAR|LAYOUT_FILL_COLUMN)
! sang1.range = -360..360
@ang2 = FXDataTarget.new(90)
***************
*** 442,446 ****
FXTextField.new(arcangles, 4, @ang2, FXDataTarget::ID_VALUE, TEXTFIELD_INTEGER|JUSTIFY_RIGHT|FRAME_SUNKEN|FRAME_THICK)
sang2 = FXSlider.new(arcangles, @ang2, FXDataTarget::ID_VALUE, LAYOUT_CENTER_Y|LAYOUT_FILL_X|SLIDER_INSIDE_BAR|LAYOUT_FILL_COLUMN)
! sang2.setRange(-360, 360)
# Font
--- 442,446 ----
FXTextField.new(arcangles, 4, @ang2, FXDataTarget::ID_VALUE, TEXTFIELD_INTEGER|JUSTIFY_RIGHT|FRAME_SUNKEN|FRAME_THICK)
sang2 = FXSlider.new(arcangles, @ang2, FXDataTarget::ID_VALUE, LAYOUT_CENTER_Y|LAYOUT_FILL_X|SLIDER_INSIDE_BAR|LAYOUT_FILL_COLUMN)
! sang2.range = -360..360
# Font
Index: groupbox.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/groupbox.rb,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** groupbox.rb 2 Apr 2002 22:27:54 -0000 1.12
--- groupbox.rb 14 May 2002 14:15:42 -0000 1.12.2.1
***************
*** 220,224 ****
slider = FXSlider.new(group2, nil, 0, (LAYOUT_TOP|LAYOUT_FILL_X|
LAYOUT_FIX_HEIGHT|SLIDER_HORIZONTAL|SLIDER_INSIDE_BAR), 0, 0, 200, 20)
! slider.setRange(0, 3)
frame = FXHorizontalFrame.new(group2, LAYOUT_FILL_X|LAYOUT_FILL_Y)
--- 220,224 ----
slider = FXSlider.new(group2, nil, 0, (LAYOUT_TOP|LAYOUT_FILL_X|
LAYOUT_FIX_HEIGHT|SLIDER_HORIZONTAL|SLIDER_INSIDE_BAR), 0, 0, 200, 20)
! slider.range = 0..3
frame = FXHorizontalFrame.new(group2, LAYOUT_FILL_X|LAYOUT_FILL_Y)
***************
*** 279,283 ****
spinner = FXSpinner.new(group3, 20, nil, 0,
SPIN_NORMAL|FRAME_SUNKEN|FRAME_THICK|LAYOUT_SIDE_TOP)
! spinner.setRange(1, 20)
combobox = FXComboBox.new(group3, 5, 5, nil, 0,
--- 279,283 ----
spinner = FXSpinner.new(group3, 20, nil, 0,
SPIN_NORMAL|FRAME_SUNKEN|FRAME_THICK|LAYOUT_SIDE_TOP)
! spinner.range = 1..20
combobox = FXComboBox.new(group3, 5, 5, nil, 0,
|
