small tweaks

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2828 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index fce38c357a3458a597176cddeaaa73f2c57bd1f9..1ef04200d20a0126e60989f1648ff707189f3e75 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-01  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * WorkArea.C (WorkArea): remove unneeded floats in computation
+
 2001-10-01  Dekel Tsur  <dekelts@tau.ac.il>
 
        * buffer.C (asciiParagraph): Treat '\\' as other chars.

diff --git a/src/WorkArea.C b/src/WorkArea.C
index a63cf71e8c6d59ccfd08e5de9189aa66e3bfc060..61dc11e4a8b0eae3c5a834ef74ffa9b86efbaa0d 100644 (file)
--- a/src/WorkArea.C
+++ b/src/WorkArea.C
@@ -134,8 +134,8 @@ WorkArea::WorkArea(int xpos, int ypos, int width, int height)
        if (!splash_file.empty()) {
                int const splash_w = 425;
                int const splash_h = 290;
-               int const splash_x = xpos + 0.5 * (width - 15 - splash_w);
-               int const splash_y = ypos + 0.5 * (height - splash_h);
+               int const splash_x = xpos + (width - 15 - splash_w) / 2;
+               int const splash_y = ypos + (height - splash_h) / 2;
                splash_ = obj =
                        fl_add_pixmapbutton(FL_NORMAL_BUTTON,
                                            splash_x, splash_y, 

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 73499fa5f453b5ae25c853c8c78514bab3990a04..2ac91ea1b907b88d782fb770391e08a900e4e8be 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-01  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * insettabular.C (deletable): make const
+
 2001-09-28  Dekel Tsur  <dekelts@tau.ac.il>
 
        * insetert.C (latex): Fix the returned value

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 643d676bb8a9dfd59fa964a764e950c49c9208d6..2510d179c07314cb2705880c45515509a4fae819 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -1034,7 +1034,7 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action,
                        int cols = 1;
                        int rows = 1;
                        int maxCols = 1;
-                       unsigned int len = clip.length();
+                       string::size_type len = clip.length();
                        string::size_type p = 0;
 
                        while(p < len &&
@@ -1529,7 +1529,7 @@ bool InsetTabular::movePrevCell(BufferView * bv, bool lock)
 }
 
 
-bool InsetTabular::deletable()
+bool InsetTabular::deletable() const
 {
        return true;
 }

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index 82123ab565ba6ca62454c2a95b129e2854f57502..10e3950f23e5532a7f043d397c66f784920654f4 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -259,7 +259,7 @@ private:
        ///
        bool movePrevCell(BufferView *, bool lock = false);
        ///
-       bool deletable();
+       bool deletable() const;
        ///
        int getCellXPos(int cell) const;
        ///