remove error message from wxCSConv initialization: there is no easy way to suppress...

[wxWidgets.git] / src / osx / core / hid.cpp

diff --git a/src/osx/core/hid.cpp b/src/osx/core/hid.cpp
index e9f4cdbacaeeb78352aceb1b6a3b2383521d59a5..7430e714c581493a8bdd038fd627768586084446 100644 (file)
--- 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(); 
         }
 };