Remove another #ifdef block.

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

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 9d0208e01ee272fa6268cfbd024062580322823f..e9940bc9050f75b5bc32654d9a45ae0330983e85 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,5 +1,7 @@
 2002-12-16  Angus Leeming  <leeming@lyx.org>
 
+       * XPainter.C: missed a #ifdef USE_XFORMS_IMAGE_LOADER.
+
        * FormPreferences.C: 
        * forms/form_preferences.fd: remove override_x_deadkeys stuff.
 

diff --git a/src/frontends/xforms/XPainter.C b/src/frontends/xforms/XPainter.C
index db0e736bfbdee9bb8d463fe35ae6476f7fca7e36..7315eb0b18343938ba2aa27b9e6e73dbb976bdc5 100644 (file)
--- a/src/frontends/xforms/XPainter.C
+++ b/src/frontends/xforms/XPainter.C
@@ -25,11 +25,7 @@
 #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"
@@ -158,11 +154,8 @@ 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
+       grfx::xformsImage const & image =
+               static_cast<grfx::xformsImage const &>(i);
 
        XGCValues val;
        val.function = GXcopy;