From 9b7fd47266a0bb9985a815cb2c8e8e468b9e3960 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 19 Aug 2015 17:39:52 +0200
Subject: [PATCH] adding conditionals for NSString bridges

---
 include/wx/osx/core/cfstring.h | 4 ++++
 src/osx/core/cfstring.cpp      | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h
index 8f7b68f2f0..8b939a29a6 100644
--- a/include/wx/osx/core/cfstring.h
+++ b/include/wx/osx/core/cfstring.h
@@ -46,10 +46,12 @@ public:
     wxCFStringRef(const wxString &str,
                         wxFontEncoding encoding = wxFONTENCODING_DEFAULT) ;
 
+#ifdef __WXMAC__
     wxCFStringRef(NSString* ref)
         : wxCFRef< CFStringRef >((CFStringRef) ref)
     {
     }
+#endif
 
     wxCFStringRef(CFStringRef ref)
         : wxCFRef< CFStringRef >(ref)
@@ -69,10 +71,12 @@ public:
 
     static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
     static wxString AsStringWithNormalizationFormC( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
+#ifdef __WXMAC__
     static wxString AsString( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
     static wxString AsStringWithNormalizationFormC( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
 
     NSString* AsNSString() const { return (NSString*)(CFStringRef) *this; }
+#endif
 private:
 } ;
 
diff --git a/src/osx/core/cfstring.cpp b/src/osx/core/cfstring.cpp
index 8411e9ad2c..82b5808aa3 100644
--- a/src/osx/core/cfstring.cpp
+++ b/src/osx/core/cfstring.cpp
@@ -693,6 +693,8 @@ wxString wxCFStringRef::AsString(wxFontEncoding encoding) const
     return AsString( get(), encoding );
 }
 
+#ifdef __WXMAC__
+
 wxString wxCFStringRef::AsString( NSString* ref, wxFontEncoding encoding )
 {
     return AsString( (CFStringRef) ref, encoding );
@@ -703,6 +705,8 @@ wxString wxCFStringRef::AsStringWithNormalizationFormC( NSString* ref, wxFontEnc
     return AsStringWithNormalizationFormC( (CFStringRef) ref, encoding );
 }
 
+#endif
+
 //
 // wxMacUniCharBuffer
 //