don't draw borders for bitmap buttons with wxBORDER_NONE style

[wxWidgets.git] / include / wx / osx / core / cfstring.h

diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h
index c4b1719c4df0ad9dbee5e08c596a2af19b2723bb..30d4319493aa17a6eda0e568ea01409ef140ffa3 100644 (file)
--- a/include/wx/osx/core/cfstring.h
+++ b/include/wx/osx/core/cfstring.h
@@ -17,7 +17,13 @@
 
 #include "wx/dlimpexp.h"
 #include "wx/fontenc.h"
 
 #include "wx/dlimpexp.h"
 #include "wx/fontenc.h"

-#include "wx/mac/corefoundation/cfref.h"
+#include "wx/osx/core/cfref.h"
+
+#ifdef WORDS_BIGENDIAN
+    #define kCFStringEncodingUTF32Native kCFStringEncodingUTF32BE
+#else
+    #define kCFStringEncodingUTF32Native kCFStringEncodingUTF32LE
+#endif

 
 class WXDLLIMPEXP_FWD_BASE wxString;
 
 
 class WXDLLIMPEXP_FWD_BASE wxString;
 


@@ -41,6 +47,13 @@ public:
     wxCFStringRef(const wxString &str,
                         wxFontEncoding encoding = wxFONTENCODING_DEFAULT) ;
 
     wxCFStringRef(const wxString &str,
                         wxFontEncoding encoding = wxFONTENCODING_DEFAULT) ;
 

+#if wxOSX_USE_COCOA_OR_IPHONE
+    wxCFStringRef(NSString* ref)
+        : wxCFRef< CFStringRef >((CFStringRef) ref) 
+    {
+    }
+#endif
+

     wxCFStringRef(CFStringRef ref)
         : wxCFRef< CFStringRef >(ref) 
     {
     wxCFStringRef(CFStringRef ref)
         : wxCFRef< CFStringRef >(ref) 
     {


@@ -57,6 +70,9 @@ public:
 
     wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
 
 
     wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
 

+#if wxOSX_USE_COCOA_OR_IPHONE
+    NSString* AsNSString() const { return (NSString*)(CFStringRef) *this; }
+#endif

 private:
 } ;
 
 private:
 } ;