X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c03c8bed161882eb2ddbfa147fb5655fe75748d..77c1fa98ce364fb1c2b31a82bdd04f3a0ab75424:/src/generic/accel.cpp diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp index e19d33c09f..91c39cd066 100644 --- a/src/generic/accel.cpp +++ b/src/generic/accel.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: generic/accel.cpp +// Name: src/generic/accel.cpp // Purpose: generic implementation of wxAcceleratorTable class // Author: Robert Roebling // Modified: VZ pn 31.05.01: use typed lists, Unicode cleanup, Add/Remove @@ -26,8 +26,8 @@ #if wxUSE_ACCEL #ifndef WX_PRECOMP - #include "wx/event.h" #include "wx/list.h" + #include "wx/event.h" #endif // WX_PRECOMP #include "wx/accel.h" @@ -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())) { @@ -218,4 +218,3 @@ wxObjectRefData *wxAcceleratorTable::CloneRefData(const wxObjectRefData *data) c } #endif // wxUSE_ACCEL -