// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "accel.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
WX_DECLARE_LIST(wxAcceleratorEntry, wxAccelList);
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxAccelList);
+WX_DEFINE_LIST(wxAccelList)
// ----------------------------------------------------------------------------
// wxAccelRefData: the data used by wxAcceleratorTable
public:
wxAccelRefData()
{
- m_accels.DeleteContents(TRUE);
}
wxAccelRefData(const wxAccelRefData& data)
: wxObjectRefData()
{
- m_accels.DeleteContents(TRUE);
m_accels = data.m_accels;
}
+ virtual ~wxAccelRefData()
+ {
+ WX_CLEAR_LIST(wxAccelList, m_accels);
+ }
+
wxAccelList m_accels;
};
{
const wxAcceleratorEntry& entry = entries[i];
- int keycode = entry.GetKeyCode();
- if ( wxIslower(keycode) )
- keycode = wxToupper(keycode);
+ int keycode = wxToupper(entry.GetKeyCode());
M_ACCELDATA->m_accels.Append(new wxAcceleratorEntry(entry.GetFlags(),
keycode,
{
AllocExclusive();
- wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst();
+ wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst();
while ( node )
{
const wxAcceleratorEntry *entryCur = node->GetData();
- if ( *entryCur == entry )
+ // 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
+ if ((entryCur->GetKeyCode() == entry.GetKeyCode()) &&
+ (entryCur->GetFlags() == entry.GetFlags()))
{
- M_ACCELDATA->m_accels.DeleteNode(node);
+ delete node->GetData();
+ M_ACCELDATA->m_accels.Erase(node);
return;
}
return NULL;
}
- wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst();
+ wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst();
while ( node )
{
const wxAcceleratorEntry *entry = node->GetData();
// now check flags
if ( (((flags & wxACCEL_CTRL) != 0) == event.ControlDown()) &&
(((flags & wxACCEL_SHIFT) != 0) == event.ShiftDown()) &&
- (((flags & wxACCEL_ALT) != 0) ==
- (event.AltDown() || event.MetaDown())) )
+ (((flags & wxACCEL_ALT) != 0) == event.AltDown()) )
{
return entry;
}