X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/44ee9ed83b553c6f228bdacd2aa151fd1dad0b30..9118a24f5263c271c0b36049ba1a1b82c1763f25:/src/osx/core/hid.cpp diff --git a/src/osx/core/hid.cpp b/src/osx/core/hid.cpp index 7430e714c5..87098dfd72 100644 --- a/src/osx/core/hid.cpp +++ b/src/osx/core/hid.cpp @@ -78,7 +78,7 @@ bool wxHIDDevice::Create (int nClass, int nType, int nDev) CFMutableDictionaryRef pDictionary = IOServiceMatching(kIOHIDDeviceKey); if(pDictionary == NULL) { - wxLogSysError( _T("IOServiceMatching(kIOHIDDeviceKey) failed") ); + wxLogSysError( wxT("IOServiceMatching(kIOHIDDeviceKey) failed") ); return false; } @@ -103,7 +103,7 @@ bool wxHIDDevice::Create (int nClass, int nType, int nDev) if( IOServiceGetMatchingServices(m_pPort, pDictionary, &pIterator) != kIOReturnSuccess ) { - wxLogSysError(_T("No Matching HID Services")); + wxLogSysError(wxT("No Matching HID Services")); return false; } @@ -129,7 +129,7 @@ bool wxHIDDevice::Create (int nClass, int nType, int nDev) kNilOptions ) != KERN_SUCCESS ) { - wxLogDebug(_T("IORegistryEntryCreateCFProperties failed")); + wxLogDebug(wxT("IORegistryEntryCreateCFProperties failed")); } // @@ -193,7 +193,9 @@ bool wxHIDDevice::Create (int nClass, int nType, int nDev) //open the HID interface... if ( (*m_ppDevice)->open(m_ppDevice, 0) != S_OK ) - wxLogDebug(_T("HID device: open failed")); + { + wxLogDebug(wxT("HID device: open failed")); + } // //Now the hard part - in order to scan things we need "cookies" @@ -240,7 +242,7 @@ size_t wxHIDDevice::GetCount (int nClass, int nType) CFMutableDictionaryRef pDictionary = IOServiceMatching(kIOHIDDeviceKey); if(pDictionary == NULL) { - wxLogSysError( _T("IOServiceMatching(kIOHIDDeviceKey) failed") ); + wxLogSysError( wxT("IOServiceMatching(kIOHIDDeviceKey) failed") ); return false; } @@ -265,7 +267,7 @@ size_t wxHIDDevice::GetCount (int nClass, int nType) if( IOServiceGetMatchingServices(pPort, pDictionary, &pIterator) != kIOReturnSuccess ) { - wxLogSysError(_T("No Matching HID Services")); + wxLogSysError(wxT("No Matching HID Services")); return false; } @@ -316,7 +318,9 @@ void wxHIDDevice::AddCookieInQueue(CFTypeRef Data, int i) //3rd Param flags (none yet) AddCookie(Data, i); if ( (*m_ppQueue)->addElement(m_ppQueue, m_pCookies[i], 0) != S_OK ) - wxLogDebug(_T("HID device: adding element failed")); + { + wxLogDebug(wxT("HID device: adding element failed")); + } } // ---------------------------------------------------------------------------- @@ -333,14 +337,14 @@ void wxHIDDevice::InitCookies(size_t dwSize, bool bQueue) m_ppQueue = (*m_ppDevice)->allocQueue(m_ppDevice); if ( !m_ppQueue ) { - wxLogDebug(_T("HID device: allocQueue failed")); + wxLogDebug(wxT("HID device: allocQueue failed")); return; } //Param 2, flags, none yet if ( (*m_ppQueue)->create(m_ppQueue, 0, 512) != S_OK ) { - wxLogDebug(_T("HID device: create failed")); + wxLogDebug(wxT("HID device: create failed")); } } @@ -651,7 +655,7 @@ class wxHIDModule : public wxModule { for(size_t i = 0; i < sm_keyboards.GetCount(); ++i) delete (wxHIDKeyboard*) sm_keyboards[i]; - sm_keyboards.Clear(); + sm_keyboards.Clear(); } };