- Link against qt-mt333.lib which is what the current qt3 cvs produces

[lyx.git] / src / rowpainter.C

diff --git a/src/rowpainter.C b/src/rowpainter.C
index c1cecb6351d256d12250b48b64f6f9fab0fc4092..7a6ec164f962514334b432ff9d391a2b15a82629 100644 (file)
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -509,13 +509,15 @@ void RowPainter::paintFirst()
                        // the top.
                        if (layout->counter == "chapter") {
                                if (buffer.params().secnumdepth >= 0) {
-                                       float spacing_val = 1.0;
+                                       double spacing_val = 1.0;
                                        if (!parparams.spacing().isDefault()) {
                                                spacing_val = parparams.spacing().getValue();
                                        } else {
                                                spacing_val = buffer.params().spacing().getValue();
                                        }
-#warning Look is this correct?                                 
+#ifdef WITH_WARNINGS
+#warning Look is this correct?
+#endif
                                        int const labeladdon = int(font_metrics::maxHeight(font) * layout->spacing.getValue() * spacing_val);
 
                                        int const maxdesc = int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val)
@@ -550,7 +552,7 @@ void RowPainter::paintFirst()
                LyXFont font = getLabelFont();
                if (!par_.getLabelstring().empty()) {
                        string const str = par_.getLabelstring();
-                       float spacing_val = 1.0;
+                       double spacing_val = 1.0;
                        if (!parparams.spacing().isDefault()) {
                                spacing_val = parparams.spacing().getValue();
                        } else {
@@ -662,7 +664,7 @@ void RowPainter::paintText()
                // if we reach the end of a struck out range, paint it
                // we also don't paint across things like tables
                if (running_strikeout && (highly_editable_inset || !is_struckout)) {
-                       // FIXME this should take real text height into account, not 
+                       // FIXME this should take real text height into account, not
                        // the whole row including padding whitespace
                        //int const middle = yo_ + (- row_.ascent() + row_.top_of_text()) / 2;
                        int const middle = yo_ - row_.ascent() / 2;
@@ -733,7 +735,7 @@ void paintPar
        static NullPainter nop;
        static PainterInfo nullpi(pi.base.bv, nop);
        int const ww = pi.base.bv->workHeight();
-       
+
        Paragraph & par = text.paragraphs()[pit];
 
        RowList::iterator const rb = par.rows().begin();
@@ -746,7 +748,7 @@ void paintPar
                bool const inside = (y + rit->descent() >= 0
                                       && y - rit->ascent() < ww);
                RowPainter rp(inside ? pi : nullpi, text, pit, *rit, x, y);
-                       
+
                y += rit->descent();
                rp.paintAppendix();
                rp.paintDepthBar();
@@ -783,7 +785,7 @@ void paintText(BufferView const & bv, ViewMetricsInfo const & vi)
                paintPar(pi, *bv.text(), pit, 0, yy);
                yy += text->getPar(pit).descent();
        }
-       
+
 
        // paint one paragraph above and one below
        if (vi.p1 > 0) {