fix static array

[lyx.git] / src / LyXView.C

diff --git a/src/LyXView.C b/src/LyXView.C
index 2e28a73a6828f054b3b38877de24b9ccbbaf4914..100eb409d634ad0b1a9275c8ee8fff3d8459d6fb 100644 (file)
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -32,20 +32,14 @@
 #include "buffer.h"
 #include "frontends/Dialogs.h"
 #include "frontends/Toolbar.h"
-#ifdef NEW_MENUBAR
-# include "frontends/Menubar.h"
-# include "MenuBackend.h"
-#else
-# include "menus.h"
-#endif
+#include "frontends/Menubar.h"
+#include "MenuBackend.h"
 #include "ToolbarDefaults.h"
 #include "lyx_gui_misc.h"      // [update,Close]AllBufferRelatedDialogs
 #include "bufferview_funcs.h" // CurrentState()
 
 using std::endl;
 
-extern FD_form_document * fd_form_document;
-
 extern void AutoSave(BufferView *);
 extern void QuitLyX();
 LyXTextClass::size_type current_layout = 0;
@@ -83,11 +77,7 @@ LyXView::LyXView(int width, int height)
 
 LyXView::~LyXView()
 {
-#ifdef NEW_MENUBAR
        delete menubar;
-#else
-       delete menus;
-#endif
        delete toolbar;
        delete bufferview;
        delete minibuffer;
@@ -130,7 +120,7 @@ Toolbar * LyXView::getToolbar() const
 }
 
 
-void LyXView::setLayout(int layout)
+void LyXView::setLayout(LyXTextClass::size_type layout)
 {
        toolbar->setLayout(layout);
 }
@@ -155,7 +145,6 @@ MiniBuffer * LyXView::getMiniBuffer() const
 }
 
 
-#ifdef NEW_MENUBAR
 Menubar * LyXView::getMenubar() const
 {
        return menubar;
@@ -171,13 +160,6 @@ void LyXView::updateMenubar()
                menubar->set("main");
 }
 
-#else
-Menus * LyXView::getMenus() const
-{
-       return menus;
-}
-#endif
-
 
 Intl * LyXView::getIntl() const
 {
@@ -224,11 +206,11 @@ void LyXView::setPosition(int x, int y)
 }
 
 
-void LyXView::show(int place, int border, char const * title)
+void LyXView::show(int place, int border, string const & title)
 {
-       fl_show_form(form_, place, border, title);
+       fl_show_form(form_, place, border, title.c_str());
        minibuffer->Init();
-       InitLyXLookup(fl_display, form_->window);
+       InitLyXLookup(fl_get_display(), form_->window);
 }
 
 
@@ -254,11 +236,7 @@ void LyXView::create_form_form_main(int width, int height)
        //
        // THE MENUBAR
        //
-#ifdef NEW_MENUBAR
        menubar = new Menubar(this, menubackend);
-#else  
-       menus = new Menus(this, air);
-#endif
 
        //
        // TOOLBAR
@@ -331,10 +309,7 @@ void LyXView::init()
        // Set the textclass choice
        invalidateLayoutChoice();
        updateLayoutChoice();
-       UpdateDocumentClassChoice();
-#ifdef NEW_MENUBAR
        updateMenubar();
-#endif
        
        // Start autosave timer
        if (lyxrc.autosave) {
@@ -387,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
@@ -475,7 +436,7 @@ void LyXView::updateWindowTitle()
        if (view()->available()) {
                string cur_title = buffer()->fileName();
                if (!cur_title.empty()){
-                       title += ": " + OnlyFilename(cur_title);
+                       title += ": " + MakeDisplayPath(cur_title, 30);
                        if (!buffer()->isLyxClean())
                                title += _(" (Changed)");
                        if (buffer()->isReadonly())