Reduced unnecessary painting; delete/recreate caret as WIN32 requires

[wxWidgets.git] / include / wx / mac / corefoundation / hid.h

diff --git a/include/wx/mac/corefoundation/hid.h b/include/wx/mac/corefoundation/hid.h
index 6ea4535f3a084ab085f43d2c13957dc3e9ffb51c..33b01d54df3cdfecc3f3f5a7d9de5693cce8f19f 100644 (file)
--- a/include/wx/mac/corefoundation/hid.h
+++ b/include/wx/mac/corefoundation/hid.h
@@ -19,10 +19,6 @@
 #ifndef _WX_MACCARBONHID_H_
 #define _WX_MACCARBONHID_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "hid.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/string.h"
 
@@ -41,7 +37,16 @@
 
 #include <mach/mach.h>
 
-#include "wx/mac/corefoundation/cfwrappers.h"
+//Utility wrapper around CFArray
+class wxCFArray
+{
+public:
+       wxCFArray(CFTypeRef pData) : pArray((CFArrayRef) pData) {}
+       CFTypeRef operator [] (const int& nIndex) {return CFArrayGetValueAtIndex(pArray, nIndex); }
+       int Count() {return CFArrayGetCount(pArray);}
+private:
+       CFArrayRef pArray;
+};
 
 //
 //     A wrapper around OS X HID Manager procedures.