X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ba6a836246ee6768c29d50adfe9fee30221da8e..b9d495a007b846a1f6813ba3ca465c81c6e3047b:/src/mac/classic/accel.cpp?ds=sidebyside diff --git a/src/mac/classic/accel.cpp b/src/mac/classic/accel.cpp index ce99c542e6..89bb4336a0 100644 --- a/src/mac/classic/accel.cpp +++ b/src/mac/classic/accel.cpp @@ -12,7 +12,10 @@ #include "wx/wxprec.h" #include "wx/accel.h" -#include "wx/string.h" + +#ifndef WX_PRECOMP + #include "wx/string.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject) @@ -33,7 +36,7 @@ class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData friend class WXDLLEXPORT wxAcceleratorTable; public: wxAcceleratorRefData(); - ~wxAcceleratorRefData(); + virtual ~wxAcceleratorRefData(); wxAccelList m_accels; }; @@ -47,7 +50,7 @@ wxAcceleratorRefData::wxAcceleratorRefData() wxAcceleratorRefData::~wxAcceleratorRefData() { - m_accels.DeleteContents( TRUE ); + m_accels.DeleteContents( true ); } wxAcceleratorTable::wxAcceleratorTable() @@ -74,7 +77,7 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[] } } -bool wxAcceleratorTable::Ok() const +bool wxAcceleratorTable::IsOk() const { return (m_refData != NULL); }