From fa6118e4affd83a06c4f71df557a74cc1e2aceed Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Mon, 1 Nov 2010 20:58:24 +0000 Subject: [PATCH] Revert unintentional commit. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35976 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiView.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 92da2edbce..eb689ce56b 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1216,23 +1216,17 @@ void GuiView::setCurrentWorkArea(GuiWorkArea * wa) theGuiApp()->setCurrentView(this); d.current_work_area_ = wa; - - // We need to reset this now, because it will need to be - // right if the tabWorkArea gets reset in the for loop. We - // will change it back if we aren't in that case. - GuiWorkArea * const old_cmwa = d.current_main_work_area_; - d.current_main_work_area_ = wa; - for (int i = 0; i != d.splitter_->count(); ++i) { if (d.tabWorkArea(i)->setCurrentWorkArea(wa)) { - LYXERR(Debug::DEBUG, "Current wa: " << currentWorkArea() - << ", Current main wa: " << currentMainWorkArea()); + //if (d.current_main_work_area_) + // d.current_main_work_area_->setFrameStyle(QFrame::NoFrame); + d.current_main_work_area_ = wa; + //d.current_main_work_area_->setFrameStyle(QFrame::Box | QFrame::Plain); + //d.current_main_work_area_->setLineWidth(2); + LYXERR(Debug::DEBUG, "Current wa: " << currentWorkArea() << ", Current main wa: " << currentMainWorkArea()); return; } } - - d.current_main_work_area_ = old_cmwa; - LYXERR(Debug::DEBUG, "This is not a tabbed wa"); on_currentWorkAreaChanged(wa); BufferView & bv = wa->bufferView(); @@ -1400,7 +1394,6 @@ void GuiView::updateTocItem(string const & type, DocIterator const & dit) void GuiView::structureChanged() { d.toc_models_.reset(documentBufferView()); - LYXERR0(documentBufferView()); // Navigator needs more than a simple update in this case. It needs to be // rebuilt. updateDialog("toc", ""); -- 2.39.5