mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-23 02:14:50 +00:00
Some updates, but not enough to get it compiling
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15437 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
7cf8328885
commit
604962d968
@ -30,9 +30,6 @@
|
||||
#include "support/docstring.h"
|
||||
#include "lyxfunc.h"
|
||||
|
||||
using lyx::char_type;
|
||||
using lyx::docstring;
|
||||
|
||||
using std::string;
|
||||
|
||||
namespace lyx {
|
||||
@ -48,7 +45,7 @@ class LyxMenu : public Gtk::Menu {
|
||||
public:
|
||||
LyxMenu() { menu_.reset(new ::Menu); }
|
||||
|
||||
::Menu& getBackMenu() { return *menu_.get(); }
|
||||
::Menu & getBackMenu() { return *menu_.get(); }
|
||||
|
||||
void clearBackMenu() { menu_.reset(new ::Menu); }
|
||||
private:
|
||||
|
@ -19,9 +19,10 @@
|
||||
|
||||
#include <vector>
|
||||
|
||||
namespace lyx {
|
||||
|
||||
class LyXView;
|
||||
|
||||
namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
class GMenubar : public Menubar, public sigc::trackable {
|
||||
|
@ -26,12 +26,13 @@
|
||||
#include <gtkmm.h>
|
||||
|
||||
|
||||
namespace lyx {
|
||||
|
||||
Timeout::Timeout(unsigned int msec, Type t)
|
||||
: pimpl_(new lyx::frontend::GTimeout(*this)),
|
||||
type(t), timeout_ms(msec)
|
||||
{}
|
||||
|
||||
namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GTimeout::GTimeout(Timeout & owner)
|
||||
|
@ -177,10 +177,6 @@ void GLayoutBox::selected()
|
||||
layoutSelected(owner_, layoutGuiName);
|
||||
}
|
||||
|
||||
} // namespace frontend
|
||||
} // namespace lyx
|
||||
|
||||
|
||||
Toolbars::ToolbarPtr make_toolbar(ToolbarBackend::Toolbar const & tbb,
|
||||
LyXView & owner)
|
||||
{
|
||||
@ -188,9 +184,6 @@ Toolbars::ToolbarPtr make_toolbar(ToolbarBackend::Toolbar const & tbb,
|
||||
return Toolbars::ToolbarPtr(new GToolbar(tbb, owner));
|
||||
}
|
||||
|
||||
namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GToolbar::GToolbar(ToolbarBackend::Toolbar const & tbb, LyXView & owner)
|
||||
: owner_(dynamic_cast<GView &>(owner))
|
||||
{
|
||||
|
@ -79,9 +79,10 @@ private:
|
||||
};
|
||||
|
||||
} // namespace frontend
|
||||
} // namespace lyx
|
||||
|
||||
Toolbars::ToolbarPtr make_toolbar(ToolbarBackend::Toolbar const & tbb,
|
||||
LyXView & owner);
|
||||
|
||||
} // namespace lyx
|
||||
|
||||
#endif // NOT GTOOLBAR_H
|
||||
|
@ -24,10 +24,11 @@
|
||||
// FIXME: defined in X.h, spuriously pulled in by some gui headers
|
||||
#undef CursorShape
|
||||
|
||||
namespace lyx {
|
||||
|
||||
class LColor_color;
|
||||
class LyXView;
|
||||
|
||||
namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
class ColorCache {
|
||||
|
@ -45,8 +45,6 @@
|
||||
#include <iomanip>
|
||||
|
||||
|
||||
using lyx::support::subst;
|
||||
|
||||
using std::string;
|
||||
using std::endl;
|
||||
|
||||
@ -69,6 +67,8 @@ int getDPI()
|
||||
|
||||
namespace lyx {
|
||||
|
||||
using support::subst;
|
||||
|
||||
frontend::Application * createApplication(int & argc, char * argv[])
|
||||
{
|
||||
return new frontend::GuiApplication(argc, argv);
|
||||
|
@ -1,5 +1 @@
|
||||
#include <config.h>
|
||||
|
||||
|
||||
namespace lyx {
|
||||
|
||||
|
@ -47,8 +47,8 @@ public:
|
||||
private:
|
||||
XftFont * font;
|
||||
XftFont * fontS;
|
||||
|
||||
};
|
||||
|
||||
} // namespace lyx
|
||||
};
|
||||
|
||||
#endif // XFT_FONT_METRICS_H
|
||||
|
Loading…
Reference in New Issue
Block a user