mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 21:21:32 +00:00
Remove another #ifdef block.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5828 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
1ca904ccbd
commit
e6daca367f
@ -1,5 +1,7 @@
|
||||
2002-12-16 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* XPainter.C: missed a #ifdef USE_XFORMS_IMAGE_LOADER.
|
||||
|
||||
* FormPreferences.C:
|
||||
* forms/form_preferences.fd: remove override_x_deadkeys stuff.
|
||||
|
||||
|
@ -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<grfx::xformsImage const &>(i);
|
||||
#else
|
||||
grfx::ImageXPM const & image = static_cast<grfx::ImageXPM const &>(i);
|
||||
#endif
|
||||
grfx::xformsImage const & image =
|
||||
static_cast<grfx::xformsImage const &>(i);
|
||||
|
||||
XGCValues val;
|
||||
val.function = GXcopy;
|
||||
|
Loading…
Reference in New Issue
Block a user