X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d61f7200331a1cd1a3b2353292e6801511ccbc5d..acc476c530e1730d9202b404ec0b0b87ae44ced6:/src/generic/accel.cpp diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp index 3bc6df37be..e19d33c09f 100644 --- a/src/generic/accel.cpp +++ b/src/generic/accel.cpp @@ -16,10 +16,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "accel.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -44,7 +40,7 @@ WX_DECLARE_LIST(wxAcceleratorEntry, wxAccelList); #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxAccelList); +WX_DEFINE_LIST(wxAccelList) // ---------------------------------------------------------------------------- // wxAccelRefData: the data used by wxAcceleratorTable @@ -97,7 +93,9 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[] { const wxAcceleratorEntry& entry = entries[i]; - int keycode = wxToupper(entry.GetKeyCode()); + int keycode = entry.GetKeyCode(); + if ( isascii(keycode) ) + keycode = toupper(keycode); M_ACCELDATA->m_accels.Append(new wxAcceleratorEntry(entry.GetFlags(), keycode,