From: Ryan Norton <wxprojects@comcast.net>
Date: Thu, 21 Apr 2005 23:35:02 +0000 (+0000)
Subject: my cvs dir got screwed up and didn't commit this...
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ac7f7b51da8ce61a373a698856d1dad19ca9395e?ds=inline

my cvs dir got screwed up and didn't commit this...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/mac/corefoundation/cfstring.h b/include/wx/mac/corefoundation/cfstring.h
index 428e5c8c14..526f5791a5 100644
--- 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
@@ -70,7 +73,7 @@ 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:
@@ -81,3 +84,4 @@ private:
     DECLARE_NO_COPY_CLASS( wxMacCFStringHolder )
 } ;
 
+#endif //__WXCFSTRINGHOLDER_H__