moving common code up

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

diff --git a/src/osx/carbon/fontdlg.cpp b/src/osx/carbon/fontdlg.cpp
index bfc19e1386527f78abf3d6c75233fd9cdc358bb9..395b13fdfb644424a3821c27dcc7c81286d02e97 100644 (file)
--- a/src/osx/carbon/fontdlg.cpp
+++ b/src/osx/carbon/fontdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/fontdlg.cpp
+// Name:        src/osx/carbon/fontdlg.cpp

 // Purpose:     wxFontDialog class for carbon 10.2+.
 // Author:      Ryan Norton
 // Modified by:
 // Purpose:     wxFontDialog class for carbon 10.2+.
 // Author:      Ryan Norton
 // Modified by:


@@ -41,17 +41,20 @@
 #endif
 
 #include "wx/fontdlg.h"
 #endif
 
 #include "wx/fontdlg.h"

+#include "wx/fontutil.h"

 
 #if wxOSX_USE_EXPERIMENTAL_FONTDIALOG
 
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 
 
 #if wxOSX_USE_EXPERIMENTAL_FONTDIALOG
 
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 

-#include "wx/osx/uma.h"
+#include "wx/osx/private.h"

 
 // ---------------------------------------------------------------------------
 // wxFontDialog
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // wxFontDialog
 // ---------------------------------------------------------------------------
 

+#if wxOSX_USE_CARBON
+

 static const EventTypeSpec eventList[] =
 {
     { kEventClassFont, kEventFontSelection } ,
 static const EventTypeSpec eventList[] =
 {
     { kEventClassFont, kEventFontSelection } ,


@@ -80,7 +83,9 @@ wxMacCarbonFontPanelHandler(EventHandlerCallRef WXUNUSED(nextHandler),
                 if ( cEvent.GetParameter<CTFontDescriptorRef>( kEventParamCTFontDescriptor, typeCTFontDescriptorRef, &descr ) == noErr )
                 {
                     wxFont font;
                 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;
                 }
                     fontdata.SetChosenFont( font ) ;
                     setup = true;
                 }


@@ -191,6 +196,7 @@ wxMacCarbonFontPanelHandler(EventHandlerCallRef WXUNUSED(nextHandler),
 }
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacCarbonFontPanelHandler )
 }
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacCarbonFontPanelHandler )

+#endif

 
 wxFontDialog::wxFontDialog()
 {
 
 wxFontDialog::wxFontDialog()
 {


@@ -213,6 +219,8 @@ bool wxFontDialog::Create(wxWindow *WXUNUSED(parent), const wxFontData& data)
 
 int wxFontDialog::ShowModal()
 {
 
 int wxFontDialog::ShowModal()
 {

+#if wxOSX_USE_CARBON
+

     OSStatus err ;
     wxFont font = *wxNORMAL_FONT ;
     if ( m_fontData.m_initialFont.Ok() )
     OSStatus err ;
     wxFont font = *wxNORMAL_FONT ;
     if ( m_fontData.m_initialFont.Ok() )


@@ -224,8 +232,9 @@ int wxFontDialog::ShowModal()
 #if wxOSX_USE_CORE_TEXT
     if ( UMAGetSystemVersion() >= 0x1050 )
     {
 #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);
         err = SetFontInfoForSelection (kFontSelectionCoreTextType,1, &descr , NULL);

+        CFRelease( descr );

         setup = true;
     }
 #endif
         setup = true;
     }
 #endif


@@ -247,10 +256,12 @@ int wxFontDialog::ShowModal()
 
     if ( !FPIsFontPanelVisible() )
         FPShowHideFontPanel();
 
     if ( !FPIsFontPanelVisible() )
         FPShowHideFontPanel();

-
+#endif

     int retval = RunMixedFontDialog(this);
 
     int retval = RunMixedFontDialog(this);
 

+#if wxOSX_USE_CARBON

     ::RemoveEventHandler(handler);
     ::RemoveEventHandler(handler);

+#endif

 
     return retval ;
 }
 
     return retval ;
 }


@@ -577,7 +588,7 @@ void wxFontDialog::CreateControls()
     wxFontEnumerator enumerator;
     enumerator.EnumerateFacenames();
     wxArrayString facenames = enumerator.GetFacenames();
     wxFontEnumerator enumerator;
     enumerator.EnumerateFacenames();
     wxArrayString facenames = enumerator.GetFacenames();

-    if (facenames)
+    if (!facenames.empty())

     {
         facenames.Add(_("<Any>"));
         facenames.Add(_("<Any Roman>"));
     {
         facenames.Add(_("<Any>"));
         facenames.Add(_("<Any Roman>"));