fixing native font info support bugs

[wxWidgets.git] / src / osx / carbon / fontdlg.cpp

diff --git a/src/osx/carbon/fontdlg.cpp b/src/osx/carbon/fontdlg.cpp
index c61ea57612e45ca76be9659cf5a4ee1cebed2fc4..279c1370c7a6ffdcd6c74e99fd34d0353d8284a6 100644 (file)
--- a/src/osx/carbon/fontdlg.cpp
+++ b/src/osx/carbon/fontdlg.cpp
@@ -41,6 +41,7 @@
 #endif
 
 #include "wx/fontdlg.h"
+#include "wx/fontutil.h"
 
 #if wxOSX_USE_EXPERIMENTAL_FONTDIALOG
 
@@ -82,7 +83,9 @@ wxMacCarbonFontPanelHandler(EventHandlerCallRef WXUNUSED(nextHandler),
                 if ( cEvent.GetParameter<CTFontDescriptorRef>( kEventParamCTFontDescriptor, typeCTFontDescriptorRef, &descr ) == noErr )
                 {
                     wxFont font;
-                    font.MacCreateFromCTFontDescriptor(descr);
+                    wxNativeFontInfo fontinfo;
+                    fontinfo.Init(descr);
+                    font.Create(fontinfo);
                     fontdata.SetChosenFont( font ) ;
                     setup = true;
                 }
@@ -229,8 +232,9 @@ int wxFontDialog::ShowModal()
 #if wxOSX_USE_CORE_TEXT
     if ( UMAGetSystemVersion() >= 0x1050 )
     {
-        CTFontDescriptorRef descr = (CTFontDescriptorRef)font.MacGetCTFontDescriptor();
+        CTFontDescriptorRef descr = (CTFontDescriptorRef) CTFontCopyFontDescriptor( (CTFontRef) font.OSXGetCTFont() );
         err = SetFontInfoForSelection (kFontSelectionCoreTextType,1, &descr , NULL);
+        CFRelease( descr );
         setup = true;
     }
 #endif