+2002-07-12 John Levon <moz@compsoc.man.ac.uk>
+
+ * lyx_gui.h: remove init_graphics()
+
2002-07-12 John Levon <moz@compsoc.man.ac.uk>
* Toolbar.h:
*/
void start(string const & batch, std::vector<std::string> files);
- /// initialise graphics
- void init_graphics();
-
/** Eg, passing LColor::black returns "000000",
* passing LColor::white returns "ffffff".
*/
+2002-07-12 John Levon <moz@compsoc.man.ac.uk>
+
+ * lyx_gui.C: move init_graphics() to parse_init()
+
2002-07-12 John Levon <moz@compsoc.man.ac.uk>
* Toolbar_pimpl.h:
void lyx_gui::parse_init(int & argc, char * argv[])
{
static QApplication a(argc, argv);
+
+ using namespace grfx;
+
+ Image::newImage = boost::bind(&QLImage::newImage);
+ Image::loadableFormats = boost::bind(&QLImage::loadableFormats);
}
}
-void lyx_gui::init_graphics()
-{
- using namespace grfx;
-
- Image::newImage = boost::bind(&QLImage::newImage);
- Image::loadableFormats = boost::bind(&QLImage::loadableFormats);
-}
-
-
string const lyx_gui::hexname(LColor::color col)
{
// FIXME
+2002-07-12 John Levon <moz@compsoc.man.ac.uk>
+
+ * lyx_gui.C: move init_graphics() into setup
+
2002-07-12 Angus Leeming <leeming@lyx.org>
* xformsImage.C (width): apply fudge irrespective of library version.
XSetErrorHandler(LyX_XErrHandler);
lyxColorHandler.reset(new LyXColorHandler());
+
+ using namespace grfx;
+
+#ifdef USE_XFORMS_IMAGE_LOADER
+ // connect the image loader based on the xforms library
+ Image::newImage = boost::bind(&xformsImage::newImage);
+ Image::loadableFormats = boost::bind(&xformsImage::loadableFormats);
+#else
+ // connect the image loader based on the XPM library
+ Image::newImage = boost::bind(&ImageXPM::newImage);
+ Image::loadableFormats = boost::bind(&ImageXPM::loadableFormats);
+#endif
}
}
-// Called by the graphics cache to connect the appropriate frontend
-// image loading routines to the LyX kernel.
-void lyx_gui::init_graphics()
-{
- using namespace grfx;
-
-#ifdef USE_XFORMS_IMAGE_LOADER
- // connect the image loader based on the xforms library
- Image::newImage = boost::bind(&xformsImage::newImage);
- Image::loadableFormats = boost::bind(&xformsImage::loadableFormats);
-#else
- // connect the image loader based on the XPM library
- Image::newImage = boost::bind(&ImageXPM::newImage);
- Image::loadableFormats = boost::bind(&ImageXPM::loadableFormats);
-#endif
-}
-
-
string const lyx_gui::hexname(LColor::color col)
{
string const name = lcolor.getX11Name(col);
+2002-07-12 John Levon <moz@compsoc.man.ac.uk>
+
+ * GraphicsCache.C: remove init_graphics()
+
2002-07-09 Angus Leeming <leeming@lyx.org>
* PreviewLoader.C (setAscentFractions): fix bug due to use of integer
Cache & Cache::get()
{
- static bool start = true;
- if (start) {
- start = false;
- lyx_gui::init_graphics();
- }
-
// Now return the cache
static Cache singleton;
return singleton;