Add support for wxFONTENCODING_MACKEYBOARD.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/corefoundation/private/strconv_cf.h b/include/wx/mac/corefoundation/private/strconv_cf.h
index bce9641e7851d416bc17a015077e0791c10a0016..07a98a1de034c7cb6e5e8224d4c30bacba5909f2 100644 (file)
--- a/include/wx/mac/corefoundation/private/strconv_cf.h
+++ b/include/wx/mac/corefoundation/private/strconv_cf.h
@@ -270,9 +270,13 @@ inline CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
         case wxFONTENCODING_MACGAELIC :
             enc = kCFStringEncodingMacGaelic ;
             break ;
         case wxFONTENCODING_MACGAELIC :
             enc = kCFStringEncodingMacGaelic ;
             break ;

-//      case wxFONTENCODING_MACKEYBOARD :
-//          enc = kCFStringEncodingMacKeyboardGlyphs ;
-//          break ;
+        /* CFString is known to support this back to the original CarbonLib */
+        /* http://developer.apple.com/samplecode/CarbonMDEF/listing2.html */
+        case wxFONTENCODING_MACKEYBOARD :
+            /* We don't wish to pollute the namespace too much, even though we're a private header. */
+            /* The constant is well-defined as 41 and is not expected to change. */
+            enc = 41 /*kTextEncodingMacKeyboardGlyphs*/ ;
+            break ;

 
         default :
             // because gcc is picky
 
         default :
             // because gcc is picky