diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2002-08-12 05:31:21 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2002-08-12 05:31:21 +0000 |
| commit | 9b7e6b33851e416e093ab89e7c74fa7e738a665f (patch) | |
| tree | c314d3536e635a6ec2495c0b56cfe1c7706177e1 | |
| parent | e5812bce879e3b54b842db11c1c2078f12b3c964 (diff) | |
top aussi
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5097 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | otherlibs/labltk/browser/Makefile | 4 | ||||
| -rw-r--r-- | otherlibs/labltk/browser/editor.ml | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/otherlibs/labltk/browser/Makefile b/otherlibs/labltk/browser/Makefile index 62f2d531b..c1daed946 100644 --- a/otherlibs/labltk/browser/Makefile +++ b/otherlibs/labltk/browser/Makefile @@ -1,6 +1,7 @@ include ../support/Makefile.common LABLTKLIB=-I ../labltk -I ../lib -I ../support +#OTHERSLIB=-I $(OTHERS)/win32unix -I $(OTHERS)/systhreads -I $(OTHERS)/str OTHERSLIB=-I $(OTHERS)/unix -I $(OTHERS)/str OCAMLTOPLIB=-I $(TOPDIR)/parsing -I $(TOPDIR)/utils -I $(TOPDIR)/typing INCLUDES=$(OTHERSLIB) $(LABLTKLIB) $(OCAMLTOPLIB) @@ -33,6 +34,9 @@ ocamlbrowser$(EXE): $(TOPDIR)/toplevel/toplevellib.cma jglib.cma $(OBJ) \ $(TOPDIR)/toplevel/toplevellib.cma \ unix.cma str.cma $(LIBNAME).cma jglib.cma $(OBJ) +ocamlbrowser.cma: jglib.cma $(OBJ) + $(CAMLC) -a -o $@ -linkall jglib.cma $(OBJ) + jglib.cma: $(JG) $(CAMLCOMP) -a -o jglib.cma $(JG) diff --git a/otherlibs/labltk/browser/editor.ml b/otherlibs/labltk/browser/editor.ml index 3fe8da159..fe35cf70b 100644 --- a/otherlibs/labltk/browser/editor.ml +++ b/otherlibs/labltk/browser/editor.ml @@ -395,14 +395,16 @@ class editor ~top ~menus = object (self) error_messages <- Typecheck.f (List.hd windows) method lex () = - Toplevel.configure top ~cursor:(`Xcursor "watch"); + List.iter [ Widget.default_toplevel; top ] + ~f:(Toplevel.configure ~cursor:(`Xcursor "watch")); Text.configure current_tw ~cursor:(`Xcursor "watch"); ignore (Timer.add ~ms:1 ~callback: begin fun () -> Text.tag_remove current_tw ~tag:"error" ~start:tstart ~stop:tend; Lexical.tag current_tw; Text.configure current_tw ~cursor:(`Xcursor "xterm"); - Toplevel.configure top ~cursor:(`Xcursor "") + List.iter [ Widget.default_toplevel; top ] + ~f:(Toplevel.configure ~cursor:(`Xcursor "")) end) method save_text ?name:l txt = |