From 6f5149f565dbb59f408cb3c2dbe15a8c92e85966 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Tue, 16 Jul 2002 18:20:12 +0000 Subject: [PATCH] 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 --- src/frontends/xforms/ChangeLog | 4 ++++ src/frontends/xforms/XPainter.C | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 1d146c2cc0..fdaec7da48 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2002-07-16 Angus Leeming + + * XPainter.C: add some #ifdef ugliness to enable the home grown image + loader to work too. 2002-07-16 André Pönitz diff --git a/src/frontends/xforms/XPainter.C b/src/frontends/xforms/XPainter.C index 929db4904f..825f03140c 100644 --- 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(i); +#else + grfx::ImageXPM const & image = static_cast(i); +#endif + XGCValues val; val.function = GXcopy; GC gc = XCreateGC(fl_get_display(), owner_.getPixmap(), -- 2.39.2