1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
From: Debian OCaml Maintainers <[email protected]>
Date: Sat, 7 Sep 2019 20:41:11 0200
Subject: Fix compilation with OCaml 4.01.0
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=731218
---
options.ml | 32 ----------------
1 file changed, 16 insertions( ), 16 deletions(-)
diff --git a/options.ml b/options.ml
index 0b5e47a..d867ded 100644
--- a/options.ml
b/options.ml
@@ -93,7 93,7 @@ end
(*********************************************************************)
(* 'a is the data type, 'b is the widget type *)
-class virtual ['a,'b] option ?name ~text ~set:(set:'a->unit) ~get () =
class virtual ['a,'b,'c] option ?name ~text ~set:(set:'a->unit) ~get () =
let name = (match name with
None -> random_name 10
| Some name -> name ) in
@@ -104,7 104,7 @@ object (self)
val name = name
val text = (text : string)
- method virtual build_widget : live:bool -> 'b
method virtual build_widget : live:bool -> 'b
method display ~live parent =
ignore (self#build_widget ~live parent);
match widget with
@@ -126,9 126,9 @@ end
(*********************)
-class ['b] toggle_option ?name ~text ~set ~get () =
class ['b,'c] toggle_option ?name ~text ~set ~get () =
object (self)
- inherit [bool,'b] option ?name ~text ~set ~get ()
inherit [bool,'b,'c] option ?name ~text ~set ~get ()
method set_tk bool =
Textvariable.set tk_var (if bool then "true" else "false")
@@ -153,9 153,9 @@ end
(*********************)
-class ['b] int_scale_option ?name ~min ~max ~text ~set ~get () =
class ['b,'c] int_scale_option ?name ~min ~max ~text ~set ~get () =
object (self)
- inherit [int,'b] option ?name ~text ~set ~get ()
inherit [int,'b,'c] option ?name ~text ~set ~get ()
val min = min
val max = max
@@ -192,10 192,10 @@ end
(*******************************************************)
-class ['b] float_scale_option ?name ~min ~max ?(resolution=1.0)
class ['b, 'c] float_scale_option ?name ~min ~max ?(resolution=1.0)
~text ~set ~get () =
object (self)
- inherit [float, 'b] option ?name ~text ~set ~get ()
inherit [float, 'b, 'c] option ?name ~text ~set ~get ()
val min = min
val max = max
@@ -236,10 236,10 @@ let string_of_float x =
then string ^ "0"
else string
-class ['b] float_entry_option ?name ?(mult=1.1)
class ['b, 'c] float_entry_option ?name ?(mult=1.1)
~text ~set ~get () =
object (self)
- inherit [float, 'b] option ?name ~text ~set ~get ()
inherit [float, 'b, 'c] option ?name ~text ~set ~get ()
val mutable entry = None
@@ -303,9 303,9 @@ end
(*******************************************************)
-class ['b] float_entry_display ?name ~text ~set ~get () =
class ['b, 'c] float_entry_display ?name ~text ~set ~get () =
object (self)
- inherit [float, 'b] option ?name ~text ~set ~get ()
inherit [float, 'b, 'c] option ?name ~text ~set ~get ()
val mutable display = None
@@ -337,9 337,9 @@ end
(*******************************************************)
-class ['b] int_entry_display ?name ~text ~set ~get () =
class ['b, 'c] int_entry_display ?name ~text ~set ~get () =
object (self)
- inherit [int, 'b] option ?name ~text ~set ~get ()
inherit [int, 'b, 'c] option ?name ~text ~set ~get ()
val mutable display = None
@@ -371,9 371,9 @@ end
(*******************************************************)
-class ['b] void_entry_display ?name ~text () =
class ['b, 'c] void_entry_display ?name ~text () =
object (self)
- inherit [unit, 'b] option ?name ~text
inherit [unit, 'b, 'c] option ?name ~text
~set:(fun x -> ()) ~get:(fun () -> ())
()
|
