diff options
Diffstat (limited to 'otherlibs/labltk/browser')
-rw-r--r-- | otherlibs/labltk/browser/editor.ml | 4 | ||||
-rw-r--r-- | otherlibs/labltk/browser/fileselect.ml | 6 | ||||
-rw-r--r-- | otherlibs/labltk/browser/jg_button.ml | 2 | ||||
-rw-r--r-- | otherlibs/labltk/browser/jg_completion.ml | 2 | ||||
-rw-r--r-- | otherlibs/labltk/browser/jg_menu.ml | 4 | ||||
-rw-r--r-- | otherlibs/labltk/browser/jg_message.ml | 2 | ||||
-rw-r--r-- | otherlibs/labltk/browser/jg_multibox.ml | 2 | ||||
-rw-r--r-- | otherlibs/labltk/browser/jg_text.ml | 4 | ||||
-rw-r--r-- | otherlibs/labltk/browser/lexical.ml | 6 | ||||
-rw-r--r-- | otherlibs/labltk/browser/searchpos.ml | 4 | ||||
-rw-r--r-- | otherlibs/labltk/browser/setpath.ml | 2 | ||||
-rw-r--r-- | otherlibs/labltk/browser/shell.ml | 6 | ||||
-rw-r--r-- | otherlibs/labltk/browser/viewer.ml | 2 |
13 files changed, 23 insertions, 23 deletions
diff --git a/otherlibs/labltk/browser/editor.ml b/otherlibs/labltk/browser/editor.ml index 9176a7da1..f99845eb3 100644 --- a/otherlibs/labltk/browser/editor.ml +++ b/otherlibs/labltk/browser/editor.ml @@ -522,7 +522,7 @@ end let already_open : editor option ref = ref None -let editor ?:file ?:pos[=0] () = +let editor ?:file ?(:pos=0) () = if match !already_open with None -> false | Some ed -> @@ -535,7 +535,7 @@ let editor ?:file ?:pos[=0] () = already_open := Some ed; if file <> None then ed#reopen :file :pos -let f ?:file ?:pos ?:opendialog[=false] () = +let f ?:file ?:pos ?(:opendialog=false) () = if opendialog then Fileselect.f title:"Open File" action:(function [file] -> editor :file () | _ -> ()) diff --git a/otherlibs/labltk/browser/fileselect.ml b/otherlibs/labltk/browser/fileselect.ml index b72b6ce4e..cea020edb 100644 --- a/otherlibs/labltk/browser/fileselect.ml +++ b/otherlibs/labltk/browser/fileselect.ml @@ -74,9 +74,9 @@ let load_in_path = ref false let search_in_path :name = Misc.find_in_path !Config.load_path name -let f :title action:proc ?:dir[=Unix.getcwd ()] - ?filter:deffilter[="*"] ?file:deffile[=""] - ?:multi[=false] ?:sync[=false] ?:usepath[=true] () = +let f :title action:proc ?(:dir = Unix.getcwd ()) + ?(filter:deffilter ="*") ?(file:deffile ="") + ?(:multi=false) ?(:sync=false) ?(:usepath=true) () = let current_pattern = ref "" and current_dir = ref dir in diff --git a/otherlibs/labltk/browser/jg_button.ml b/otherlibs/labltk/browser/jg_button.ml index ea963decd..da3bc1294 100644 --- a/otherlibs/labltk/browser/jg_button.ml +++ b/otherlibs/labltk/browser/jg_button.ml @@ -2,7 +2,7 @@ open Tk -let create_destroyer :parent ?:text[="Ok"] tl = +let create_destroyer :parent ?(:text="Ok") tl = Button.create parent :text command:(fun () -> destroy tl) let add_destroyer ?:text tl = diff --git a/otherlibs/labltk/browser/jg_completion.ml b/otherlibs/labltk/browser/jg_completion.ml index 16c321bf6..7dedf0330 100644 --- a/otherlibs/labltk/browser/jg_completion.ml +++ b/otherlibs/labltk/browser/jg_completion.ml @@ -1,6 +1,6 @@ (* $Id$ *) -let lt_string ?:nocase[=false] s1 s2 = +let lt_string ?(:nocase=false) s1 s2 = if nocase then String.lowercase s1 < String.lowercase s2 else s1 < s2 class completion ?:nocase texts = object diff --git a/otherlibs/labltk/browser/jg_menu.ml b/otherlibs/labltk/browser/jg_menu.ml index 5bbba8c79..45cdc0c46 100644 --- a/otherlibs/labltk/browser/jg_menu.ml +++ b/otherlibs/labltk/browser/jg_menu.ml @@ -2,7 +2,7 @@ open Tk -class c :parent ?underline:n[=0] text = object (self) +class c :parent ?(underline:n=0) text = object (self) val pair = let button = Menubutton.create parent :text underline:n in @@ -19,7 +19,7 @@ class c :parent ?underline:n[=0] text = object (self) ?font:string -> ?foreground:color -> ?image:image -> ?state:state -> string -> unit - method add_command ?underline:n[=0] ?:accelerator ?:activebackground + method add_command ?(underline:n=0) ?:accelerator ?:activebackground ?:activeforeground ?:background ?:bitmap ?:command ?:font ?:foreground ?:image ?:state label = Menu.add_command (self#menu) :label underline:n ?:accelerator diff --git a/otherlibs/labltk/browser/jg_message.ml b/otherlibs/labltk/browser/jg_message.ml index bc0273016..27b8f2eec 100644 --- a/otherlibs/labltk/browser/jg_message.ml +++ b/otherlibs/labltk/browser/jg_message.ml @@ -28,7 +28,7 @@ class formatted :parent :width :maxheight :minheight = end *) -let formatted :title ?:on ?:width[=60] ?:maxheight[=10] ?:minheight[=0] () = +let formatted :title ?:on ?(:width=60) ?(:maxheight=10) ?(:minheight=0) () = let tl, frame = match on with Some frame -> coe frame, frame diff --git a/otherlibs/labltk/browser/jg_multibox.ml b/otherlibs/labltk/browser/jg_multibox.ml index 1858a48f8..f7c1ec2c4 100644 --- a/otherlibs/labltk/browser/jg_multibox.ml +++ b/otherlibs/labltk/browser/jg_multibox.ml @@ -67,7 +67,7 @@ class c :cols :texts ?:maxheight ?:width parent = object (self) method parent = parent' method boxes = boxes method current = current - method recenter?:aligntop[=false] n = + method recenter ?(:aligntop=false) n = current <- if n < 0 then 0 else if n < length then n else length - 1; diff --git a/otherlibs/labltk/browser/jg_text.ml b/otherlibs/labltk/browser/jg_text.ml index 8a3dd8ceb..e4e3ed56a 100644 --- a/otherlibs/labltk/browser/jg_text.ml +++ b/otherlibs/labltk/browser/jg_text.ml @@ -5,9 +5,9 @@ open Jg_tk let get_all tw = Text.get tw start:tstart end:(tposend 1) -let tag_and_see tw :tag :start end:e = +let tag_and_see tw :tag :start :end = Text.tag_remove tw start:(tpos 0) end:tend :tag; - Text.tag_add tw :start end:e :tag; + Text.tag_add tw :start :end :tag; try Text.see tw index:(`Tagfirst tag, []); Text.mark_set tw mark:"insert" index:(`Tagfirst tag, []) diff --git a/otherlibs/labltk/browser/lexical.ml b/otherlibs/labltk/browser/lexical.ml index 33a68e488..8c1209a66 100644 --- a/otherlibs/labltk/browser/lexical.ml +++ b/otherlibs/labltk/browser/lexical.ml @@ -20,12 +20,12 @@ let init_tags tw = Text.tag_configure tw tag:"error" relief:`Raised; Text.tag_raise tw tag:"error" -let tag ?:start[=tstart] ?end:pend[=tend] tw = +let tag ?(:start=tstart) ?(:end=tend) tw = let tpos c = (Text.index tw index:start, [`Char c]) in - let text = Text.get tw :start end:pend in + let text = Text.get tw :start :end in let buffer = Lexing.from_string text in List.iter tags - fun:(fun tag -> Text.tag_remove tw :start end:pend :tag); + fun:(fun tag -> Text.tag_remove tw :start :end :tag); try while true do let tag = diff --git a/otherlibs/labltk/browser/searchpos.ml b/otherlibs/labltk/browser/searchpos.ml index 49d9d76aa..211332667 100644 --- a/otherlibs/labltk/browser/searchpos.ml +++ b/otherlibs/labltk/browser/searchpos.ml @@ -260,7 +260,7 @@ let edit_source :file :path :sign = (* List of windows to destroy by Close All *) let top_widgets = ref [] -let rec view_signature ?:title ?:path ?:env[= !start_env] sign = +let rec view_signature ?:title ?:path ?(:env = !start_env) sign = let env = match path with None -> env | Some path -> Env.open_signature path sign env in @@ -398,7 +398,7 @@ and view_modtype_id li :env = view_signature_item :path :env [Tsig_modtype(ident_of_path path default:"S", td)] -and view_expr_type ?:title ?:path ?:env ?:name[="noname"] t = +and view_expr_type ?:title ?:path ?:env ?(:name="noname") t = let title = match title, path with Some title, _ -> title | None, Some path -> string_of_path path diff --git a/otherlibs/labltk/browser/setpath.ml b/otherlibs/labltk/browser/setpath.ml index f9c478b07..8094b82e0 100644 --- a/otherlibs/labltk/browser/setpath.ml +++ b/otherlibs/labltk/browser/setpath.ml @@ -34,7 +34,7 @@ let renew_path box = Listbox.insert box index:`End texts:!Config.load_path; Jg_box.recenter box index:(`Num 0) -let add_to_path :dirs ?:base[=""] box = +let add_to_path :dirs ?(:base="") box = let dirs = if base = "" then dirs else if dirs = [] then [base] else diff --git a/otherlibs/labltk/browser/shell.ml b/otherlibs/labltk/browser/shell.ml index caf0ea476..98e33bbc4 100644 --- a/otherlibs/labltk/browser/shell.ml +++ b/otherlibs/labltk/browser/shell.ml @@ -78,9 +78,9 @@ object (self) end; self#insert (if dir = `previous then h#previous else h#next) end - method private lex ?:start[=`Mark"insert",[`Linestart]] - ?end:endx[=`Mark"insert",[`Lineend]] () = - Lexical.tag textw :start end:endx + method private lex ?(:start = `Mark"insert",[`Linestart]) + ?(:end = `Mark"insert",[`Lineend]) () = + Lexical.tag textw :start :end method insert text = let idx = Text.index textw index:(`Mark"insert",[`Char(-1);`Linestart]) in diff --git a/otherlibs/labltk/browser/viewer.ml b/otherlibs/labltk/browser/viewer.ml index 9a20a4996..875780afa 100644 --- a/otherlibs/labltk/browser/viewer.ml +++ b/otherlibs/labltk/browser/viewer.ml @@ -245,7 +245,7 @@ let start_shell () = pack [ok;cancel] side:`Left fill:`X expand:true; pack [input;buttons] side:`Top fill:`X expand:true -let f ?:dir[=Unix.getcwd()] ?:on () = +let f ?(:dir=Unix.getcwd()) ?:on () = let tl = match on with None -> let tl = Jg_toplevel.titled "Module viewer" in |