anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 13:04:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4656 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-07-16 18:20:12 +00:00
parent b676c4e77d
commit 6f5149f565
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/xforms/ChangeLog
View File

@ -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> 2002-07-16 André Pönitz <poenitz@gmx.net>

9
src/frontends/xforms/XPainter.C
View File

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