X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..04b2b47a4e817fb32a78316b8b50efd0612509b9:/src/generic/accel.cpp diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp index 91c39cd066..0185018d42 100644 --- a/src/generic/accel.cpp +++ b/src/generic/accel.cpp @@ -94,8 +94,8 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[] const wxAcceleratorEntry& entry = entries[i]; int keycode = entry.GetKeyCode(); - if ( isascii(keycode) ) - keycode = toupper(keycode); + if ( wxIsascii(keycode) ) + keycode = wxToupper(keycode); M_ACCELDATA->m_accels.Append(new wxAcceleratorEntry(entry.GetFlags(), keycode, @@ -152,7 +152,7 @@ void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry) node = node->GetNext(); } - wxFAIL_MSG(_T("deleting inexistent accel from wxAcceleratorTable")); + wxFAIL_MSG(wxT("deleting inexistent accel from wxAcceleratorTable")); } // ---------------------------------------------------------------------------- @@ -162,7 +162,7 @@ void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry) const wxAcceleratorEntry * wxAcceleratorTable::GetEntry(const wxKeyEvent& event) const { - if ( !Ok() ) + if ( !IsOk() ) { // not an error, the accel table is just empty return NULL;