Moved wxCFStringHolder and some other string functions to their own files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-29 18:29:35 +00:00
parent 9004ba6af3
commit 5185263fc5
4 changed files with 781 additions and 743 deletions
--- a/include/wx/mac/corefoundation/cfstring.h
+++ b/include/wx/mac/corefoundation/cfstring.h
@@ -0,0 +1,84 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/mac/corefoundation/cfstring.h
+// Purpose:     wxMacCFStringHolder and other string functions
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     2004-10-29 (from code in wx/mac/carbon/private.h)
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __DARWIN__
+    #include <CoreFoundation/CFString.h>
+#else
+    #include <CFString.h>
+#endif
+
+void wxMacConvertNewlines13To10( char * data ) ;
+void wxMacConvertNewlines10To13( char * data ) ;
+void wxMacConvertNewlines13To10( wxString *data ) ;
+void wxMacConvertNewlines10To13( wxString *data ) ;
+
+#if wxUSE_UNICODE
+void wxMacConvertNewlines13To10( wxChar * data ) ;
+void wxMacConvertNewlines10To13( wxChar * data ) ;
+#endif
+
+wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ;
+wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ;
+void wxMacWakeUp() ;
+
+class wxMacCFStringHolder
+{
+public:
+    wxMacCFStringHolder()
+    {
+        m_cfs = NULL ;
+        m_release = false ;
+    }
+
+    wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding )
+    {
+        m_cfs = NULL ;
+        m_release = false ;
+        Assign( str , encoding ) ;
+    }
+
+    wxMacCFStringHolder(CFStringRef ref , bool release = true )
+    {
+        m_cfs = ref ;
+        m_release = release ;
+    }
+
+    ~wxMacCFStringHolder()
+    {
+        Release() ;
+    }
+
+    CFStringRef Detach()
+    {
+        CFStringRef retval = m_cfs ;
+        m_release = false ;
+        m_cfs = NULL ;
+        return retval ;
+    }
+
+    void Release()
+    {
+        if ( m_release && m_cfs)
+            CFRelease( m_cfs ) ;
+        m_cfs = NULL ;
+    }
+
+    void Assign( const wxString &str , wxFontEncoding encoding ) ;
+
+    operator CFStringRef () { return m_cfs; }
+    wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
+
+private:
+
+    CFStringRef m_cfs;
+    bool m_release ;
+} ;
+