From 7d23c29dee2c768875ecf15e03174a53aa135476 Mon Sep 17 00:00:00 2001 From: John Levon Date: Thu, 8 Aug 2002 21:08:02 +0000 Subject: [PATCH] small cleanups. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4910 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferView2.C | 51 +++++++++++++++++++++-------------------------- src/ChangeLog | 7 +++++++ src/lyxfind.C | 1 + src/lyxfind.h | 2 +- 4 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/BufferView2.C b/src/BufferView2.C index f09e7bfeb8..8edb8e76cb 100644 --- a/src/BufferView2.C +++ b/src/BufferView2.C @@ -336,40 +336,35 @@ bool BufferView::gotoLabel(string const & label) void BufferView::menuUndo() { - if (available()) { - owner()->message(_("Undo")); - hideCursor(); - beforeChange(text); - update(text, BufferView::SELECT|BufferView::FITCUR); - if (!textUndo(this)) - owner()->message(_("No further undo information")); - else - update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); - switchKeyMap(); - } + if (!available()) + return; + + owner()->message(_("Undo")); + hideCursor(); + beforeChange(text); + update(text, BufferView::SELECT|BufferView::FITCUR); + if (!textUndo(this)) + owner()->message(_("No further undo information")); + else + update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); + switchKeyMap(); } void BufferView::menuRedo() { -#if 0 // this should not be here (Jug 20011206) - if (theLockingInset()) { - owner()->message(_("Redo not yet supported in math mode")); + if (!available()) return; - } -#endif - - if (available()) { - owner()->message(_("Redo")); - hideCursor(); - beforeChange(text); - update(text, BufferView::SELECT|BufferView::FITCUR); - if (!textRedo(this)) - owner()->message(_("No further redo information")); - else - update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); - switchKeyMap(); - } + + owner()->message(_("Redo")); + hideCursor(); + beforeChange(text); + update(text, BufferView::SELECT|BufferView::FITCUR); + if (!textRedo(this)) + owner()->message(_("No further redo information")); + else + update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); + switchKeyMap(); } diff --git a/src/ChangeLog b/src/ChangeLog index 23ef87f288..7cf6b7b4d3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2002-08-08 John Levon + + * BufferView2.C: small cleanup + + * lyxfind.h: + * lyxfind.C: move unnecessary header into the .C + 2002-08-08 John Levon * funcrequest.h: just tedious nonsense diff --git a/src/lyxfind.C b/src/lyxfind.C index de0857924f..597df35b6a 100644 --- a/src/lyxfind.C +++ b/src/lyxfind.C @@ -6,6 +6,7 @@ #include "lyxtext.h" #include "lyxfind.h" +#include "paragraph.h" #include "frontends/LyXView.h" #include "frontends/Alert.h" #include "support/textutils.h" diff --git a/src/lyxfind.h b/src/lyxfind.h index 4a211e1be4..f86b8dec85 100644 --- a/src/lyxfind.h +++ b/src/lyxfind.h @@ -7,9 +7,9 @@ #endif #include "LString.h" -#include "paragraph.h" class BufferView; +class LyXText; namespace lyxfind { -- 2.39.2