some qt3 and gtk compilation fixes (hopefully)...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15184 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/gtk/GuiApplication.C b/src/frontends/gtk/GuiApplication.C
index 3abf2f4679eba0d6f9a7de5495a990951c1f7309..5877d15ef39f5d65883874eeddcb08c536789062 100644 (file)
--- a/src/frontends/gtk/GuiApplication.C
+++ b/src/frontends/gtk/GuiApplication.C
@@ -22,16 +22,10 @@
 
 #include "GuiApplication.h"
 
-#include "GView.h"
-#include "GuiWorkArea.h"
 #include "GtkmmX.h"
 
 #include "BufferView.h"
 
-// FIXME: this is needed for now because LyXFunc is still constructed
-// there.
-#include "frontends/Application_pimpl.h"
-
 #include "graphics/LoaderQueue.h"
 
 #include "support/lstrings.h"

diff --git a/src/frontends/gtk/GuiApplication.h b/src/frontends/gtk/GuiApplication.h
index c90bfa68cd2886eeff139d068757af16019062ae..606ed23324ebd864ca8b36203efec43efe2f34b2 100644 (file)
--- a/src/frontends/gtk/GuiApplication.h
+++ b/src/frontends/gtk/GuiApplication.h
@@ -56,10 +56,6 @@ public:
        ///
        xftFontLoader & fontLoader() { return font_loader_; }
 
-       ///
-       LyXView & createView(unsigned int width, unsigned int height,
-               int posx, int posy, bool maximize);
-
 private:
        ///
        GuiImplementation gui_;

diff --git a/src/frontends/qt3/GuiApplication.C b/src/frontends/qt3/GuiApplication.C
index da58d7941d0af60bc326df1bd4f33a82bab149c4..8618fc20c812b5b853d20c8064844b332c57df1c 100644 (file)
--- a/src/frontends/qt3/GuiApplication.C
+++ b/src/frontends/qt3/GuiApplication.C
@@ -12,13 +12,8 @@
 
 #include <config.h>
 
-#include "frontends/LyXView.h"
-#include "frontends/WorkArea.h"
-
 #include "GuiApplication.h"
 
-#include "QtView.h"
-#include "GuiWorkArea.h"
 #include "qt_helpers.h"
 #include "QLImage.h"
 
@@ -168,32 +163,6 @@ void GuiApplication::exit(int status)
 }
 
 
-// FIXME: this whole method needs to be moved to Application.
-LyXView & GuiApplication::createView(unsigned int width,
-                                                                         unsigned int height,
-                                                                         int posx, int posy,
-                                                                         bool maximize)
-{
-       // this can't be done before because it needs the Languages object
-       initEncodings();
-
-       int view_id = gui().newView(width, height);
-       QtView & view = static_cast<QtView &> (gui().view(view_id));
-
-       pimpl_->lyxfunc_.reset(new LyXFunc(&view));
-
-       // FIXME: for now we assume that there is only one LyXView with id = 0.
-       /*int workArea_id_ =*/ gui().newWorkArea(width, height, 0);
-       //WorkArea * workArea_ = & theApp->gui().workArea(workArea_id_);
-
-       LyX::ref().addLyXView(&view);
-
-       view.init();
-
-       return view;
-}
-
-
 ////////////////////////////////////////////////////////////////////////
 // X11 specific stuff goes here...
 #ifdef Q_WS_X11

diff --git a/src/frontends/qt3/GuiApplication.h b/src/frontends/qt3/GuiApplication.h
index 6b8d938785ae60314cdc910c82535a43bac814a5..066d45c2c93c4950918afd82cf9c7d9c578195db 100644 (file)
--- a/src/frontends/qt3/GuiApplication.h
+++ b/src/frontends/qt3/GuiApplication.h
@@ -62,10 +62,6 @@ public:
        ///
        FontLoader & fontLoader() { return font_loader_; }
 
-       ///
-       LyXView & createView(unsigned int width, unsigned int height,
-               int posx, int posy, bool maximize);
-
 private:
        ///
        GuiImplementation gui_;