Merge pull request #98 from mschauer/range1

Range1 replaced for UnitRange

Author: timholy

examples/manipulate.jl

@@ -39,9 +39,9 @@ function make_widget(parent, widget::SliderWidget)
     sl
 end
 
-slider(nm::String, label::String, rng::Range1, initial::Integer) = SliderWidget(nm, label, initial, rng)
-slider(nm::String, label::String, rng::Range1) = slider(nm, label, rng, minimum(rng))
-slider(nm::String,  rng::Range1) = slider(nm, nm, rng, minimum(rng))
+slider(nm::String, label::String, rng::UnitRange, initial::Integer) = SliderWidget(nm, label, initial, rng)
+slider(nm::String, label::String, rng::UnitRange) = slider(nm, label, rng, minimum(rng))
+slider(nm::String,  rng::UnitRange) = slider(nm, nm, rng, minimum(rng))
 
 type PickerWidget <: ManipulateWidget
     nm

src/containers.jl

@@ -132,11 +132,11 @@ function forget(parent::TTk_Container, child::Widget)
 end
 
 ## grid ...
-IntOrRange = Union(Integer, Range1)
+IntOrRange = Union(Integer, UnitRange)
 function grid(child::Widget, row::IntOrRange, column::IntOrRange; kwargs...)
     path = get_path(child)
-    if isa(row, Range1) rowspan = 1 + maximum(row) - minimum(row)  else rowspan = 1 end
-    if isa(column, Range1) columnspan = 1 + maximum(column) - minimum(column) else columnspan = 1 end
+    if isa(row, UnitRange) rowspan = 1 + maximum(row) - minimum(row)  else rowspan = 1 end
+    if isa(column, UnitRange) columnspan = 1 + maximum(column) - minimum(column) else columnspan = 1 end
 
     row = minimum(row) - 1
     column = minimum(column) - 1

src/widgets.jl

@@ -239,7 +239,7 @@ set_editable(widget::Tk_Combobox, value::Bool) = widget[:state] = value ? "norma
 
 ## Slider
 ## deprecate this interface as integer values are not guaranteed in return.
-function Slider{T <: Integer}(parent::Widget, range::Range1{T}; orient="horizontal")
+function Slider{T <: Integer}(parent::Widget, range::UnitRange{T}; orient="horizontal")
     w = Slider(parent, orient=orient)
     var = tclvar()
     tclvar(var, minimum(range))
@@ -275,11 +275,11 @@ end
 ## Spinbox
 type Tk_Spinbox <: TTk_Widget
     w::TkWidget
-    range::Range1{Int}
+    range::UnitRange{Int}
     Tk_Spinbox(w::TkWidget) = new(w, 1:1)
 end
 
-function Spinbox{T <: Integer}(parent, range::Range1{T})
+function Spinbox{T <: Integer}(parent, range::UnitRange{T})
     w = Spinbox(parent)
     set_items(w, range)
     set_value(w, minimum(range))
@@ -290,7 +290,7 @@ get_value(widget::Tk_Spinbox) = parse(Int, tcl(widget, "get"))
 set_value(widget::Tk_Spinbox, value::Integer) = tcl(widget, "set", value)
 
 get_items(widget::Tk_Spinbox) = widget.range
-function set_items{T <: Integer}(widget::Tk_Spinbox, range::Range1{T})
+function set_items{T <: Integer}(widget::Tk_Spinbox, range::UnitRange{T})
     configure(widget, from=minimum(range), to = maximum(range), increment = step(range))
     widget.range = range
 end