add some #ifdef ugliness to enable the home grown image loader to work too.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4656 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 1d146c2cc0f065168b42541b8111fcf211535d06..fdaec7da48d63f30997debed0ca618199b900a66 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-16  Angus Leeming  <leeming@lyx.org>
+
+       * XPainter.C: add some #ifdef ugliness to enable the home grown image
+       loader to work too.
 
 2002-07-16  André Pönitz <poenitz@gmx.net>
 

diff --git a/src/frontends/xforms/XPainter.C b/src/frontends/xforms/XPainter.C
index 929db4904fb05f64a4f22f109feba1bffbbb9a6f..825f03140c3564e29fb52df1fa1a0d19f5932806 100644 (file)
--- a/src/frontends/xforms/XPainter.C
+++ b/src/frontends/xforms/XPainter.C
@@ -23,7 +23,11 @@
 #include "encoding.h"
 #include "language.h"
 
+#ifdef USE_XFORMS_IMAGE_LOADER
 #include "xformsImage.h"
+#else
+#include "graphics/GraphicsImageXPM.h"
+#endif
 
 #include "support/LAssert.h"
 #include "support/lstrings.h"
@@ -152,7 +156,12 @@ Painter & XPainter::image(int x, int y,
        int w, int h,
        grfx::Image const & i)
 {
+#ifdef USE_XFORMS_IMAGE_LOADER
        grfx::xformsImage const & image = static_cast<grfx::xformsImage const &>(i);
+#else
+       grfx::ImageXPM const & image = static_cast<grfx::ImageXPM const &>(i);
+#endif
+       
        XGCValues val;
        val.function = GXcopy;
        GC gc = XCreateGC(fl_get_display(), owner_.getPixmap(),