From f0b936e7cb90000f5db6272b926cb13dc1a5c055 Mon Sep 17 00:00:00 2001
From: pboutill
Date: Tue, 4 Sep 2012 21:39:18 +0000
Subject: Fix coqide compilation with lablgtk 2.16

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15772 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 Makefile.build     |  2 +-
 ide/preferences.ml |  4 ++++
 ide/utils/okey.ml  | 10 +++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Makefile.build b/Makefile.build
index d16f474b12..f1278770d5 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -298,7 +298,7 @@ plugins/micromega/csdpcert$(EXE): $(CSDPCERTCMO:.cmo=$(BESTOBJ))
 .PHONY: coqide coqide-binaries coqide-no coqide-byte coqide-opt coqide-files
 
 # target to build CoqIde
-coqide:: coqide-files coqide-binaries states
+coqide:: coqide-files coqide-binaries theories/Init/Prelude.vo
 
 COQIDEFLAGS=-thread $(COQIDEINCLUDES)
 
diff --git a/ide/preferences.ml b/ide/preferences.ml
index 0866563f71..9e226708fe 100644
--- a/ide/preferences.ml
+++ b/ide/preferences.ml
@@ -41,6 +41,10 @@ let mod_to_str (m:Gdk.Tags.modifier) =
     | `MOD5 -> "<Mod5>"
     | `CONTROL -> "<Control>"
     | `SHIFT -> "<Shift>"
+    | `HYPER -> "<Hyper>"
+    | `META -> "<Meta>"
+    | `RELEASE -> ""
+    | `SUPER -> "<Super>"
     |  `BUTTON1| `BUTTON2| `BUTTON3| `BUTTON4| `BUTTON5| `LOCK -> ""
 
 let mod_list_to_str l = List.fold_left (fun s m -> (mod_to_str m)^s) "" l
diff --git a/ide/utils/okey.ml b/ide/utils/okey.ml
index 6b174ecbea..580f1fbcb3 100644
--- a/ide/utils/okey.ml
+++ b/ide/utils/okey.ml
@@ -47,6 +47,10 @@ let int_of_modifier = function
   | `BUTTON3 -> 1024
   | `BUTTON4 -> 2048
   | `BUTTON5 -> 4096
+  | `HYPER -> 1 lsl 22
+  | `META -> 1 lsl 20
+  | `RELEASE -> 1 lsl 30
+  | `SUPER -> 1 lsl 21
 
 let print_modifier l =
   List.iter
@@ -65,7 +69,11 @@ let print_modifier l =
 	  | `BUTTON2 -> "B2"
 	  | `BUTTON3 -> "B3"
 	  | `BUTTON4 -> "B4"
-	  | `BUTTON5 -> "B5")
+	  | `BUTTON5 -> "B5"
+          | `HYPER -> "HYPER"                                                                                                     
+          | `META -> "META"                                                                                                       
+          | `RELEASE -> ""                                                                                                        
+          | `SUPER -> "SUPER")
 	    m)^" ")
     )
     l;
-- 
cgit v1.2.3