From e6daca367f143855f9c583a84f6947561db97eb1 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Mon, 16 Dec 2002 18:21:06 +0000 Subject: [PATCH] Remove another #ifdef block. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5828 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 2 ++ src/frontends/xforms/XPainter.C | 11 ++--------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 9d0208e01e..e9940bc905 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,5 +1,7 @@ 2002-12-16 Angus Leeming + * 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 db0e736bfb..7315eb0b18 100644 --- 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(i); -#else - grfx::ImageXPM const & image = static_cast(i); -#endif + grfx::xformsImage const & image = + static_cast(i); XGCValues val; val.function = GXcopy; -- 2.39.2