summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacques Garrigue <garrigue at math.nagoya-u.ac.jp>2000-08-25 08:20:49 +0000
committerJacques Garrigue <garrigue at math.nagoya-u.ac.jp>2000-08-25 08:20:49 +0000
commit738f54a8dac0ae3ba2b3bddea2648c074dc6b738 (patch)
tree9dd24f94965bcb4a259ef0b57c16fd651d0db003
parent307c53c6f5eade001a4dd88ba6efddd3ebc7f56e (diff)
use windows fonts for Cygwin; but shell does not work
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3288 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--otherlibs/labltk/browser/jg_config.ml10
-rw-r--r--otherlibs/labltk/browser/jg_tk.ml2
2 files changed, 7 insertions, 5 deletions
diff --git a/otherlibs/labltk/browser/jg_config.ml b/otherlibs/labltk/browser/jg_config.ml
index a65d6b6e4..41e8e9cd1 100644
--- a/otherlibs/labltk/browser/jg_config.ml
+++ b/otherlibs/labltk/browser/jg_config.ml
@@ -13,13 +13,13 @@
(* $Id$ *)
-let fixed =
- if Sys.os_type = "Win32" then "{Courier New} 8" else "fixed"
-let variable =
- if Sys.os_type = "Win32" then "Arial 9" else "variable"
+open Jg_tk
+
+let fixed = if wingui then "{Courier New} 8" else "fixed"
+let variable = if wingui then "Arial 9" else "variable"
let init () =
- if Sys.os_type = "Win32" then Option.add ~path:"*font" fixed;
+ if wingui then Option.add ~path:"*font" fixed;
let font =
let font =
Option.get Widget.default_toplevel ~name:"variableFont" ~clas:"Font" in
diff --git a/otherlibs/labltk/browser/jg_tk.ml b/otherlibs/labltk/browser/jg_tk.ml
index 56309d9a7..32ed9699c 100644
--- a/otherlibs/labltk/browser/jg_tk.ml
+++ b/otherlibs/labltk/browser/jg_tk.ml
@@ -19,3 +19,5 @@ let tpos x : textIndex = `Linechar (1,0), [`Char x]
and tposend x : textIndex = `End, [`Char (-x)]
let tstart : textIndex = `Linechar (1,0), []
and tend : textIndex = `End, []
+
+let wingui = Sys.os_type = "Win32" || Sys.os_type = "Cygwin"