From a72387b28775f8fbb27492b35b32708905a4de80 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Fri, 12 Jul 2002 15:14:02 +0000 Subject: [PATCH] Apply that width fudge irrespective of library version. Make it slightly more conservative (add only 2, not 5). Could people test please. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4623 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 6 +++++- src/frontends/xforms/xformsImage.C | 10 +++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 481c365666..d113246a5c 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2002-07-12 Angus Leeming + + * xformsImage.C (width): apply fudge irrespective of library version. + 2002-07-12 John Levon * Toolbar_pimpl.h: @@ -39,7 +43,7 @@ 2002-07-09 Angus Leeming * xformsImage.C (scale): use boost::tie. - (statusCB): fudge to fix bug in image width for xforms <= 0.89.6. + (width): fudge to fix bug in image width for xforms <= 0.89.6. 2002-07-08 Angus Leeming diff --git a/src/frontends/xforms/xformsImage.C b/src/frontends/xforms/xformsImage.C index 785143c6c1..1c18c61336 100644 --- a/src/frontends/xforms/xformsImage.C +++ b/src/frontends/xforms/xformsImage.C @@ -153,13 +153,9 @@ unsigned int xformsImage::getWidth() const if (!image_) return 0; -#if FL_VERSION == 0 && FL_REVISION == 89 && FL_FIXLEVEL <= 6 - // Used to fix a bug in xforms <= 0.89.6 which - // crops the image unnecessarily. - return image_->w + 5; -#else - return image_->w; -#endif + // Why, oh why do we need such hacks? + // Angus 12 July 2002 + return image_->w + 2; } -- 2.39.2