add default value for the encoding parameter of wxMacCFStringHolder() instead of passing wxLocale::GetSystemEncoding() which doesn't work when wxUSE_INTL == 0 to it in many places (replaces 2nd part of patch 1501724)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-07-24 18:01:39 +00:00
parent b9eb3d9de6
commit a8d69700fc
4 changed files with 57 additions and 57 deletions

View File

@@ -39,19 +39,20 @@ void wxMacWakeUp() ;
class wxMacCFStringHolder
{
public:
wxMacCFStringHolder()
: m_cfs(NULL) , m_release(false)
wxMacCFStringHolder()
: m_cfs(NULL) , m_release(false)
{
}
wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding )
: m_cfs(NULL) , m_release(false)
wxMacCFStringHolder(const wxString &str,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
: m_cfs(NULL) , m_release(false)
{
Assign( str , encoding ) ;
}
wxMacCFStringHolder(CFStringRef ref , bool release = true )
: m_cfs(ref) , m_release(release)
: m_cfs(ref) , m_release(release)
{
}
@@ -75,7 +76,8 @@ public:
m_cfs = NULL ;
}
void Assign( const wxString &str , wxFontEncoding encoding ) ;
void Assign(const wxString &str,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
operator CFStringRef () const { return m_cfs; }
wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
@@ -84,7 +86,7 @@ private:
CFStringRef m_cfs;
bool m_release ;
DECLARE_NO_COPY_CLASS( wxMacCFStringHolder )
} ;
@@ -94,13 +96,13 @@ class wxMacUniCharBuffer
{
public :
wxMacUniCharBuffer( const wxString &str ) ;
~wxMacUniCharBuffer() ;
UniChar* GetBuffer() ;
UniCharCount GetChars() ;
private :
UniChar* m_ubuf ;
UniCharCount m_chars ;