From 0548914973b579e4b4a5bb34d9eebba7efe37676 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Fri, 29 Sep 2006 23:15:36 +0000 Subject: [PATCH] some qt3 and gtk compilation fixes (hopefully)... git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15184 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/gtk/GuiApplication.C | 6 ------ src/frontends/gtk/GuiApplication.h | 4 ---- src/frontends/qt3/GuiApplication.C | 31 ------------------------------ src/frontends/qt3/GuiApplication.h | 4 ---- 4 files changed, 45 deletions(-) diff --git a/src/frontends/gtk/GuiApplication.C b/src/frontends/gtk/GuiApplication.C index 3abf2f4679..5877d15ef3 100644 --- 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 c90bfa68cd..606ed23324 100644 --- 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 da58d7941d..8618fc20c8 100644 --- a/src/frontends/qt3/GuiApplication.C +++ b/src/frontends/qt3/GuiApplication.C @@ -12,13 +12,8 @@ #include -#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 (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 6b8d938785..066d45c2c9 100644 --- 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_;