X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c8ef3d5565e6f1c1a23baa3be7d6a7b42151c616..ae901b234c4a0aa7c1777b3bd181dd7f8517ad21:/src/osx/core/hid.cpp?ds=inline diff --git a/src/osx/core/hid.cpp b/src/osx/core/hid.cpp index e9f4cdbaca..7430e714c5 100644 --- a/src/osx/core/hid.cpp +++ b/src/osx/core/hid.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/mac/corefoundation/hid.cpp +// Name: src/osx/corefoundation/hid.cpp // Purpose: DARWIN HID layer for WX Implementation // Author: Ryan Norton // Modified by: @@ -376,7 +376,7 @@ bool wxHIDDevice::IsActive(int nIndex) // ---------------------------------------------------------------------------- bool wxHIDDevice::HasElement(int nIndex) { - return m_pCookies[nIndex] != NULL; + return (void*) m_pCookies[nIndex] != NULL; } // ---------------------------------------------------------------------------- @@ -651,6 +651,7 @@ class wxHIDModule : public wxModule { for(size_t i = 0; i < sm_keyboards.GetCount(); ++i) delete (wxHIDKeyboard*) sm_keyboards[i]; + sm_keyboards.Clear(); } };