enable Font cache only for MacOSX and inline width() for other platform.

[lyx.git] / src / frontends / LyXView.C

diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C
index 8a8274e966e0d998b92618004f6d4dbd96b5ca5c..0eeaacee0381cc4d5f2de6a1ea446a8c58aae38b 100644 (file)
--- a/src/frontends/LyXView.C
+++ b/src/frontends/LyXView.C
@@ -68,11 +68,15 @@ LyXView::LyXView()
        : work_area_(0),
          toolbars_(new Toolbars(*this)),
          autosave_timeout_(new Timeout(5000)),
-         lyxfunc_(new LyXFunc(this)),
          dialogs_(new Dialogs(*this)),
          controlcommand_(new ControlCommandBuffer(*this))
 {
-       lyxerr[Debug::INIT] << "Initializing LyXFunc" << endl;
+       // Start autosave timer
+       if (lyxrc.autosave) {
+               autosave_timeout_->timeout.connect(boost::bind(&LyXView::autoSave, this));
+               autosave_timeout_->setTimeout(lyxrc.autosave * 1000);
+               autosave_timeout_->start();
+       }
 }
 
 
@@ -100,20 +104,6 @@ WorkArea * LyXView::workArea()
 }
 
 
-void LyXView::init()
-{
-       updateLayoutChoice();
-       updateMenubar();
-
-       // Start autosave timer
-       if (lyxrc.autosave) {
-               autosave_timeout_->timeout.connect(boost::bind(&LyXView::autoSave, this));
-               autosave_timeout_->setTimeout(lyxrc.autosave * 1000);
-               autosave_timeout_->start();
-       }
-}
-
-
 Buffer * LyXView::buffer() const
 {
        return work_area_->bufferView().buffer();
@@ -209,6 +199,7 @@ void LyXView::disconnectBuffer()
        timerConnection_.disconnect();
        readonlyConnection_.disconnect();
        closingConnection_.disconnect();
+       layout_changed_connection_.disconnect();
 }
 
 
@@ -222,6 +213,8 @@ void LyXView::connectBufferView(BufferView & bv)
                        boost::bind(&LyXView::showInsetDialog, this, _1, _2, _3));
        update_dialog_connection_ = bv.updateDialog.connect(
                        boost::bind(&LyXView::updateDialog, this, _1, _2));
+       layout_changed_connection_ = bv.layoutChanged.connect(
+                       boost::bind(&Toolbars::setLayout, toolbars_.get(), _1));
 }
 
 
@@ -259,7 +252,7 @@ void LyXView::showDialogWithData(string const & name,
 void LyXView::showInsetDialog(string const & name, string const & data,
                                                          InsetBase * inset)
 {
-       getDialogs().show(name, data, 0);
+       getDialogs().show(name, data, inset);
 }
 
 
@@ -283,12 +276,6 @@ BufferView * LyXView::view() const
 }
 
 
-void LyXView::setLayout(string const & layout)
-{
-       toolbars_->setLayout(layout);
-}
-
-
 void LyXView::updateToolbars()
 {
        bool const math = work_area_->bufferView().cursor().inMathed();