diff options
Diffstat (limited to 'ide/typed_notebook.ml')
| -rw-r--r-- | ide/typed_notebook.ml | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/ide/typed_notebook.ml b/ide/typed_notebook.ml index 3dd2279f..499d56bd 100644 --- a/ide/typed_notebook.ml +++ b/ide/typed_notebook.ml @@ -1,68 +1,67 @@ (************************************************************************) (* v * The Coq Proof Assistant / The Coq Development Team *) -(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2011 *) +(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2010 *) (* \VV/ **************************************************************) (* // * This file is distributed under the terms of the *) (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(* $Id: coqide.ml 11952 2009-03-02 15:29:08Z vgross $ *) - -class ['a] typed_notebook default_build nb = +class ['a] typed_notebook make_page kill_page nb = object(self) inherit GPack.notebook nb as super val mutable term_list = [] - method append_term ?(build=default_build) (term:'a) = - let tab_label,menu_label,page = build term in + method append_term (term:'a) = + let tab_label,menu_label,page = make_page term in (* XXX - Temporary hack to compile with archaic lablgtk *) ignore (super#append_page ?tab_label ?menu_label page); let real_pos = super#page_num page in - let lower,higher = Util.list_split_at real_pos term_list in + let lower,higher = Minilib.list_chop real_pos term_list in term_list <- lower@[term]@higher; real_pos (* XXX - Temporary hack to compile with archaic lablgtk method insert_term ?(build=default_build) ?pos (term:'a) = let tab_label,menu_label,page = build term in let real_pos = super#insert_page ?tab_label ?menu_label ?pos page in - let lower,higher = Util.list_split_at real_pos term_list in + let lower,higher = Minilib.list_chop real_pos term_list in term_list <- lower@[term]@higher; real_pos *) - method prepend_term ?(build=default_build) (term:'a) = - let tab_label,menu_label,page = build term in + method prepend_term (term:'a) = + let tab_label,menu_label,page = make_page term in (* XXX - Temporary hack to compile with archaic lablgtk *) ignore (super#prepend_page ?tab_label ?menu_label page); let real_pos = super#page_num page in - let lower,higher = Util.list_split_at real_pos term_list in + let lower,higher = Minilib.list_chop real_pos term_list in term_list <- lower@[term]@higher; real_pos - method set_term ?(build=default_build) (term:'a) = - let tab_label,menu_label,page = build term in + method set_term (term:'a) = + let tab_label,menu_label,page = make_page term in let real_pos = super#current_page in - term_list <- Util.list_map_i (fun i x -> if i = real_pos then term else x) 0 term_list; + term_list <- Minilib.list_map_i (fun i x -> if i = real_pos then term else x) 0 term_list; super#set_page ?tab_label ?menu_label page - method remove_page index = - term_list <- Util.list_filter_i (fun i x -> i <> index) term_list; - super#remove_page index - method get_nth_term i = List.nth term_list i method term_num p = - Util.list_index0 p term_list + Minilib.list_index0 p term_list method pages = term_list - method current_term = List.nth term_list super#current_page + method remove_page index = + term_list <- Minilib.list_filter_i (fun i x -> if i = index then kill_page x; i <> index) term_list; + super#remove_page index + + method current_term = + List.nth term_list super#current_page end -let create build = +let create make kill = GtkPack.Notebook.make_params [] ~cont:(GContainer.pack_container ~create:(fun pl -> let nb = GtkPack.Notebook.create pl in - (new typed_notebook build nb))) + (new typed_notebook make kill nb))) |