some tabular fixes for the problems reported by Helge

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

diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C
index da79c4c181567185d3ae0dd8fcb59317ed359826..7758bb400b96a353f6b8c1f624948452e27077d9 100644 (file)
--- a/src/frontends/LyXView.C
+++ b/src/frontends/LyXView.C
@@ -14,13 +14,14 @@
 #include "LyXView.h"
 #include "Dialogs.h"
 #include "Timeout.h"
-#include "Toolbar.h"
+#include "Toolbars.h"
 #include "Menubar.h"
 
 #include "buffer.h"
 #include "bufferparams.h"
 #include "BufferView.h"
 #include "bufferview_funcs.h"
+#include "cursor.h"
 #include "debug.h"
 #include "funcrequest.h"
 #include "gettext.h"
@@ -34,14 +35,14 @@
 
 #include "controllers/ControlCommandBuffer.h"
 
-#include "mathed/math_cursor.h"
-
 #include "support/filetools.h" // OnlyFilename()
 
 #include <boost/bind.hpp>
 
 #include <sys/time.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 using lyx::support::MakeDisplayPath;
 using lyx::support::OnlyFilename;
@@ -49,12 +50,14 @@ using lyx::support::OnlyFilename;
 using std::endl;
 using std::string;
 
+using lyx::frontend::ControlCommandBuffer;
 
 string current_layout;
 
 
 LyXView::LyXView()
-       : intl_(new Intl),
+       : toolbars_(new Toolbars(*this)),
+         intl_(new Intl),
          autosave_timeout_(new Timeout(5000)),
          lyxfunc_(new LyXFunc(this)),
          dialogs_(new Dialogs(*this)),
@@ -99,16 +102,16 @@ boost::shared_ptr<BufferView> const & LyXView::view() const
 
 void LyXView::setLayout(string const & layout)
 {
-       toolbar_->setLayout(layout);
+       toolbars_->setLayout(layout);
 }
 
 
-void LyXView::updateToolbar()
+void LyXView::updateToolbars()
 {
-       bool const math = inMathed();
+       bool const math = bufferview_->cursor().inMathed();
        bool const table =
-               !getLyXFunc().getStatus(FuncRequest(LFUN_LAYOUT_TABULAR)).disabled();
-       toolbar_->update(math, table);
+               getLyXFunc().getStatus(FuncRequest(LFUN_LAYOUT_TABULAR)).enabled();
+       toolbars_->update(math, table);
 }
 
 
@@ -137,22 +140,25 @@ void LyXView::resetAutosaveTimer()
 
 void LyXView::updateLayoutChoice()
 {
-       // don't show any layouts without a buffer
+       // Don't show any layouts without a buffer
        if (!view()->buffer()) {
-               toolbar_->clearLayoutList();
+               toolbars_->clearLayoutList();
                return;
        }
 
-       // update the layout display
-       if (toolbar_->updateLayoutList(buffer()->params().textclass)) {
+       // Update the layout display
+       if (toolbars_->updateLayoutList(buffer()->params().textclass)) {
                current_layout = buffer()->params().getLyXTextClass().defaultLayoutName();
        }
 
+       if (bufferview_->cursor().inMathed())
+               return;
+
        string const & layout =
-               bufferview_->getLyXText()->cursorPar()->layout()->name();
+               bufferview_->cursor().paragraph().layout()->name();
 
        if (layout != current_layout) {
-               toolbar_->setLayout(layout);
+               toolbars_->setLayout(layout);
                current_layout = layout;
        }
 }
@@ -191,7 +197,7 @@ void LyXView::dispatch(FuncRequest const & cmd)
 }
 
 
-Buffer const * const LyXView::updateInset(InsetOld const * inset) const
+Buffer const * const LyXView::updateInset(InsetBase const * inset) const
 {
        Buffer const * buffer_ptr = 0;
        if (inset) {