X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXView.C;h=462e53d9ffa820028a8d7e24473b099c846d4f5f;hb=f9a45f76521c1c2cad9dd05868b6cfcc6c81cdbe;hp=fcaacfc7d305d85e9bd3cab2307752103b002c65;hpb=56e007b94ecc2db8ae9e80dfba22f43bd356a846;p=lyx.git

diff --git a/src/LyXView.C b/src/LyXView.C
index fcaacfc7d3..462e53d9ff 100644
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -29,7 +29,6 @@
 #include "layout_forms.h"
 #include "intl.h"
 #include "lyxrc.h"
-#include "lyxscreen.h"
 #include "support/filetools.h"        // OnlyFilename()
 #include "layout.h"
 #include "lyxtext.h"
@@ -39,7 +38,7 @@ extern FD_form_document * fd_form_document;
 extern void AutoSave();
 extern char updatetimer;
 extern void QuitLyX();
-int current_layout = 0;
+LyXTextClass::size_type current_layout = 0;
 
 // This is very temporary
 BufferView * current_view;
@@ -81,10 +80,10 @@ void LyXView::UpdateTimerCB(FL_OBJECT * ob, long)
 	LyXView * view = static_cast<LyXView*>(ob->u_vdata);
 	if (!view->view()->available()) 
 		return;
-	if (!view->view()->getScreen() || !updatetimer)
+	if (!updatetimer)
 		return;
 
-	view->view()->getScreen()->HideCursor();
+	view->view()->hideCursor();
 	view->view()->update(-2);
 
 	/* This update can happen, even when the work area has lost
@@ -307,7 +306,7 @@ void LyXView::updateLayoutChoice()
 	// we need to do this.
 	toolbar->combox->Redraw();
 
-	char layout = bufferview->text->cursor.par->GetLayout();
+	LyXTextClass::size_type layout = bufferview->text->cursor.par->GetLayout();
 
 	if (layout != current_layout){
 		toolbar->combox->select(layout + 1);