Include wx/menuitem.h according to precompiled headers of wx/wx.h (with other minor...

[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 428e5c8c14164a758391ecfd85765ae55b3da7fd..5e9f2ffc2642390af9feccfed48b74846a1ca1ad 100644 (file)
--- 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__