Move Color::color enum to ColorCode.h

[lyx.git] / src / frontends / Application.cpp

diff --git a/src/frontends/Application.cpp b/src/frontends/Application.cpp
index 6126e20c5b56de5d46751719ffa3a0cc2cb76c99..83076e7abf107b936e41ea6c99e10336cf23a7ae 100644 (file)
--- a/src/frontends/Application.cpp
+++ b/src/frontends/Application.cpp
@@ -23,7 +23,7 @@
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "LyX.h"  // for lyx::use_gui
-#include "LyXFont.h"
+#include "Font.h"
 #include "LyXFunc.h"
 #include "LyXRC.h"
 
@@ -52,14 +52,11 @@ LyXView & Application::createView(unsigned int width,
                                  const std::string & geometryArg)
 {
        LyXView & view = gui().createRegisteredView();
-       int view_id = view.id();
-       
        theLyXFunc().setLyXView(&view);
 
-       /*int workArea_id_ =*/ gui().newWorkArea(width, height, view_id);
-
        view.init();
        view.setGeometry(width, height, posx, posy, maximized, iconSizeXY, geometryArg);
+
        view.setFocus();
 
        setCurrentView(view);
@@ -101,7 +98,7 @@ frontend::FontLoader & theFontLoader()
 }
 
 
-frontend::FontMetrics const & theFontMetrics(LyXFont const & f)
+frontend::FontMetrics const & theFontMetrics(Font const & f)
 {
        static frontend::NoGuiFontMetrics no_gui_font_metrics;