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

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 481c36566667572fe9647b619aec7235861beb89..d113246a5ccd019a706ed136e9e25f5c7a6174f4 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-12  Angus Leeming  <leeming@lyx.org>
+
+       * xformsImage.C (width): apply fudge irrespective of library version.
+
 2002-07-12  John Levon  <moz@compsoc.man.ac.uk>
 
        * Toolbar_pimpl.h:
@@ -39,7 +43,7 @@
 2002-07-09  Angus Leeming  <leeming@lyx.org>
 
        * 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  <leeming@lyx.org>
 

diff --git a/src/frontends/xforms/xformsImage.C b/src/frontends/xforms/xformsImage.C
index 785143c6c11e9f40acc438839ac4cb4bc1310402..1c18c6133638b774e1522ed3112ec34b8cf4dd43 100644 (file)
--- 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;
 }