revert some stuff for 1.6

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2005-04-18 22:51:52 +00:00
parent a03b8b0472
commit 2a32f1733d
6 changed files with 43 additions and 1110 deletions

View File

@@ -9,9 +9,6 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_CFSTRINGHOLDER_H__
#define __WX_CFSTRINGHOLDER_H__
#ifdef __DARWIN__
#include <CoreFoundation/CFString.h>
#else
@@ -73,7 +70,7 @@ public:
void Assign( const wxString &str , wxFontEncoding encoding ) ;
operator CFStringRef () const { return m_cfs; }
operator CFStringRef () { return m_cfs; }
wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
private:
@@ -84,4 +81,3 @@ private:
DECLARE_NO_COPY_CLASS( wxMacCFStringHolder )
} ;
#endif //__WXCFSTRINGHOLDER_H__