X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..57fbe23f68f9ef92b8ef7e26bd06b399b53e33b2:/include/wx/mac/private.h

diff --git a/include/wx/mac/private.h b/include/wx/mac/private.h
index 341d5307c7..a27786e53c 100644
--- a/include/wx/mac/private.h
+++ b/include/wx/mac/private.h
@@ -15,10 +15,10 @@
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"
+#include "wx/app.h"
 
-#if defined(__POWERPC__) && defined(__DARWIN__)
+#ifdef __DARWIN__
 #    include <Carbon/Carbon.h>
-#    define TARGET_CARBON 1
 #else
 #    include <Quickdraw.h>
 #    include <Appearance.h>
@@ -141,5 +141,19 @@ void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bi
 #define MAC_WXRECPTR(a) ((Rect*)a)
 #define MAC_WXPOINTPTR(a) ((Point*)a)
 #define MAC_WXHMENU(a) ((MenuHandle)a)
+
+// string conversions / 
+
+#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 ) ; }
+
+#endif //TARGET_CARBON
+
+
 #endif
     // _WX_PRIVATE_H_