Angus insetindex patch + protect patch from Dekel

[lyx.git] / src / font.h

diff --git a/src/font.h b/src/font.h
index 0a7fb27164b5a89dd368dff519875c24560f80dc..89f04fa99d85e30cd93447afe037bc2e50de05e5 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -1,7 +1,21 @@
 // -*- C++ -*-
+/* This file is part of
+ * ====================================================== 
+ * 
+ *           LyX, The Document Processor
+ *        
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team.
+ *
+ * ====================================================== */
+
 #ifndef FONT_H
 #define FONT_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include <X11/Xlib.h>
 
 #include "LString.h"
@@ -32,7 +46,9 @@ struct lyxfont {
        int rbearing(char c, LyXFont const & f);
 
        static
-       int width(char c, LyXFont const & f);
+       int width(char c, LyXFont const & f) {
+               return width(&c, 1, f);
+       }
 
        static
        int width(char const * s, int n, LyXFont const & f);
@@ -54,6 +70,12 @@ struct lyxfont {
        static
        int XTextWidth(LyXFont const & f, char * str, int count);
 
+       static
+       int width(XChar2b const * s, int n, LyXFont const & f);
+
+       static
+       int XTextWidth16(LyXFont const & f, XChar2b * str, int count);
+
        static
        void XSetFont(Display * display, GC gc, LyXFont const & f);
 };