-// -*- C++ -*-
/* This file is part of
* =================================================
*
* LyX, The Document Processor
* Copyright 1995 Matthias Ettrich.
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ================================================= */
#include <config.h>
#include "ImageLoaderXPM.h"
#include "frontends/support/LyXImage.h"
+#include "frontends/GUIRunTime.h"
#include "support/filetools.h"
-#include FORMS_H_LOCATION
#include XPM_H_LOCATION
#include <iostream>
#include <fstream>
ImageLoader::Result
ImageLoaderXPM::runImageLoader(string const & filename)
{
- Display * display = fl_get_display();
+ Display * display = GUIRunTime::x11Display();
//(BE 2000-08-05)
#ifdef WITH_WARNINGS
#warning This might be a dirty thing, but I dont know any other solution.
#endif
- Screen * screen = ScreenOfDisplay(display, fl_screen);
+ Screen * screen = ScreenOfDisplay(display, GUIRunTime::x11Screen());
Pixmap pixmap;
Pixmap mask;
}
// This should have been set by the XpmReadFileToPixmap call!
- Assert(attrib.valuemask & XpmSize);
+ lyx::Assert(attrib.valuemask & XpmSize);
setImage(new LyXImage(pixmap, attrib.width, attrib.height));