X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..b867ed682da3e66894e748628ff95cdba68023bc:/include/wx/mac/private.h diff --git a/include/wx/mac/private.h b/include/wx/mac/private.h index c9315e988d..2f2c4c6345 100644 --- a/include/wx/mac/private.h +++ b/include/wx/mac/private.h @@ -8,7 +8,7 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_PRIVATE_H_ @@ -50,14 +50,14 @@ public: GrafPtr GetCurrentPort() { return m_currentPort ; } private: - GrafPtr m_currentPort ; - GrafPtr m_oldPort ; - RgnHandle m_clip ; + GrafPtr m_currentPort ; + GrafPtr m_oldPort ; + RgnHandle m_clip ; ThemeDrawingState m_drawingState ; - short m_textFont ; - short m_textSize ; - short m_textStyle ; - short m_textMode ; + short m_textFont ; + short m_textSize ; + short m_textStyle ; + short m_textMode ; } ; class WXDLLEXPORT wxMacPortSetter @@ -110,6 +110,7 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) ; // filefn.h WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ; WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ; +WXDLLEXPORT void wxMacFilename2FSSpec( const wxChar *path , FSSpec *spec ) ; # ifndef __DARWIN__ // Mac file names are POSIX (Unix style) under Darwin, so these are not needed WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ; @@ -123,12 +124,12 @@ WXDLLEXPORT wxString wxMacFindFolder(short vRefNum, OSType folderType, Boolean createFolder); -GWorldPtr wxMacCreateGWorld( int width , int height , int depth ) ; -void wxMacDestroyGWorld( GWorldPtr gw ) ; -PicHandle wxMacCreatePict( GWorldPtr gw , GWorldPtr mask = NULL ) ; +GWorldPtr wxMacCreateGWorld( int width , int height , int depth ) ; +void wxMacDestroyGWorld( GWorldPtr gw ) ; +PicHandle wxMacCreatePict( GWorldPtr gw , GWorldPtr mask = NULL ) ; CIconHandle wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth , short iconSize ) ; -void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green , int blue ) ; -CTabHandle wxMacCreateColorTable( int numColors ) ; +void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green , int blue ) ; +CTabHandle wxMacCreateColorTable( int numColors ) ; void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 ) ; #define MAC_WXCOLORREF(a) (*((RGBColor*)&(a))) @@ -146,15 +147,106 @@ void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bi // wxMac string conversions //--------------------------------------------------------------------------- +void wxMacSetupConverters() ; +void wxMacCleanupConverters() ; + +void wxMacStringToPascal( const wxString&from , StringPtr to ) ; +wxString wxMacMakeStringFromPascal( ConstStringPtr from ) ; + +wxCharBuffer wxMacStringToCString( const wxString &from ) ; +wxWCharBuffer wxMacStringToWString( const wxString &from ) ; +wxString wxMacMakeStringFromCString( const char * from , int len ) ; +wxString wxMacMakeStringFromCString( const char * from ) ; + +#if TARGET_CARBON + +class wxMacCFStringHolder +{ +public: + wxMacCFStringHolder() + { + m_cfs = NULL ; + m_release = false ; + } + + wxMacCFStringHolder(const wxString &str) + { + m_cfs = NULL ; + m_release = false ; + Assign( str ) ; + } + + wxMacCFStringHolder(CFStringRef ref , bool release = true ) + { + m_cfs = ref ; + m_release = release ; + } + + ~wxMacCFStringHolder() + { + Release() ; + } + + wxMacCFStringHolder& operator=(const wxString& str) + { + Release() ; + Assign( str ) ; + return *this; + } + + 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 ; + } + + operator CFStringRef () { return m_cfs; } + wxString AsString() ; + +private: + void Assign( const wxString &str ) ; + + CFStringRef m_cfs; + bool m_release ; +} ; + +// CFStringRef wxMacStringToCFString( const wxString &str ) ; +// wxString wxMacMakeStringFromCFString( CFStringRef cf ) ; +#endif + +#if 0 + void wxMacConvertToPC( const char *from , char *to , int len ) ; void wxMacConvertFromPC( const char *from , char *to , int len ) ; void wxMacConvertToPC( const char *from , char *to , int len ) ; +wxString wxMacMakeMacStringFromPC( const wxChar * p ) ; + +wxString wxMacMakePCStringFromMac( const wxChar * p ) ; + + +// converts this c string into a wxString with optional mac 2 pc encoding +wxString wxMacMakeStringFromMacString( const wxChar* from , bool mac2pcEncoding ) ; + +// converts this c string into a wxString with pc 2 mac encoding if s_macDefaultEncodingIsPC +inline wxString wxMacMakeStringFromMacString( const wxChar* from ) + { return wxMacMakeStringFromMacString( from , wxApp::s_macDefaultEncodingIsPC ) ; } + +#if wxUSE_UNICODE + wxString wxMacMakeMacStringFromPC( const char * p ) ; wxString wxMacMakePCStringFromMac( const char * p ) ; - // converts this c string into a wxString with optional mac 2 pc encoding wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding ) ; @@ -162,20 +254,22 @@ wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding ) inline wxString wxMacMakeStringFromMacString( const char* from ) { return wxMacMakeStringFromMacString( from , wxApp::s_macDefaultEncodingIsPC ) ; } +#endif + // converts this c string into a wxString with pc 2 mac encoding if s_macDefaultEncodingIsPC inline wxString wxMacMakeStringFromMacString( const wxString& from ) { return wxApp::s_macDefaultEncodingIsPC ? - wxMacMakeStringFromMacString( from.c_str() , true ) : from ; } + wxMacMakeStringFromMacString( from.c_str() , true ) : from ; } // // Pascal Strings // // converts this string into a pascal with optional pc 2 mac encoding -void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding ) ; +void wxMacStringToPascal( const wxChar * from , StringPtr to , bool pc2macEncoding ) ; // converts this string into a pascal with pc 2 mac encoding if s_macDefaultEncodingIsPC -inline void wxMacStringToPascal( const char * from , StringPtr to ) +inline void wxMacStringToPascal( const wxChar * from , StringPtr to ) { wxMacStringToPascal( from , to , wxApp::s_macDefaultEncodingIsPC ) ; } // converts this string into a pascal with optional mac 2 pc encoding @@ -191,14 +285,15 @@ inline wxString wxMacMakeStringFromPascal( ConstStringPtr from ) #if TARGET_CARBON // converts this string into a carbon foundation string with optional pc 2 mac encoding -CFStringRef wxMacCreateCFString( const wxString &str , bool pc2macEncoding ) ; +CFStringRef wxMacStringToCFString( const wxString &str , bool pc2macEncoding ) ; // converts this string into a carbon foundation string with optional pc 2 mac encoding -inline CFStringRef wxMacCreateCFString( const wxString &str ) - { return wxMacCreateCFString( str , wxApp::s_macDefaultEncodingIsPC ) ; } +inline CFStringRef wxMacStringToCFString( const wxString &str ) + { return wxMacStringToCFString( str , wxApp::s_macDefaultEncodingIsPC ) ; } #endif //TARGET_CARBON +#endif #endif // _WX_PRIVATE_H_