* remove various xforms relicts, in particular:

[lyx.git] / src / BufferView.C

diff --git a/src/BufferView.C b/src/BufferView.C
index 01cfc41d8eef8fbf3e737869f29d0133340a3e2b..f1c1834b1c24523ccbe437d3d69c161b1e5c78b2 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -37,16 +37,18 @@
 #include "texrow.h"
 #include "undo.h"
 #include "WordLangTuple.h"
+#include "metricsinfo.h"
 
 #include "frontends/Alert.h"
+#include "frontends/Clipboard.h"
 #include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
-#include "frontends/screen.h"
-#include "frontends/WorkArea.h"
+#include "frontends/Gui.h"
 
 #include "insets/insetcommand.h" // ChangeRefs
 #include "insets/insettext.h"
 
+
 using lyx::support::bformat;
 
 using lyx::cap::setSelectionRange;
@@ -54,15 +56,14 @@ using lyx::cap::setSelectionRange;
 using std::distance;
 using std::find;
 using std::string;
-using std::swap;
 using std::vector;
 
 
 extern BufferList bufferlist;
 
 
-BufferView::BufferView(LyXView * owner, int width, int height)
-       : pimpl_(new Pimpl(*this, owner, width, height))
+BufferView::BufferView(LyXView * owner)
+       : pimpl_(new Pimpl(*this, owner))
 {}
 
 
@@ -84,24 +85,12 @@ Buffer * BufferView::buffer() const
 }
 
 
-LyXScreen & BufferView::screen() const
-{
-       return pimpl_->screen();
-}
-
-
 LyXView * BufferView::owner() const
 {
        return pimpl_->owner_;
 }
 
 
-Painter & BufferView::painter() const
-{
-       return pimpl_->painter();
-}
-
-
 void BufferView::setBuffer(Buffer * b)
 {
        pimpl_->setBuffer(b);
@@ -153,6 +142,12 @@ void BufferView::updateScrollbar()
 }
 
 
+ScrollbarParameters const & BufferView::scrollbarParameters() const
+{
+       return pimpl_->scrollbarParameters();
+}
+
+
 void BufferView::scrollDocView(int value)
 {
        pimpl_->scrollDocView(value);
@@ -201,7 +196,7 @@ void BufferView::switchKeyMap()
 
 int BufferView::workWidth() const
 {
-       return pimpl_->workarea().workWidth();
+       return pimpl_->width();
 }
 
 
@@ -211,18 +206,6 @@ void BufferView::center()
 }
 
 
-string const BufferView::getClipboard() const
-{
-       return pimpl_->workarea().getClipboard();
-}
-
-
-void BufferView::stuffClipboard(string const & stuff) const
-{
-       pimpl_->stuffClipboard(stuff);
-}
-
-
 FuncStatus BufferView::getStatus(FuncRequest const & cmd)
 {
        return pimpl_->getStatus(cmd);
@@ -237,31 +220,31 @@ bool BufferView::dispatch(FuncRequest const & ev)
 
 void BufferView::selectionRequested()
 {
-        pimpl_->selectionRequested();
+       pimpl_->selectionRequested();
 }
 
 
 void BufferView::selectionLost()
 {
-        pimpl_->selectionLost();
+       pimpl_->selectionLost();
 }
 
 
-void BufferView::workAreaResize()
+void BufferView::workAreaResize(int width, int height)
 {
-        pimpl_->workAreaResize();
+       pimpl_->workAreaResize(width, height);
 }
 
 
 void BufferView::workAreaKeyPress(LyXKeySymPtr key, key_modifier::state state)
 {
-        pimpl_->workAreaKeyPress(key, state);
+       pimpl_->workAreaKeyPress(key, state);
 }
 
 
 bool BufferView::workAreaDispatch(FuncRequest const & ev)
 {
-        return pimpl_->workAreaDispatch(ev);
+       return pimpl_->workAreaDispatch(ev);
 }
 
 
@@ -318,7 +301,7 @@ void BufferView::gotoLabel(string const & label)
 
 void BufferView::hideCursor()
 {
-       screen().hideCursor();
+       pimpl_->gui().guiCursor().hide();
 }
 
 LyXText * BufferView::getLyXText()
@@ -337,15 +320,9 @@ LyXText const * BufferView::getLyXText() const
 }
 
 
-void BufferView::haveSelection(bool sel)
-{
-       pimpl_->workarea().haveSelection(sel);
-}
-
-
 int BufferView::workHeight() const
 {
-       return pimpl_->workarea().workHeight();
+       return pimpl_->height();
 }
 
 
@@ -403,18 +380,6 @@ void BufferView::putSelectionAt(DocIterator const & cur,
 }
 
 
-bool const BufferView::repaintAll() const
-{
-       return pimpl_->repaintAll();
-}
-
-
-void const BufferView::repaintAll(bool r) const
-{
-       pimpl_->repaintAll(r);
-}
-
-
 LCursor & BufferView::cursor()
 {
        return pimpl_->cursor_;
@@ -437,3 +402,9 @@ int BufferView::offset_ref() const
 {
        return pimpl_->offset_ref_;
 }
+
+
+ViewMetricsInfo const & BufferView::viewMetricsInfo()
+{
+       return pimpl_->viewMetricsInfo();
+}