///////////////////////////////////////////////////////////////////////////////
-// 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
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "accel.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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"
WX_DECLARE_LIST(wxAcceleratorEntry, wxAccelList);
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxAccelList);
+WX_DEFINE_LIST(wxAccelList)
// ----------------------------------------------------------------------------
// wxAccelRefData: the data used by wxAcceleratorTable
class wxAccelRefData : public wxObjectRefData
{
public:
- wxAccelRefData() { m_accels.DeleteContents(TRUE); }
+ wxAccelRefData()
+ {
+ }
+
+ wxAccelRefData(const wxAccelRefData& data)
+ : wxObjectRefData()
+ {
+ m_accels = data.m_accels;
+ }
+
+ virtual ~wxAccelRefData()
+ {
+ WX_CLEAR_LIST(wxAccelList, m_accels);
+ }
wxAccelList m_accels;
};
// macro which can be used to access wxAccelRefData from wxAcceleratorTable
#define M_ACCELDATA ((wxAccelRefData *)m_refData)
+
// ============================================================================
// implementation
// ============================================================================
{
}
-wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[])
+wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
{
m_refData = new wxAccelRefData;
const wxAcceleratorEntry& entry = entries[i];
int keycode = entry.GetKeyCode();
- if ( wxIslower(keycode) )
- keycode = wxToupper(keycode);
+ if ( isascii(keycode) )
+ keycode = toupper(keycode);
M_ACCELDATA->m_accels.Append(new wxAcceleratorEntry(entry.GetFlags(),
keycode,
void wxAcceleratorTable::Add(const wxAcceleratorEntry& entry)
{
+ AllocExclusive();
+
if ( !m_refData )
{
m_refData = new wxAccelRefData;
void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry)
{
- wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst();
+ AllocExclusive();
+
+ 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;
}
return entry ? entry->GetCommand() : -1;
}
-#endif // wxUSE_ACCEL
+wxObjectRefData *wxAcceleratorTable::CreateRefData() const
+{
+ return new wxAccelRefData;
+}
+wxObjectRefData *wxAcceleratorTable::CloneRefData(const wxObjectRefData *data) const
+{
+ return new wxAccelRefData(*(wxAccelRefData *)data);
+}
+
+#endif // wxUSE_ACCEL