Merge in from trunk r68684 - r69046

[wxWidgets.git] / include / wx / osx / core / cfref.h

diff --git a/include/wx/osx/core/cfref.h b/include/wx/osx/core/cfref.h
index cb4f6364986b02f800125a951d35a03f73a41e9c..404c099fa5b1bf2c035bdd867eef022f3e4c545a 100644 (file)
--- a/include/wx/osx/core/cfref.h
+++ b/include/wx/osx/core/cfref.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/corefoundation/cfref.h
+// Name:        wx/osx/core/cfref.h
 // Purpose:     wxCFRef template class
 // Author:      David Elliott <dfe@cox.net>
 // Modified by: Stefan Csomor
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 // Notes:       See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFMemoryMgmt/index.html
 /////////////////////////////////////////////////////////////////////////////
-/*! @header     wx/mac/corefoundation/cfref.h
+/*! @header     wx/osx/core/cfref.h
     @abstract   wxCFRef template class
     @discussion FIXME: Convert doc tags to something less buggy with C++
 */
@@ -172,7 +172,7 @@ public:
         @param p        The raw pointer to assume ownership of.  May be NULL.
         @discussion Like shared_ptr, it is assumed that the caller has a strong reference to p and intends
                     to transfer ownership of that reference to this ref holder.  If the object comes from
-                    a Create or Copy method then this is the correct behavior.  If the object comes from
+                    a Create or Copy method then this is the correct behaviour.  If the object comes from
                     a Get method then you must CFRetain it yourself before passing it to this constructor.
                     A handy way to do this is to use the non-member wxCFRefFromGet factory funcion.
                     This method is templated and takes an otherType *p.  This prevents implicit conversion
@@ -364,7 +364,7 @@ inline wxCFWeakRef<refType> static_cfref_cast(const wxCFRef<otherRefType> &other
 }
 
 /*! @function   CFRelease
-    @abstract   Overloads CFRelease so that the user is warned of bad behavior.
+    @abstract   Overloads CFRelease so that the user is warned of bad behaviour.
     @discussion It is rarely appropriate to retain or release a wxCFRef.  If one absolutely
                 must do it he can explicitly get() the raw pointer
                 Normally, this function is unimplemented resulting in a linker error if used.
@@ -373,7 +373,7 @@ template <class T>
 inline void CFRelease(const wxCFRef<T*> & cfref) DEPRECATED_ATTRIBUTE;
 
 /*! @function   CFRetain
-    @abstract   Overloads CFRetain so that the user is warned of bad behavior.
+    @abstract   Overloads CFRetain so that the user is warned of bad behaviour.
     @discussion It is rarely appropriate to retain or release a wxCFRef.  If one absolutely
                 must do it he can explicitly get() the raw pointer
                 Normally, this function is unimplemented resulting in a linker error if used.