X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ecff18117f8cabc0f515ad81aa4ad265e5e17d3..e6f918647e6b446cb15e022847985abf6de3efd0:/src/generic/accel.cpp diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp index f31532caa6..29893831fe 100644 --- a/src/generic/accel.cpp +++ b/src/generic/accel.cpp @@ -107,7 +107,7 @@ wxAcceleratorTable::~wxAcceleratorTable() { } -bool wxAcceleratorTable::Ok() const +bool wxAcceleratorTable::IsOk() const { return m_refData != NULL; } @@ -138,8 +138,8 @@ void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry) const wxAcceleratorEntry *entryCur = node->GetData(); // given entry contains only the information of the accelerator key - // because it was set that way in wxGetAccelFromString() - // so do not perform full ( *entryCur == entry ) comparison + // because it was set that way during creation so do not use the + // comparison operator which also checks the command field if ((entryCur->GetKeyCode() == entry.GetKeyCode()) && (entryCur->GetFlags() == entry.GetFlags())) { @@ -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")); } // ----------------------------------------------------------------------------