X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec758a20a2b166b2073e1c902cc745db01290f02..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/gtk/accel.cpp diff --git a/src/gtk/accel.cpp b/src/gtk/accel.cpp index 3a3d479635..c398e19e4c 100644 --- a/src/gtk/accel.cpp +++ b/src/gtk/accel.cpp @@ -2,9 +2,9 @@ // Name: accel.cpp // Purpose: // Author: Robert Roebling -// Id: $id$ +// Id: $id:$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -13,6 +13,8 @@ #include "wx/accel.h" +#if wxUSE_ACCEL + #include //----------------------------------------------------------------------------- @@ -22,13 +24,12 @@ class wxAccelRefData: public wxObjectRefData { public: - - wxAccelRefData(void); - + wxAccelRefData(); + wxList m_accels; }; -wxAccelRefData::wxAccelRefData(void) +wxAccelRefData::wxAccelRefData() { m_accels.DeleteContents( TRUE ); } @@ -38,7 +39,7 @@ wxAccelRefData::wxAccelRefData(void) #define M_ACCELDATA ((wxAccelRefData *)m_refData) IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable,wxObject) - + wxAcceleratorTable::wxAcceleratorTable() { } @@ -46,7 +47,7 @@ wxAcceleratorTable::wxAcceleratorTable() wxAcceleratorTable::wxAcceleratorTable( int n, wxAcceleratorEntry entries[] ) { m_refData = new wxAccelRefData(); - + for (int i = 0; i < n; i++) { int flag = entries[i].GetFlags(); @@ -78,12 +79,13 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event ) (((entry->GetFlags() & wxACCEL_CTRL) == 0) || event.ControlDown()) && (((entry->GetFlags() & wxACCEL_SHIFT) == 0) || event.ShiftDown()) && (((entry->GetFlags() & wxACCEL_ALT) == 0) || event.AltDown() || event.MetaDown())) - { + { return entry->GetCommand(); - } + } node = node->Next(); } - + return -1; } +#endif