anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-24 09:04:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove another #ifdef block.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5828 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-12-16 18:21:06 +00:00
parent 1ca904ccbd
commit e6daca367f
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/xforms/ChangeLog
View File

@ -1,5 +1,7 @@
2002-12-16 Angus Leeming <leeming@lyx.org> 2002-12-16 Angus Leeming <leeming@lyx.org>
* XPainter.C: missed a #ifdef USE_XFORMS_IMAGE_LOADER.
* FormPreferences.C: * FormPreferences.C:
* forms/form_preferences.fd: remove override_x_deadkeys stuff. * forms/form_preferences.fd: remove override_x_deadkeys stuff.

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

@ -25,11 +25,7 @@
#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"
@ -158,11 +154,8 @@ 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 =
grfx::xformsImage const & image = static_cast<grfx::xformsImage const &>(i); 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;