mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
some qt3 and gtk compilation fixes (hopefully)...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15184 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
3a1f656e4e
commit
0548914973
@ -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"
|
||||
|
@ -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_;
|
||||
|
@ -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
|
||||
|
@ -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_;
|
||||
|
Loading…
Reference in New Issue
Block a user