Add an image loader using the xforms library routines and compile it if

[features.git] / src / frontends / qt2 / GUIRunTime.C

diff --git a/src/frontends/qt2/GUIRunTime.C b/src/frontends/qt2/GUIRunTime.C
index 8aecae903dbedf30f09e8d4d97e6a569d543f764..7b9aeab955152647ef5bca4df3b0318f327ebd5f 100644 (file)
--- a/src/frontends/qt2/GUIRunTime.C
+++ b/src/frontends/qt2/GUIRunTime.C
@@ -19,10 +19,17 @@
 #include "XFormsView.h"
 #include "GUIRunTime.h"
 #include "debug.h"
-#include "graphics/GraphicsImageXPM.h"
 
 #include FORMS_H_LOCATION
 
+// For now we use the xforms image loader if we can.
+// In the future, this will be replaced by a Qt equivalent.
+#if defined(HAVE_FLIMAGE_DUP) && defined(HAVE_FLIMAGE_TO_PIXMAP)
+#include "xforms/xformsGImage.h"
+#else
+#include "graphics/GraphicsImageXPM.h"
+#endif
+
 using std::endl;
 
 // For now we need this here as long as we use xforms components!
@@ -91,16 +98,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
 }