applying patch 1345435

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2005-11-02 15:22:39 +00:00
parent 6567c540f5
commit ce0d1032d1
3 changed files with 595 additions and 402 deletions

View File

@ -35,7 +35,14 @@
#include <IOKit/hid/IOHIDKeys.h>
#include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
#include <mach/mach.h>
//Darn apple - doesn't properly wrap their headers in extern "C"!
//http://www.macosx.com/forums/archive/index.php/t-68069.html
//Needed for codewarrior link error with mach_port_deallocate()
extern "C" {
#include <mach/mach_port.h>
}
#include <mach/mach.h> //this actually includes mach_port.h (see above)
//Utility wrapper around CFArray
class wxCFArray

View File

@ -111,7 +111,8 @@ bool wxHIDDevice::Create (int nClass, int nType, int nDev)
//Now get the maching services
io_iterator_t pIterator;
wxIOCHECK(IOServiceGetMatchingServices(m_pPort, pDictionary, &pIterator), "No Matching HID Services");
wxASSERT_MSG(pIterator != 0, wxT("No devices found!"));
if(pIterator == 0)
return false; // No devices found
//Now we iterate through them
io_object_t pObject;

File diff suppressed because it is too large Load Diff