font-encodings additions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-02-08 06:19:37 +00:00
parent 1d1ed4087d
commit af3aefcf06
2 changed files with 15 additions and 22 deletions

View File

@@ -182,11 +182,11 @@ public:
m_release = false ;
}
wxMacCFStringHolder(const wxString &str)
wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding )
{
m_cfs = NULL ;
m_release = false ;
Assign( str ) ;
Assign( str , encoding ) ;
}
wxMacCFStringHolder(CFStringRef ref , bool release = true )
@@ -199,14 +199,7 @@ public:
{
Release() ;
}
wxMacCFStringHolder& operator=(const wxString& str)
{
Release() ;
Assign( str ) ;
return *this;
}
CFStringRef Detach()
{
CFStringRef retval = m_cfs ;
@@ -222,11 +215,12 @@ public:
m_cfs = NULL ;
}
void Assign( const wxString &str , wxFontEncoding encoding ) ;
operator CFStringRef () { return m_cfs; }
wxString AsString() ;
wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
private:
void Assign( const wxString &str ) ;
CFStringRef m_cfs;
bool m_release ;