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

[lyx.git] / src / screen.C

diff --git a/src/screen.C b/src/screen.C
index 3cde7c3b707073d669b6dd7b9c7f0b7fadc80e06..3eb74d34a319680b5ecaff650bc13d99c79a4f88 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -3,8 +3,8 @@
 * 
 *           LyX, The Document Processor
 *       
-*          Copyright (C) 1995 Matthias Ettrich
-*           Copyright (C) 1995-1998 The LyX Team
+*          Copyright 1995 Matthias Ettrich
+*           Copyright 1995-1998 The LyX Team
 *
 *======================================================*/
 
@@ -18,12 +18,6 @@
 #include "lyxdraw.h"
 #include "lyxtext.h"
 
-//     $Id: screen.C,v 1.1 1999/09/27 18:44:38 larsbj Exp $    
-
-#if !defined(lint) && !defined(WITH_WARNINGS)
-static char vcid[] = "$Id: screen.C,v 1.1 1999/09/27 18:44:38 larsbj Exp $";
-#endif /* lint */
-
 extern int mono_video;
 extern int fast_selection;
 
@@ -104,7 +98,7 @@ void LyXScreen::DrawFromTo(int y1, int y2)
        y = y_text - first;
        /* y1 is now the real beginning of row on the screen */
        
-       while (row != NULL && y < y2) {
+       while (row != 0 && y < y2) {
 
                text->GetVisibleRow(*this, y, row, y + first);
                y += row->height;
@@ -795,9 +789,7 @@ void LyXScreen::drawVerticalTableLine(int x, int y1, int y2, bool on_off)
 void LyXScreen::drawFrame(int /*ft*/, int x, int y, int w, int h,
                          FL_COLOR /*col*/, int /*b*/)
 {
-#ifdef WITH_WARNINGS
-#warning Implement this using X11 calls, and the repaint problems are gone!
-#endif
+// Implement this using X11 calls, and the repaint problems are gone!
 // At least, I think that should do it since we only have them after
 // one of these buttons are displayed now! Lars, it seems you've hit the
 // nail :-) (Asger)