removed a warning from screen and added CFLAGS in lyx.spec.in.

[lyx.git] / src / lyxscreen.h

diff --git a/src/lyxscreen.h b/src/lyxscreen.h
index 826b7a22ee391876bc0856587d1453c5416edfe7..3e5f47accb883a0a9fcefa8416f174ead9f938c1 100644 (file)
--- a/src/lyxscreen.h
+++ b/src/lyxscreen.h
@@ -4,12 +4,13 @@
  * 
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1995 Matthias Ettrich
- *          Copyright (C) 1995-1998 The LyX Team
+ *         Copyright 1995 Matthias Ettrich
+ *          Copyright 1995-1999 The LyX Team
  *
- *======================================================*/
-#ifndef _LYXSCREEN_H
-#define _LYXSCREEN_H
+ * ======================================================*/
+
+#ifndef LYXSCREEN_H
+#define LYXSCREEN_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -125,7 +126,7 @@ public:
        int drawText(LyXFont const &font, char const*,
                      int n, int baseline, int x);
        ///
-       int drawString(LyXFont const &font, LString const &str,
+       int drawString(LyXFont const &font, string const &str,
                        int baseline, int x);
                
        /// first visible pixel-row
@@ -280,7 +281,7 @@ inline int LyXScreen::drawText(LyXFont const &font, char const*fs,
 }
 
 
-inline int LyXScreen::drawString(LyXFont const &font, LString const &str,
+inline int LyXScreen::drawString(LyXFont const &font, string const &str,
                           int baseline, int x)
 {
        return font.drawString(str, foreground, baseline, x);