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

[lyx.git] / src / frontends / qt4 / GuiImplementation.C

diff --git a/src/frontends/qt4/GuiImplementation.C b/src/frontends/qt4/GuiImplementation.C
index d66aa4e9562c83b1c69fdcb35d6960a91db35993..0c813cad9e4864882093979d442aacc7eb69a5e0 100644 (file)
--- a/src/frontends/qt4/GuiImplementation.C
+++ b/src/frontends/qt4/GuiImplementation.C
@@ -10,6 +10,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
+#include <config.h>
+
 // This include must be declared before everything else because
 // of boost/Qt/LyX clash...
 #include "GuiView.h"
@@ -29,18 +31,12 @@ GuiImplementation::GuiImplementation(): max_view_id_(0), max_wa_id_(0)
 }
 
 
-Clipboard& GuiImplementation::clipboard()
-{
-       return clipboard_;
-}
-
-
 int GuiImplementation::newView(unsigned int /*w*/, unsigned int /*h*/)
 {
        size_t const id = max_view_id_;
        ++max_view_id_;
 
-       views_[id].reset(new GuiView(*this));
+       views_[id].reset(new GuiView());
 
        return id;
 }
@@ -67,16 +63,14 @@ int GuiImplementation::newWorkArea(unsigned int w, unsigned int h, int view_id)
 
        GuiView * view = views_[view_id].get();
 
-       work_areas_[id].reset(new GuiWorkArea(w, h, view));
+       work_areas_[id].reset(new GuiWorkArea(w, h, *view));
 
        // FIXME BufferView creation should be independant of WorkArea creation
-       buffer_views_[id].reset(new BufferView(view, work_areas_[id].get()));
+       buffer_views_[id].reset(new BufferView);
        work_areas_[id]->setBufferView(buffer_views_[id].get());
-       view->setBufferView(buffer_views_[id].get());
-
-       view->mainWidget()->setCentralWidget(work_areas_[id].get());
+       view->setWorkArea(work_areas_[id].get());
 
-       guiCursor().connect(work_areas_[id].get());
+       view->setCentralWidget(work_areas_[id].get());
 
        return id;
 }