avoid infinite recursion for richtooltops, (hopefully) fixes #15070

[wxWidgets.git] / interface / wx / cmdproc.h

diff --git a/interface/wx/cmdproc.h b/interface/wx/cmdproc.h
index eda822251c8c058cc32cfe948ffe43e2e1373ac5..5d948d6c27e0a6e4428f2027f2509db0b65cc677 100644 (file)
--- a/interface/wx/cmdproc.h
+++ b/interface/wx/cmdproc.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxCommandProcessor and wxCommand
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxCommandProcessor and wxCommand
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -75,7 +75,7 @@ public:
           know the ordering of Undos; the user can never Undo at an arbitrary
           position in the command history.
         - Restore the entire document state (perhaps using document
           know the ordering of Undos; the user can never Undo at an arbitrary
           position in the command history.
         - Restore the entire document state (perhaps using document

-          transactioning). Potentially very inefficient, but possibly easier to
+          transacting). Potentially very inefficient, but possibly easier to

           code if the user interface and data are complex, and an "inverse
           execute" operation is hard to write. The docview sample uses the
           first method, to remove or restore segments in the drawing.
           code if the user interface and data are complex, and an "inverse
           execute" operation is hard to write. The docview sample uses the
           first method, to remove or restore segments in the drawing.


@@ -126,6 +126,12 @@ public:
     */
     virtual bool CanUndo() const;
 
     */
     virtual bool CanUndo() const;
 

+    /**
+        Returns @true if the currently-active command can be redone, @false
+        otherwise.
+    */
+    virtual bool CanRedo() const;
+

     /**
         Deletes all commands in the list and sets the current command pointer
         to @NULL.
     /**
         Deletes all commands in the list and sets the current command pointer
         to @NULL.


@@ -137,6 +143,11 @@ public:
     */
     wxList& GetCommands();
 
     */
     wxList& GetCommands();
 

+    /**
+        Returns the current command.
+    */
+    wxCommand *GetCurrentCommand() const;
+

     /**
         Returns the edit menu associated with the command processor.
     */
     /**
         Returns the edit menu associated with the command processor.
     */


@@ -235,6 +246,12 @@ public:
     */
     virtual bool Submit(wxCommand* command, bool storeIt = true);
 
     */
     virtual bool Submit(wxCommand* command, bool storeIt = true);
 

+    /**
+        Just store the command without executing it. The command is stored in the
+        history list, and the associated edit menu (if any) updated appropriately.
+    */
+    virtual void Store(wxCommand *command);
+

     /**
         Undoes the last command executed.
     */
     /**
         Undoes the last command executed.
     */