#endif
#include "BufferView.h"
-#include "font.h"
+#include "frontends/font_metrics.h"
#include "lyxfont.h"
#include "gettext.h"
#include "inseterror.h"
-#include "LyXView.h"
-#include "Painter.h"
+#include "frontends/LyXView.h"
+#include "frontends/Painter.h"
#include "frontends/Dialogs.h"
using std::ostream;
{
LyXFont efont;
efont.setSize(font.size()).decSize();
- return lyxfont::maxAscent(efont) + 1;
+ return font_metrics::maxAscent(efont) + 1;
}
{
LyXFont efont;
efont.setSize(font.size()).decSize();
- return lyxfont::maxDescent(efont) + 1;
+ return font_metrics::maxDescent(efont) + 1;
}
{
LyXFont efont;
efont.setSize(font.size()).decSize();
- return 6 + lyxfont::width(_("Error"), efont);
+ return 6 + font_metrics::width(_("Error"), efont);
}
}
-void InsetError::edit(BufferView * bv, int, int, unsigned int)
+void InsetError::edit(BufferView * bv, int, int, mouse_button::state)
{
bv->owner()->getDialogs()->showError(this);
}
void InsetError::edit(BufferView * bv, bool)
{
- edit(bv, 0, 0, 0);
+ edit(bv, 0, 0, mouse_button::none);
}