From 8b7ae0e09d99f0d1b7cf417cfe6e82feb286f304 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 1 Oct 2001 13:50:31 +0000 Subject: [PATCH] small tweaks git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2828 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 4 ++++ src/WorkArea.C | 4 ++-- src/insets/ChangeLog | 4 ++++ src/insets/insettabular.C | 4 ++-- src/insets/insettabular.h | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index fce38c357a..1ef04200d2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2001-10-01 Jean-Marc Lasgouttes + + * WorkArea.C (WorkArea): remove unneeded floats in computation + 2001-10-01 Dekel Tsur * buffer.C (asciiParagraph): Treat '\\' as other chars. diff --git a/src/WorkArea.C b/src/WorkArea.C index a63cf71e8c..61dc11e4a8 100644 --- 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 73499fa5f4..2ac91ea1b9 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2001-10-01 Jean-Marc Lasgouttes + + * insettabular.C (deletable): make const + 2001-09-28 Dekel Tsur * insetert.C (latex): Fix the returned value diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index 643d676bb8..2510d179c0 100644 --- 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 82123ab565..10e3950f23 100644 --- 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; /// -- 2.39.2