#include <config.h>
#include "insets/insetgraphics.h"
+#include "BufferView.h"
#include "Painter.h"
#include "form_graphics.h"
#include "lyx_gui_misc.h"
#include "support/FileInfo.h"
#include "support/filetools.h"
+using std::ostream;
+using std::endl;
+
extern string system_lyxdir;
extern string user_lyxdir;
extern string system_tempdir;
string browseFile();
-void GraphicxCB(FL_OBJECT * obj, long arg)
+extern "C" void GraphicxCB(FL_OBJECT * obj, long arg)
{
lyxerr << "GraphicxCB: obj = " << obj << " arg = " << arg << endl;
switch (arg) {
}
-void InsetGraphics::draw(Painter & pain, LyXFont const & font,
- int baseline, float & x) const
+void InsetGraphics::draw(BufferView * bv, LyXFont const & font,
+ int baseline, float & x, bool) const
{
+ Painter & pain = bv->painter();
+
// This will draw the graphics. As for now we only draw a
// placeholder rectangele.
- pain.rectangle(x, baseline - ascent(pain, font),
+ pain.rectangle(int(x), baseline - ascent(pain, font),
width(pain, font),
ascent(pain, font) + descent(pain, font));
}
}
-void InsetGraphics::Write(ostream & os) const
+void InsetGraphics::Write(Buffer const *, ostream & os) const
{
// The question on the file format is still open.
// Suggestions?
}
-void InsetGraphics::Read(LyXLex & /*lex*/)
+void InsetGraphics::Read(Buffer const *, LyXLex & /*lex*/)
{
// For now we only use a static file...
graphicsfile = "testfile.xpm";
}
-int InsetGraphics::Latex(ostream & os, signed char /*fragile*/, bool/*fs*/) const
+int InsetGraphics::Latex(Buffer const *, ostream & os,
+ bool /*fragile*/, bool/*fs*/) const
{
// MISSING: We have to decide how to do the order of the options
// that is depentant of order, like witdth, height, andlge. Should
string command("\\insetgraphics");
#ifdef HAVE_SSTREAM
- ostringstream options;
+ std::ostringstream options;
#else
ostrstream options;
#endif
}
-int InsetGraphics::Linuxdoc(ostream &) const
+int InsetGraphics::Ascii(Buffer const *, ostream &) const
+{
+ return 0;
+}
+
+
+int InsetGraphics::Linuxdoc(Buffer const *, ostream &) const
{
return 0;
}
-int InsetGraphics::DocBook(ostream &) const
+int InsetGraphics::DocBook(Buffer const *, ostream &) const
{
return 0;
}