From 52ecdce716bbb2852fd0a3a3d0cabbe208244087 Mon Sep 17 00:00:00 2001 From: Allan Rae Date: Wed, 28 Nov 2001 06:56:59 +0000 Subject: [PATCH] make g++ happy about variable declaration git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3099 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 5 +++++ src/text.C | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8f1b003f6f..e34672c7bd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2001-11-28 Allan Rae + + * text.C (paintLastRow): g++-2.95.3 and others don't like variable + declaration & definition that looks like a function declaration. + 2001-11-27 Jean-Marc Lasgouttes * BufferView2.C (copy): diff --git a/src/text.C b/src/text.C index 35b770839c..3732c0c416 100644 --- a/src/text.C +++ b/src/text.C @@ -3402,9 +3402,10 @@ void LyXText::paintLastRow(DrawRowParams & p) y_bottom -= 3 * defaultHeight(); } else if (parparams.spaceBottom().kind() == VSpace::LENGTH) { - string str(string(_("Space below")) + " (" + string str = string(_("Space below")) + + " (" + parparams.spaceBottom().asLyXCommand() - + ")"); + + ")"; int const space = int(parparams.spaceBottom().inPixels(p.bv)); int const y = p.yo + y_bottom - space / 2;