X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/489468feaa08b8f504735eecca522fb8d0f825d2..ae901b234c4a0aa7c1777b3bd181dd7f8517ad21:/src/osx/core/hid.cpp

diff --git a/src/osx/core/hid.cpp b/src/osx/core/hid.cpp
index fb9a4d051d..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:
@@ -27,7 +27,7 @@
 //DARWIN _ONLY_
 #ifdef __DARWIN__
 
-#include "wx/mac/corefoundation/hid.h"
+#include "wx/osx/core/hid.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
@@ -37,7 +37,7 @@
     #include "wx/module.h"
 #endif
 
-#include "wx/mac/corefoundation/cfstring.h"
+#include "wx/osx/core/cfstring.h"
 
 // ============================================================================
 // implementation
@@ -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(); 
         }
 };