applied patch 890642: wxRE_ADVANCED flag and docs

[wxWidgets.git] / include / wx / mac / private.h

diff --git a/include/wx/mac/private.h b/include/wx/mac/private.h
index a27786e53ccb9cd87e8cf0220350fe5bced9837e..97c0680bcf393c9250006de9ce9f752c1509fa81 100644 (file)
--- a/include/wx/mac/private.h
+++ b/include/wx/mac/private.h
@@ -5,10 +5,10 @@
 //              with "wx".
 // Author:      Stefan Csomor
 // Modified by:
 //              with "wx".
 // Author:      Stefan Csomor
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRIVATE_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRIVATE_H_


@@ -33,6 +33,8 @@
     #error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
 #endif
 
     #error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
 #endif
 

+#if wxUSE_GUI
+

 #include "wx/window.h"
 
 class wxMacPortStateHelper 
 #include "wx/window.h"
 
 class wxMacPortStateHelper 


@@ -50,14 +52,14 @@ public:
     GrafPtr GetCurrentPort() { return m_currentPort ; }
 
 private:
     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 ;
     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
 } ;
 
 class WXDLLEXPORT wxMacPortSetter


@@ -107,9 +109,12 @@ private:
 // app.h
 bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) ;
 
 // app.h
 bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) ;
 

+#endif // wxUSE_GUI
+

 // filefn.h
 WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
 WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ;
 // 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 ) ;
 #  ifndef __DARWIN__
 // Mac file names are POSIX (Unix style) under Darwin, so these are not needed
 WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ;


@@ -123,12 +128,14 @@ WXDLLEXPORT wxString wxMacFindFolder(short vRefNum,
                                      OSType folderType,
                                      Boolean createFolder);
 
                                      OSType folderType,
                                      Boolean createFolder);
 

-GWorldPtr          wxMacCreateGWorld( int width , int height , int depth ) ;
-void                   wxMacDestroyGWorld( GWorldPtr gw ) ;
-PicHandle          wxMacCreatePict( GWorldPtr gw , GWorldPtr mask = NULL ) ;
+#if wxUSE_GUI
+
+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  ) ;
 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)))
 void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 ) ;
 
 #define MAC_WXCOLORREF(a) (*((RGBColor*)&(a)))


@@ -142,17 +149,89 @@ void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bi
 #define MAC_WXPOINTPTR(a) ((Point*)a)
 #define MAC_WXHMENU(a) ((MenuHandle)a)
 
 #define MAC_WXPOINTPTR(a) ((Point*)a)
 #define MAC_WXHMENU(a) ((MenuHandle)a)
 

-// string conversions / 
+#endif // wxUSE_GUI
+
+//---------------------------------------------------------------------------
+// wxMac string conversions
+//---------------------------------------------------------------------------
+
+void wxMacSetupConverters() ;
+void wxMacCleanupConverters() ;
+
+void wxMacStringToPascal( const wxString&from , StringPtr to ) ;
+wxString wxMacMakeStringFromPascal( ConstStringPtr from ) ;
+
+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

 
 #if TARGET_CARBON
 
 #if TARGET_CARBON

-// converts this string into a carbon foundation string with optional pc 2 mac encoding
-CFStringRef wxMacCreateCFString( 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 ) ; }
+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 ;                                                        
+} ;
+
+#endif
+
+

 
 

-#endif //TARGET_CARBON
+wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ;
+wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ;

 
 
 #endif
 
 
 #endif