fix static array

[lyx.git] / src / LyXView.C

diff --git a/src/LyXView.C b/src/LyXView.C
index 4fc8f999b5c286424f389c29c078e101a7dcff82..100eb409d634ad0b1a9275c8ee8fff3d8459d6fb 100644 (file)
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -40,8 +40,6 @@
 
 using std::endl;
 
-extern FD_form_document * fd_form_document;
-
 extern void AutoSave(BufferView *);
 extern void QuitLyX();
 LyXTextClass::size_type current_layout = 0;
@@ -122,7 +120,7 @@ Toolbar * LyXView::getToolbar() const
 }
 
 
-void LyXView::setLayout(int layout)
+void LyXView::setLayout(LyXTextClass::size_type layout)
 {
        toolbar->setLayout(layout);
 }
@@ -212,7 +210,7 @@ void LyXView::show(int place, int border, string const & title)
 {
        fl_show_form(form_, place, border, title.c_str());
        minibuffer->Init();
-       InitLyXLookup(fl_display, form_->window);
+       InitLyXLookup(fl_get_display(), form_->window);
 }
 
 
@@ -311,7 +309,6 @@ void LyXView::init()
        // Set the textclass choice
        invalidateLayoutChoice();
        updateLayoutChoice();
-       UpdateDocumentClassChoice();
        updateMenubar();
        
        // Start autosave timer
@@ -365,20 +362,6 @@ void LyXView::updateLayoutChoice()
 }
 
 
-void LyXView::UpdateDocumentClassChoice()
-{
-       // Update the document class display in the document form
-       if (fd_form_document) {
-               fl_clear_choice(fd_form_document->choice_class);
-               for (LyXTextClassList::const_iterator cit = textclasslist.begin();
-                    cit != textclasslist.end(); ++cit) {
-                       fl_addto_choice(fd_form_document->choice_class,
-                                       (*cit).description().c_str());
-               }
-       }
-}
-
-
 #if 0
 // This is necessary, since FL_FREE-Objects doesn't get all keypress events
 // as FL_KEYBOARD events :-(   Matthias 280596
@@ -453,7 +436,7 @@ void LyXView::updateWindowTitle()
        if (view()->available()) {
                string cur_title = buffer()->fileName();
                if (!cur_title.empty()){
-                       title += ": " + MakeDisplayPath(cur_title);
+                       title += ": " + MakeDisplayPath(cur_title, 30);
                        if (!buffer()->isLyxClean())
                                title += _(" (Changed)");
                        if (buffer()->isReadonly())