mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-23 10:18:50 +00:00
bug fix. reorder initialization
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4962 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
6cd49089c4
commit
e8eb6cdb2d
@ -46,11 +46,11 @@ string current_layout;
|
|||||||
|
|
||||||
|
|
||||||
LyXView::LyXView()
|
LyXView::LyXView()
|
||||||
: controlcommand_(new ControlCommandBuffer(getLyXFunc())),
|
: intl_(new Intl),
|
||||||
intl_(new Intl),
|
|
||||||
autosave_timeout_(new Timeout(5000)),
|
autosave_timeout_(new Timeout(5000)),
|
||||||
lyxfunc_(new LyXFunc(this)),
|
lyxfunc_(new LyXFunc(this)),
|
||||||
dialogs_(new Dialogs(this))
|
dialogs_(new Dialogs(this)),
|
||||||
|
controlcommand_(new ControlCommandBuffer(getLyXFunc()))
|
||||||
{
|
{
|
||||||
lyxerr[Debug::INIT] << "Initializing LyXFunc" << endl;
|
lyxerr[Debug::INIT] << "Initializing LyXFunc" << endl;
|
||||||
}
|
}
|
||||||
|
@ -144,8 +144,6 @@ protected:
|
|||||||
boost::scoped_ptr<Menubar> menubar_;
|
boost::scoped_ptr<Menubar> menubar_;
|
||||||
/// view's toolbar
|
/// view's toolbar
|
||||||
boost::scoped_ptr<Toolbar> toolbar_;
|
boost::scoped_ptr<Toolbar> toolbar_;
|
||||||
/// view's command buffer controller
|
|
||||||
boost::scoped_ptr<ControlCommandBuffer> const controlcommand_;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/**
|
/**
|
||||||
@ -166,6 +164,12 @@ private:
|
|||||||
boost::scoped_ptr<LyXFunc> lyxfunc_;
|
boost::scoped_ptr<LyXFunc> lyxfunc_;
|
||||||
/// dialogs for this view
|
/// dialogs for this view
|
||||||
boost::scoped_ptr<Dialogs> dialogs_;
|
boost::scoped_ptr<Dialogs> dialogs_;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
/// view's command buffer controller
|
||||||
|
// this has to be declared _after_ lyxfunc_ as its initialization depends
|
||||||
|
// on it!
|
||||||
|
boost::scoped_ptr<ControlCommandBuffer> const controlcommand_;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // LYXVIEW_H
|
#endif // LYXVIEW_H
|
||||||
|
Loading…
Reference in New Issue
Block a user