compilation fix after incorrectly resolved conflict

[wxWidgets.git] / include / wx / stubs / accel.h

diff --git a/include/wx/stubs/accel.h b/include/wx/stubs/accel.h
index 10e43ef5e879c064b9eb7227a0e7a7d252b75236..ec397374835d2a01e44a58b6de0028662215963b 100644 (file)
--- a/include/wx/stubs/accel.h
+++ b/include/wx/stubs/accel.h
@@ -31,7 +31,7 @@ class WXDLLEXPORT wxAcceleratorTable;
 #define wxACCEL_SHIFT   0x04
 
  // Hold no key down
-#define wxACCEL_NONE    0x00
+#define wxACCEL_NORMAL  0x00
 
 class WXDLLEXPORT wxAcceleratorEntry
 {