X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1248b41f9f71110347659db8c54c75786eba23c6..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/motif/accel.cpp diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp index 230b9fb6c5..d66f03b8af 100644 --- a/src/motif/accel.cpp +++ b/src/motif/accel.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: accel.cpp +// Name: src/motif/accel.cpp // Purpose: wxAcceleratorTable // Author: Julian Smart // Modified by: @@ -9,27 +9,26 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "accel.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/setup.h" #include "wx/accel.h" -#include "wx/string.h" -#include "wx/utils.h" + +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/utils.h" +#endif + #include IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject) class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData { - friend class WXDLLEXPORT wxAcceleratorTable; + friend class wxAcceleratorTable; public: wxAcceleratorRefData(); - ~wxAcceleratorRefData(); + virtual ~wxAcceleratorRefData(); public: int m_count; @@ -41,19 +40,18 @@ public: wxAcceleratorRefData::wxAcceleratorRefData() { m_count = 0; - m_entries = (wxAcceleratorEntry*) NULL; + m_entries = NULL; } wxAcceleratorRefData::~wxAcceleratorRefData() { - delete[] m_entries; - m_entries = (wxAcceleratorEntry*) NULL; + wxDELETEA(m_entries); m_count = 0; } wxAcceleratorTable::wxAcceleratorTable() { - m_refData = (wxAcceleratorRefData*) NULL; + m_refData = NULL; } wxAcceleratorTable::~wxAcceleratorTable() @@ -81,9 +79,9 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[] } -bool wxAcceleratorTable::Ok() const +bool wxAcceleratorTable::IsOk() const { - return (m_refData != (wxAcceleratorRefData*) NULL); + return (m_refData != NULL); } int wxAcceleratorTable::GetCount() const @@ -109,11 +107,10 @@ bool wxAcceleratorEntry::MatchesEvent(const wxKeyEvent& event) const bool accShiftDown = ((GetFlags() & wxACCEL_SHIFT) == wxACCEL_SHIFT); int accKeyCode = GetKeyCode(); int accKeyCode2 = GetKeyCode(); - if (isascii(accKeyCode2)) - accKeyCode2 = tolower(accKeyCode2); + if (wxIsascii(accKeyCode2)) + accKeyCode2 = wxTolower(accKeyCode2); return ((eventAltDown == accAltDown) && (eventCtrlDown == accCtrlDown) && (eventShiftDown == accShiftDown) && ((eventKeyCode == accKeyCode || eventKeyCode == accKeyCode2))) ; } -