X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0836924e6bd51814473ec9036d7bb853a8f15803..fd8278bfe1019d2fb15aa45167b6d2d2821f779c:/src/mac/carbon/hid.cpp

diff --git a/src/mac/carbon/hid.cpp b/src/mac/carbon/hid.cpp
index 927341fff0..3dec1a481e 100644
--- a/src/mac/carbon/hid.cpp
+++ b/src/mac/carbon/hid.cpp
@@ -9,7 +9,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/defs.h"
+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "hid.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
 
 //DARWIN _ONLY_
 #ifdef __DARWIN__
@@ -18,6 +35,11 @@
 #include "wx/string.h"
 #include "wx/log.h"
 
+
+// ---------------------------------------------------------------------------
+// assertion macros
+// ---------------------------------------------------------------------------
+
 #define wxFORCECHECK_MSG(arg, msg)  \
 {\
 	if (arg) \
@@ -57,6 +79,9 @@ void CFShowTypeIDDescription(CFTypeRef pData)
 // implementation
 // ============================================================================
 
+// ---------------------------------------------------------------------------
+// wxHIDDevice
+// ---------------------------------------------------------------------------
 
 bool wxHIDDevice::Create (const int& nClass, const int& nType)
 {
@@ -93,11 +118,11 @@ bool wxHIDDevice::Create (const int& nClass, const int& nType)
 	//Now get the maching services
 	io_iterator_t pIterator;
 	wxIOCHECK(IOServiceGetMatchingServices(m_pPort, pDictionary, &pIterator), "No Matching HID Services");
-	wxASSERT(pIterator != NULL);
+	wxASSERT(pIterator != 0);
 
 	//Now we iterate through them
 	io_object_t pObject;
-	while ( (pObject = IOIteratorNext(pIterator)) != NULL)
+	while ( (pObject = IOIteratorNext(pIterator)) != 0)
 	{
 		wxVERIFY(IORegistryEntryCreateCFProperties(pObject, &pDictionary,
 											kCFAllocatorDefault, kNilOptions) == KERN_SUCCESS);
@@ -208,6 +233,10 @@ wxHIDDevice::~wxHIDDevice()
 	}
 }
 
+// ---------------------------------------------------------------------------
+// wxHIDKeyboard
+// ---------------------------------------------------------------------------
+
 enum
 {
 	WXK_RSHIFT = 400,