On Tuesday 16 July 2002 3:26 pm, R. Lahaye wrote:
> Jean-Marc Lasgouttes wrote:
> > >>>>> "R" == R Lahaye <[EMAIL PROTECTED]> writes:
> >
> > R> I would test that right away, but GraphicsImageXPM.C is badly
> > R> broken in CVS right now. Please fix that first:
> >
> > Try the following patch.
> >
> > grxpm.patchName: grxpm.patch
> > Type: text/x-patch
>
> Nope. Get a little further though, but now it breaks at:
>
>): undefined reference to `grfx::xformsImage::getPixmap(void) const' ***
Well that's just nasty of it. The reason it does this is because of a
static_cast in xforms/XPainter.C.
try this.
A
Index: src/frontends/xforms/XPainter.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/XPainter.C,v
retrieving revision 1.9
diff -u -p -r1.9 XPainter.C
--- src/frontends/xforms/XPainter.C 15 Jul 2002 17:17:56 -0000 1.9
+++ src/frontends/xforms/XPainter.C 16 Jul 2002 14:43:12 -0000
@@ -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(),
