Added wxToggleBitmapButton (it compiles).

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

diff --git a/include/wx/mac/private.h b/include/wx/mac/private.h
index d909c2009bf9c58e90fb3617c528247843c32821..97c0680bcf393c9250006de9ce9f752c1509fa81 100644 (file)
--- a/include/wx/mac/private.h
+++ b/include/wx/mac/private.h
@@ -161,6 +161,16 @@ 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
 
 class wxMacCFStringHolder                                                             
@@ -172,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 )                                                   
@@ -189,14 +199,7 @@ public:
     { 
        Release() ;
     }                                           
-      
-    wxMacCFStringHolder& operator=(const wxString& str)                               
-    {                                                                       
-        Release() ;                                                        
-               Assign( str ) ;
-        return *this;                                                       
-    }                                                                       
-             
+
     CFStringRef Detach()
     {
        CFStringRef retval = m_cfs ;
@@ -212,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 ;                                                        
@@ -224,5 +228,11 @@ private:
 
 #endif
 
+
+
+wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ;
+wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ;
+
+
 #endif
     // _WX_PRIVATE_H_