fixing comments, making sure sound always gets the completion call in the same thread...

[wxWidgets.git] / src / common / cmdproc.cpp

diff --git a/src/common/cmdproc.cpp b/src/common/cmdproc.cpp
index a5ddc7bed15fcfacc79a3f9952311fc42b8b2bcb..2ab9be0b0d8e0a480b366d4a2b392d4d8d79945e 100644 (file)
--- a/src/common/cmdproc.cpp
+++ b/src/common/cmdproc.cpp
@@ -28,6 +28,7 @@
     #include "wx/intl.h"
     #include "wx/string.h"
     #include "wx/menu.h"
+    #include "wx/accel.h"
 #endif //WX_PRECOMP
 
 #include "wx/cmdproc.h"
@@ -59,8 +60,8 @@ wxCommandProcessor::wxCommandProcessor(int maxCommands)
 #if wxUSE_MENUS
     m_commandEditMenu = NULL;
 #endif // wxUSE_MENUS
-    m_undoAccelerator = wxT("\tCtrl+Z");
-    m_redoAccelerator = wxT("\tCtrl+Y");
+    m_undoAccelerator = '\t' + wxAcceleratorEntry(wxACCEL_CTRL, 'Z').ToString();
+    m_redoAccelerator = '\t' + wxAcceleratorEntry(wxACCEL_CTRL, 'Y').ToString();
 
     m_lastSavedCommand =
     m_currentCommand = wxList::compatibility_iterator();
@@ -86,7 +87,7 @@ bool wxCommandProcessor::UndoCommand(wxCommand& cmd)
 // storeIt is false.
 bool wxCommandProcessor::Submit(wxCommand *command, bool storeIt)
 {
-    wxCHECK_MSG( command, false, _T("no command in wxCommandProcessor::Submit") );
+    wxCHECK_MSG( command, false, wxT("no command in wxCommandProcessor::Submit") );
 
     if ( !DoCommand(*command) )
     {
@@ -106,7 +107,7 @@ bool wxCommandProcessor::Submit(wxCommand *command, bool storeIt)
 
 void wxCommandProcessor::Store(wxCommand *command)
 {
-    wxCHECK_RET( command, _T("no command in wxCommandProcessor::Store") );
+    wxCHECK_RET( command, wxT("no command in wxCommandProcessor::Store") );
 
     if ( (int)m_commands.GetCount() == m_maxNoCommands )
     {