Fixe the toggle selection bug I introduced.

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

diff --git a/ChangeLog b/ChangeLog
index 3f211e4b8303707e18c81888f51bd214b6678a2d..033daeb56dabd55b82dfa03e9107e8810c07c464 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-11  Juergen Vigna  <jug@sad.it>
+
+       * src/screen.C (ToggleSelection): fixed toggle selection bug as
+       the bool param should not be last.
+
 2000-07-10  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * sigc++/configure.in: fix bug in threading-related code (Yes, I

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 56ef2d368d938922f6e79373ed512f0bc321e245..292fcbc8ccf0bc3654f17be51e4e5c748e7c6778 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -296,7 +296,7 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
     } else {
        locked = false;
        if (need_update == CURSOR) {
-           bv->screen()->ToggleSelection(TEXT(bv), y, x, true);
+           bv->screen()->ToggleSelection(TEXT(bv), true, y, x);
            TEXT(bv)->ClearSelection();
            TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
        }

diff --git a/src/lyxscreen.h b/src/lyxscreen.h
index 16de9b3dfc2a1808d25342a67519a00f88cea7ad..26e695533f3bdff053cb6a42300f9cf6e75d4b42 100644 (file)
--- a/src/lyxscreen.h
+++ b/src/lyxscreen.h
@@ -69,8 +69,8 @@ public:
        /// returns 1 if first has changed, otherwise 0
        bool FitManualCursor(LyXText *, long, long, int, int);
        ///
-       void ToggleSelection(LyXText *, int y_offset = 0, int x_offset = 0,
-                            bool = true);
+       void ToggleSelection(LyXText *, bool = true, int y_offset = 0,
+                            int x_offset = 0);
        ///
        void ToggleToggle(LyXText *, int y_offset = 0, int x_offset = 0);
        

diff --git a/src/screen.C b/src/screen.C
index f4ffa0c391256324cd93dcc4555766d4e56142eb..beaf52d6694bf3abbee663586fef914a89045bf9 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -425,8 +425,8 @@ void LyXScreen::Update(LyXText * text, int y_offset, int x_offset)
 }
 
 
-void LyXScreen::ToggleSelection(LyXText * text,  int y_offset, int x_offset,
-                               bool kill_selection)
+void LyXScreen::ToggleSelection(LyXText * text,  bool kill_selection,
+                               int y_offset, int x_offset)
 {
        // only if there is a selection
        if (!text->selection) return;