X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fgnome%2FGUIRunTime.C;h=ccd1d48d8dba25142a98b2e449f48cbfcdddc672;hb=3e39bef2c13125023f3b72532d90575bbe307335;hp=b69ee4fa00a1df82333929d3585a3a7d900c2d46;hpb=356caadd6d4135f044f82cd77dc5bbca4257f458;p=lyx.git

diff --git a/src/frontends/gnome/GUIRunTime.C b/src/frontends/gnome/GUIRunTime.C
index b69ee4fa00..ccd1d48d8d 100644
--- a/src/frontends/gnome/GUIRunTime.C
+++ b/src/frontends/gnome/GUIRunTime.C
@@ -1,8 +1,8 @@
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- * 	 
+ *
  *           Copyright 2000 The LyX Team.
  *
  *======================================================*/
@@ -21,7 +21,13 @@
 #include <gnome--/main.h>
 #include <glade/glade.h>
 
+// For now we use the xforms image loader if we can.
+// In the future, this will be replaced by a gnome equivalent.
+#if defined(HAVE_FLIMAGE_DUP) && defined(HAVE_FLIMAGE_TO_PIXMAP)
+#include "xforms/xformsGImage.h"
+#else
 #include "graphics/GraphicsImageXPM.h"
+#endif
 
 using std::endl;
 
@@ -79,7 +85,7 @@ int GUIRunTime::initApplication(int &, char * argv[])
 	return 0;
 }
 
-void GUIRunTime::processEvents() 
+void GUIRunTime::processEvents()
 {
 	while (Gnome::Main::instance()->events_pending())
 		Gnome::Main::instance()->iteration(FALSE);
@@ -130,16 +136,22 @@ LyXView * GUIRunTime::createMainView(int w, int h)
 }
 
 
-// Called bu the graphics cache to connect the approriate frontend
+// Called by the graphics cache to connect the appropriate frontend
 // image loading routines to the LyX kernel.
 void GUIRunTime::initialiseGraphics()
 {
 	using namespace grfx;
 	using SigC::slot;
-    
+
+#if defined(HAVE_FLIMAGE_DUP) && defined(HAVE_FLIMAGE_TO_PIXMAP)
+	// connect the image loader based on the xforms library
+	GImage::newImage.connect(slot(&xformsGImage::newImage));
+	GImage::loadableFormats.connect(slot(&xformsGImage::loadableFormats));
+#else
 	// connect the image loader based on the XPM library
 	GImage::newImage.connect(slot(&GImageXPM::newImage));
 	GImage::loadableFormats.connect(slot(&GImageXPM::loadableFormats));
+#endif
 }