added definition of TARGET_CARBON when compiling with non generated setup.h

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

diff --git a/include/wx/mac/private.h b/include/wx/mac/private.h
index 341d5307c7554ebb51f3c627ce935f6c658d0d59..a27786e53ccb9cd87e8cf0220350fe5bced9837e 100644 (file)
--- a/include/wx/mac/private.h
+++ b/include/wx/mac/private.h
@@ -15,10 +15,10 @@
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"

+#include "wx/app.h"

 
 

-#if defined(__POWERPC__) && defined(__DARWIN__)
+#ifdef __DARWIN__

 #    include <Carbon/Carbon.h>
 #    include <Carbon/Carbon.h>

-#    define TARGET_CARBON 1

 #else
 #    include <Quickdraw.h>
 #    include <Appearance.h>
 #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)
 #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_
 #endif
     // _WX_PRIVATE_H_