Fix some compilation and linking errors in samples.

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

diff --git a/include/wx/mac/private.h b/include/wx/mac/private.h
index a27786e53ccb9cd87e8cf0220350fe5bced9837e..5ebbdf1857703ee62fbfbc0a8fe3905231a436b9 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,18 +149,159 @@ 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 ) ;
+
+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 ) ;
+
+// converts this c string into a wxString with pc 2 mac encoding if s_macDefaultEncodingIsPC
+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 ; }
+
+// 
+// Pascal Strings
+//
+
+// converts this string into a pascal with optional pc 2 mac encoding
+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 wxChar * from , StringPtr to ) 
+  { wxMacStringToPascal( from , to , wxApp::s_macDefaultEncodingIsPC ) ; }
+
+// converts this string into a pascal with optional mac 2 pc encoding
+wxString wxMacMakeStringFromPascal( ConstStringPtr from , bool mac2pcEncoding ) ;
+
+// converts this pascal string into a wxString with pc 2 mac encoding if s_macDefaultEncodingIsPC
+inline wxString wxMacMakeStringFromPascal( ConstStringPtr from  ) 
+  { return wxMacMakeStringFromPascal( from , wxApp::s_macDefaultEncodingIsPC ) ; }
+
+// 
+// CFStringRefs (Carbon only)
+//

 
 #if TARGET_CARBON
 // converts this string into a carbon foundation string with optional pc 2 mac encoding
 
 #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
 
 // 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 //TARGET_CARBON
 

+#endif // 0

 
 #endif
     // _WX_PRIVATE_H_
 
 #endif
     // _WX_PRIVATE_H_