#include "insets/Inset.h"
-#include "gettext.h"
+#include "support/FileName.h"
+#include "support/filetools.h"
+#include "support/gettext.h"
#include "LyX.h"
#include "LyXRC.h"
#include "MetricsInfo.h"
#include <boost/bind.hpp>
+using namespace std;
namespace lyx {
{
bool image_ready = displayGraphic(params_) && readyToDisplay(loader_);
- dim.asc = image_ready ? loader_.image()->getHeight() : 50;
+ dim.asc = image_ready ? loader_.image()->height() : 50;
dim.des = 0;
if (image_ready) {
- dim.wid = loader_.image()->getWidth() +
- 2 * Inset::TEXT_TO_INSET_OFFSET;
+ dim.wid = loader_.image()->width() + 2 * Inset::TEXT_TO_INSET_OFFSET;
} else {
int font_width = 0;
docstring const msg = statusMessage(params_, loader_.status());
if (!msg.empty()) {
msgFont.setSize(FONT_SIZE_TINY);
- font_width = std::max(font_width,
+ font_width = max(font_width,
theFontMetrics(msgFont).width(msg));
}
- dim.wid = std::max(50, font_width + 15);
+ dim.wid = max(50, font_width + 15);
}
dim_ = dim;
// Print the file name.
FontInfo msgFont = pi.base.font;
msgFont.setFamily(SANS_FAMILY);
- std::string const justname = params_.filename.onlyFileName();
+ string const justname = params_.filename.onlyFileName();
if (!justname.empty()) {
msgFont.setSize(FONT_SIZE_FOOTNOTE);