wxTheColourDatabase->Find() can fail.

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

diff --git a/include/wx/mac/corefoundation/cfstring.h b/include/wx/mac/corefoundation/cfstring.h
index 23e2f8d75b809436bbd547444c01f829fa891754..526f5791a52b23595617ab10570f38cc983b23d6 100644 (file)
--- a/include/wx/mac/corefoundation/cfstring.h
+++ b/include/wx/mac/corefoundation/cfstring.h
@@ -9,6 +9,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef __WX_CFSTRINGHOLDER_H__
+#define __WX_CFSTRINGHOLDER_H__
+
 #ifdef __DARWIN__
     #include <CoreFoundation/CFString.h>
 #else
@@ -32,23 +35,20 @@ void wxMacWakeUp() ;
 class wxMacCFStringHolder
 {
 public:
-    wxMacCFStringHolder()
+    wxMacCFStringHolder() 
+        : m_cfs(NULL) , m_release(false) 
     {
-        m_cfs = NULL ;
-        m_release = false ;
     }
 
     wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding )
+        : m_cfs(NULL) , m_release(false) 
     {
-        m_cfs = NULL ;
-        m_release = false ;
         Assign( str , encoding ) ;
     }
 
     wxMacCFStringHolder(CFStringRef ref , bool release = true )
+        : m_cfs(ref) , m_release(release) 
     {
-        m_cfs = ref ;
-        m_release = release ;
     }
 
     ~wxMacCFStringHolder()
@@ -73,12 +73,15 @@ public:
 
     void Assign( const wxString &str , wxFontEncoding encoding ) ;
 
-    operator CFStringRef () { return m_cfs; }
+    operator CFStringRef () const { return m_cfs; }
     wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
 
 private:
 
     CFStringRef m_cfs;
     bool m_release ;
+    
+    DECLARE_NO_COPY_CLASS( wxMacCFStringHolder )
 } ;
 
+#endif //__WXCFSTRINGHOLDER_H__