X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXView.C;h=86316604667a70e7a74d9ada5f8c7166bf83f22c;hb=91a2ea274e9c27f571a3cd4798d2e8ecc1b982a7;hp=b1d60e9371886b3b24156dcef40a06191b216b03;hpb=a0cf758d5a79140045c2a90e2ff5878e0b391bcc;p=lyx.git

diff --git a/src/LyXView.C b/src/LyXView.C
index b1d60e9371..8631660466 100644
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -38,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;
@@ -117,8 +117,8 @@ extern "C" void C_LyXView_AutosaveTimerCB(FL_OBJECT * ob, long data)
 /// Reset autosave timer
 void LyXView::resetAutosaveTimer()
 {
-	if (lyxrc->autosave)
-		fl_set_timer(_form_main->timer_autosave, lyxrc->autosave);
+	if (lyxrc.autosave)
+		fl_set_timer(_form_main->timer_autosave, lyxrc.autosave);
 }
 
 
@@ -185,7 +185,7 @@ void LyXView::create_form_form_main(int width, int height)
 	// TOOLBAR
 	//
 
-	toolbar = new Toolbar(lyxrc->toolbar, this, air, 30 + air + bw);
+	toolbar = new Toolbar(this, air, 30 + air + bw);
 
 	// Setup the toolbar
 	toolbar->set(true);
@@ -257,15 +257,15 @@ void LyXView::init()
 	UpdateDocumentClassChoice();
 	
 	// Start autosave timer
-	if (lyxrc->autosave)
-		fl_set_timer(_form_main->timer_autosave, lyxrc->autosave);
+	if (lyxrc.autosave)
+		fl_set_timer(_form_main->timer_autosave, lyxrc.autosave);
 	
 	
 	// Install the raw callback for keyboard events 
 	fl_register_raw_callback(_form,
 				 KeyPressMask,
 				 C_LyXView_KeyPressMask_raw_callback);
-        intl->InitKeyMapper(lyxrc->use_kbmap);
+        intl->InitKeyMapper(lyxrc.use_kbmap);
 }
 
 
@@ -306,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);