X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FUndo.h;h=70897bfa28fe336f21d428b27ea62c4708bed3af;hb=0120c3fc10f1f1cc062f0c2a445fcee5d336d9f3;hp=95514ab0b259a1e5685a1cbe4362301b7cff4bc4;hpb=32148586a85518d9c368e807a32a9be54146136f;p=lyx.git

diff --git a/src/Undo.h b/src/Undo.h
index 95514ab0b2..70897bfa28 100644
--- a/src/Undo.h
+++ b/src/Undo.h
@@ -47,6 +47,9 @@ enum UndoKind {
 
 class Undo
 {
+	/// noncopyable
+	Undo(Undo const &);
+	void operator=(Undo const &);
 public:
 
 	Undo(Buffer &);
@@ -80,12 +83,19 @@ public:
 	 *  a single step. This means you can add a group whenever you are not sure.
 	 */
 	void beginUndoGroup();
-
+	/// open a new group as above and specify a cursor to set as cur_before
+	/// of the group's undo elements.
+	/**
+	 * This cursor takes precedence over what is passed to recordUndo.
+	 * In the case of nested groups, only the first cur_before is
+	 * taken into account. The cursor is reset at the end of the
+	 * top-level group.
+	 */
+	void beginUndoGroup(CursorData const & cur_before);
 	/// end the current undo group.
 	void endUndoGroup();
-
 	/// end the current undo group and set UndoElement::cur_after if necessary.
-	void endUndoGroup(CursorData const &);
+	void endUndoGroup(CursorData const & cur_after);
 
 	/// The general case: record undo information for an arbitrary range.
 	/**
@@ -117,6 +127,34 @@ private:
 };
 
 
+/** Helper class to simplify the use of undo groups across several buffers.
+ *
+ *  The undo group is created when the object is instanciated; it is
+ *  then ended as the object goes out of scope or the buffer is reset
+ *  (see below)
+ */
+class UndoGroupHelper {
+public:
+	UndoGroupHelper(Buffer * buf = 0) : buffer_(0)
+	{
+		resetBuffer(buf);
+	}
+
+	~UndoGroupHelper()
+	{
+		resetBuffer(0);
+	}
+
+	/** Close the current undo group if necessary and create a new one
+	 * for buffer \c buf.
+	 */
+	void resetBuffer(Buffer * buf);
+
+private:
+	Buffer * buffer_;
+};
+
+
 
 } // namespace lyx