X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69ea41a788381b93135a583f546112c1e1345447..25466131acbbca2186d01fb852d61f50ba968fb4:/include/wx/mac/corefoundation/cfstring.h

diff --git a/include/wx/mac/corefoundation/cfstring.h b/include/wx/mac/corefoundation/cfstring.h
index 428e5c8c14..5e9f2ffc26 100644
--- a/include/wx/mac/corefoundation/cfstring.h
+++ b/include/wx/mac/corefoundation/cfstring.h
@@ -9,12 +9,19 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef __WX_CFSTRINGHOLDER_H__
+#define __WX_CFSTRINGHOLDER_H__
+
 #ifdef __DARWIN__
     #include <CoreFoundation/CFString.h>
 #else
     #include <CFString.h>
 #endif
 
+#include "wx/fontenc.h"
+
+class WXDLLIMPEXP_BASE wxString;
+
 void wxMacConvertNewlines13To10( char * data ) ;
 void wxMacConvertNewlines10To13( char * data ) ;
 void wxMacConvertNewlines13To10( wxString *data ) ;
@@ -70,7 +77,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 +88,4 @@ private:
     DECLARE_NO_COPY_CLASS( wxMacCFStringHolder )
 } ;
 
+#endif //__WXCFSTRINGHOLDER_H__