X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FLyXView.C;h=8c6059bf75b9419b0055af0382edd4d3247ec4a4;hb=25079a83c2c4efd877a735e6571f149f703d4a16;hp=7d13fa5c8cc6f1fc55f6dc1338dd422774ef5490;hpb=b084ac0a4af4270558fb8c09add0ffeb3c2f601d;p=lyx.git

diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C
index 7d13fa5c8c..8c6059bf75 100644
--- a/src/frontends/LyXView.C
+++ b/src/frontends/LyXView.C
@@ -17,6 +17,7 @@
 #include "Toolbars.h"
 #include "Menubar.h"
 #include "WorkArea.h"
+#include "Gui.h"
 
 #include "buffer.h"
 #include "bufferparams.h"
@@ -52,12 +53,12 @@ namespace lyx {
 # include <unistd.h>
 #endif
 
-using lyx::frontend::WorkArea;
+using frontend::WorkArea;
 
-using lyx::docstring;
-using lyx::support::bformat;
-using lyx::support::makeDisplayPath;
-using lyx::support::onlyFilename;
+using support::bformat;
+using support::FileName;
+using support::makeDisplayPath;
+using support::onlyFilename;
 
 using std::endl;
 using std::string;
@@ -85,20 +86,37 @@ LyXView::LyXView(int id)
 
 LyXView::~LyXView()
 {
+	disconnectBuffer();
 }
 
 
 // FIXME, there's only one WorkArea per LyXView possible for now.
 void LyXView::setWorkArea(WorkArea * work_area)
 {
+	BOOST_ASSERT(work_area);
 	work_area_ = work_area;
 	work_area_ids_.clear();
 	work_area_ids_.push_back(work_area_->id());
 }
 
 
+// FIXME, there's only one WorkArea per LyXView possible for now.
+WorkArea const * LyXView::currentWorkArea() const
+{
+	return work_area_;
+}
+
+
+// FIXME, there's only one WorkArea per LyXView possible for now.
+WorkArea * LyXView::currentWorkArea()
+{
+	return work_area_;
+}
+
+
 Buffer * LyXView::buffer() const
 {
+	BOOST_ASSERT(work_area_);
 	return work_area_->bufferView().buffer();
 }
 
@@ -107,6 +125,7 @@ void LyXView::setBuffer(Buffer * b)
 {
 	busy(true);
 
+	BOOST_ASSERT(work_area_);
 	if (work_area_->bufferView().buffer())
 		disconnectBuffer();
 
@@ -137,10 +156,11 @@ void LyXView::setBuffer(Buffer * b)
 }
 
 
-bool LyXView::loadLyXFile(string const & filename, bool tolastfiles)
+bool LyXView::loadLyXFile(FileName const & filename, bool tolastfiles)
 {
 	busy(true);
 
+	BOOST_ASSERT(work_area_);
 	if (work_area_->bufferView().buffer())
 		disconnectBuffer();
 
@@ -167,6 +187,7 @@ void LyXView::connectBuffer(Buffer & buf)
 	if (errorsConnection_.connected())
 		disconnectBuffer();
 
+	BOOST_ASSERT(work_area_);
 	bufferChangedConnection_ =
 		buf.changed.connect(
 			boost::bind(&WorkArea::redraw, work_area_));
@@ -283,12 +304,14 @@ void LyXView::showReadonly(bool)
 
 BufferView * LyXView::view() const
 {
+	BOOST_ASSERT(work_area_);
 	return &work_area_->bufferView();
 }
 
 
 void LyXView::updateToolbars()
 {
+	BOOST_ASSERT(work_area_);
 	bool const math =
 		work_area_->bufferView().cursor().inMathed();
 	bool const table =
@@ -360,6 +383,7 @@ void LyXView::updateLayoutChoice()
 		current_layout = buffer()->params().getLyXTextClass().defaultLayoutName();
 	}
 
+	BOOST_ASSERT(work_area_);
 	if (work_area_->bufferView().cursor().inMathed())
 		return;
 
@@ -375,7 +399,6 @@ void LyXView::updateLayoutChoice()
 
 void LyXView::updateWindowTitle()
 {
-	static docstring last_title = lyx::from_ascii("LyX");
 	docstring maximize_title = lyx::from_ascii("LyX");
 	docstring minimize_title = lyx::from_ascii("LyX");
 
@@ -393,21 +416,12 @@ void LyXView::updateWindowTitle()
 		}
 	}
 
-	if (maximize_title != last_title) {
-		setWindowTitle(maximize_title, minimize_title);
-		last_title = maximize_title;
-	}
+	setWindowTitle(maximize_title, minimize_title);
 }
 
 
 void LyXView::dispatch(FuncRequest const & cmd)
 {
-	if (cmd.action == LFUN_WINDOW_CLOSE) {
-		close();
-		closed(id_);
-		return;
-	}
-
 	theLyXFunc().setLyXView(this);
 	lyx::dispatch(cmd);
 }
@@ -417,9 +431,10 @@ Buffer const * const LyXView::updateInset(InsetBase const * inset) const
 {
 	Buffer const * buffer_ptr = 0;
 	if (inset) {
+		BOOST_ASSERT(work_area_);
+		work_area_->scheduleRedraw();
+
 		buffer_ptr = work_area_->bufferView().buffer();
-		// No FitCursor:
-		work_area_->bufferView().update(Update::Force);
 	}
 	return buffer_ptr;
 }