X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fscreen.C;h=5ef3ad3aac364591c23dbe1fe1c0feed5030697c;hb=664eb7ff45dbb4fabc22ec0b56798031a82335b1;hp=eb8b55d536b78f9904a30a13f7d6f280376e0cd0;hpb=16a5be3ecce17f7a2c3e2e8fda096a6ca2ad6161;p=lyx.git

diff --git a/src/screen.C b/src/screen.C
index eb8b55d536..5ef3ad3aac 100644
--- a/src/screen.C
+++ b/src/screen.C
@@ -25,11 +25,13 @@
 #include "font.h"
 #include "insets/insettext.h"
 #include "ColorHandler.h"
+#include "language.h"
 
 using std::max;
 using std::min;
 
-static
+namespace {
+
 GC createGC()
 {
 	XGCValues val;
@@ -45,6 +47,8 @@ GC createGC()
 			 | GCLineWidth | GCLineStyle , &val);
 }
 
+} // namespace anon
+
 
 // Constructor
 LyXScreen::LyXScreen(WorkArea & o)
@@ -65,7 +69,7 @@ LyXScreen::LyXScreen(WorkArea & o)
 
 void LyXScreen::setCursorColor() 
 {
-	if (!lyxColorHandler) return;
+	if (!lyxColorHandler.get()) return;
 
 	GC gc = lyxColorHandler->getGCForeground(LColor::cursor);
 	
@@ -116,13 +120,8 @@ void LyXScreen::DrawFromTo(LyXText * text, BufferView * bv,
 		LyXText::text_status st = bv->text->status;
 		do {
 			bv->text->status = st;
-#if 0
-			text->GetVisibleRow(owner.owner(), y + y_offset,
-					    x_offset, row, y + text->first);
-#else
 			text->GetVisibleRow(bv, y + y_offset,
 					    x_offset, row, y + text->first);
-#endif
 		} while (bv->text->status == LyXText::CHANGED_IN_DRAW);
 		bv->text->status = st;
 		y += row->height();
@@ -151,13 +150,8 @@ void LyXScreen::DrawOneRow(LyXText * text, BufferView * bv, Row * row,
 		LyXText::text_status st = bv->text->status;
 		do {
 			bv->text->status = st;
-#if 0
-			text->GetVisibleRow(owner.owner(), y, x_offset, row,
-					    y + text->first);
-#else
 			text->GetVisibleRow(bv, y, x_offset, row,
 					    y + text->first);
-#endif
 		} while (bv->text->status == LyXText::CHANGED_IN_DRAW);
 		bv->text->status = st;
 	}
@@ -224,17 +218,10 @@ void LyXScreen::ShowCursor(LyXText const * text, BufferView const * bv)
 {
 	if (!cursor_visible) {
 		Cursor_Shape shape = BAR_SHAPE;
-#if 0
-		if (text->real_current_font.language() !=
-		    owner.owner()->buffer()->params.language
-		    || text->real_current_font.isVisibleRightToLeft()
-		    != owner.owner()->buffer()->params.language->RightToLeft())
-#else
 		if (text->real_current_font.language() !=
 		    bv->buffer()->params.language
 		    || text->real_current_font.isVisibleRightToLeft()
 		    != bv->buffer()->params.language->RightToLeft())
-#endif
 			shape = (text->real_current_font.isVisibleRightToLeft())
 				? REVERSED_L_SHAPE : L_SHAPE;
 		ShowManualCursor(text, text->cursor.x(), text->cursor.y(),