X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f74a73b36509260f612770de2caeb084f1857e08..7f65743f005572f1de2754ba8c5e7cf1eed1847e:/src/common/accelcmn.cpp?ds=sidebyside diff --git a/src/common/accelcmn.cpp b/src/common/accelcmn.cpp index 85eb8d75d8..9d5898177b 100644 --- a/src/common/accelcmn.cpp +++ b/src/common/accelcmn.cpp @@ -30,6 +30,7 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/accel.h" + #include "wx/crt.h" #endif //WX_PRECOMP // ============================================================================ @@ -39,7 +40,7 @@ static const struct wxKeyName { wxKeyCode code; - const wxChar *name; + const char *name; } wxKeyNames[] = { { WXK_DELETE, wxTRANSLATE("DEL") }, @@ -113,7 +114,7 @@ static const struct wxKeyName // // as accels can be either translated or not, check for both possibilities and // also compare case-insensitively as the key names case doesn't count -static inline bool CompareAccelString(const wxString& str, const wxChar *accel) +static inline bool CompareAccelString(const wxString& str, const char *accel) { return str.CmpNoCase(accel) == 0 #if wxUSE_INTL @@ -127,7 +128,7 @@ static inline bool CompareAccelString(const wxString& str, const wxChar *accel) // // first and last parameter specify the valid domain for "number" part static int IsNumberedAccelKey(const wxString& str, - const wxChar *prefix, + const char *prefix, wxKeyCode prefixCode, unsigned first, unsigned last)