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

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

diff --git a/src/frontends/WorkArea.C b/src/frontends/WorkArea.C
index 41c7c62e6ba52e85d2a0c60448d98211f85c6623..aa4089a26cffe60a294cd48de75149ace8e9f1c5 100644 (file)
--- a/src/frontends/WorkArea.C
+++ b/src/frontends/WorkArea.C
@@ -159,8 +159,12 @@ WorkArea::WorkArea(LyXView & lyx_view)
 
 void WorkArea::setBufferView(BufferView * buffer_view)
 {
-       if (buffer_view_)
+       if (buffer_view_) {
                message_connection_.disconnect();
+               lyx_view_.disconnectBufferView();
+       }
+
+       theApp->setBufferView(buffer_view);
 
        hideCursor();
        buffer_view_ = buffer_view;
@@ -168,6 +172,8 @@ void WorkArea::setBufferView(BufferView * buffer_view)
 
        message_connection_ = buffer_view_->message.connect(
                        boost::bind(&WorkArea::displayMessage, this, _1));
+
+       lyx_view_.connectBufferView(*buffer_view);
 }
 
 
@@ -258,6 +264,7 @@ void WorkArea::dispatch(FuncRequest const & cmd0)
        // Skip these when selecting
        if (cmd0.action != LFUN_MOUSE_MOTION) {
                lyx_view_.updateLayoutChoice();
+               lyx_view_.updateMenubar();
                lyx_view_.updateToolbars();
        }