Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

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

diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h
index faa053dc8974514b23f13cf249825f69e787e324..3b09e400bdcaa6f78dce111524730d9aea84d652 100644 (file)
--- a/include/wx/cmdproc.h
+++ b/include/wx/cmdproc.h
@@ -87,6 +87,13 @@ public:
     int GetMaxCommands() const { return m_maxNoCommands; }
     virtual void ClearCommands();
 
     int GetMaxCommands() const { return m_maxNoCommands; }
     virtual void ClearCommands();
 

+    // By default, the accelerators are "\tCtrl+Z" and "\tCtrl+Y"
+    const wxString& GetUndoAccelerator() const { return m_undoAccelerator; }
+    const wxString& GetRedoAccelerator() const { return m_redoAccelerator; }
+
+    void SetUndoAccelerator(const wxString& accel) { m_undoAccelerator = accel; }
+    void SetRedoAccelerator(const wxString& accel) { m_redoAccelerator = accel; }
+

 protected:
     // for further flexibility, command processor doesn't call wxCommand::Do()
     // and Undo() directly but uses these functions which can be overridden in
 protected:
     // for further flexibility, command processor doesn't call wxCommand::Do()
     // and Undo() directly but uses these functions which can be overridden in


@@ -102,6 +109,9 @@ protected:
     wxMenu*       m_commandEditMenu;
 #endif // wxUSE_MENUS
 
     wxMenu*       m_commandEditMenu;
 #endif // wxUSE_MENUS
 

+    wxString      m_undoAccelerator;
+    wxString      m_redoAccelerator;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxCommandProcessor)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxCommandProcessor)
 };