Fix history in wxWebViewIE when using a custom file scheme.

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

diff --git a/src/common/accelcmn.cpp b/src/common/accelcmn.cpp
index 5df35dc39f3122043117d111d12298c48bb12b3a..f52fc05de373665b0de60a270557c4ecc8051693 100644 (file)
--- a/src/common/accelcmn.cpp
+++ b/src/common/accelcmn.cpp
@@ -26,13 +26,15 @@
 #if wxUSE_ACCEL
 
 #ifndef WX_PRECOMP
 #if wxUSE_ACCEL
 
 #ifndef WX_PRECOMP

+    #include "wx/accel.h"

     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"

-    #include "wx/accel.h"

     #include "wx/crt.h"
 #endif //WX_PRECOMP
 
     #include "wx/crt.h"
 #endif //WX_PRECOMP
 

+wxAcceleratorTable wxNullAcceleratorTable;
+

 // ============================================================================
 // wxAcceleratorEntry implementation
 // ============================================================================
 // ============================================================================
 // wxAcceleratorEntry implementation
 // ============================================================================


@@ -305,7 +307,7 @@ wxString wxAcceleratorEntry::ToString() const
     int flags = GetFlags();
     if ( flags & wxACCEL_ALT )
         text += _("Alt+");
     int flags = GetFlags();
     if ( flags & wxACCEL_ALT )
         text += _("Alt+");

-    if ( flags & wxACCEL_CTRL )
+    if ( flags & (wxACCEL_CTRL | wxACCEL_CMD) )

         text += _("Ctrl+");
     if ( flags & wxACCEL_SHIFT )
         text += _("Shift+");
         text += _("Ctrl+");
     if ( flags & wxACCEL_SHIFT )
         text += _("Shift+");