X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee6b1d97e741fda8d579fa21cbc89f0c91615cef..0b2e45b16264cf196e069adb1137cd47e426284d:/src/mac/carbon/fontenum.cpp

diff --git a/src/mac/carbon/fontenum.cpp b/src/mac/carbon/fontenum.cpp
index f296efd93c..5e9987348e 100644
--- a/src/mac/carbon/fontenum.cpp
+++ b/src/mac/carbon/fontenum.cpp
@@ -33,7 +33,11 @@
 #endif
 
 #include "wx/fontenum.h"
+#include "wx/fontutil.h"
 #include "wx/fontmap.h"
+#include "wx/fontutil.h"
+
+#include "wx/mac/private.h"
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -85,7 +89,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
     wxNativeEncodingInfo info;
     if ( !wxGetNativeFontEncoding(encoding, &info) )
     {
-        if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
+        if ( !wxFontMapper::Get()->GetAltForEncoding(encoding, &info) )
         {
             // no such encodings at all
             return FALSE;
@@ -99,44 +103,46 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
 
 void wxFontEnumeratorHelper::DoEnumerate()
 {
-	MenuHandle	menu ;
-	Str255		name ;
-	short 		lines ;
-	
-	menu = NewMenu( 32000 , "\pFont" )  ;
-	AppendResMenu( menu , 'FONT' ) ;
-	lines = CountMenuItems( menu ) ;
-
-	for ( int i = 1 ; i < lines+1  ; i ++ )
-	{
-		GetMenuItemText( menu , i , name ) ;
-		p2cstr( name ) ;
-		/*
-		
-		    if ( m_fixedOnly )
-	    {
-	        // check that it's a fixed pitch font (there is *no* error here, the
-	        // flag name is misleading!)
-	        if ( tm->tmPitchAndFamily & TMPF_FIXED_PITCH )
-	        {
-	            // not a fixed pitch font
-	            return TRUE;
-	        }
-	    }
-	
-	    if ( m_charset != -1 )
-	    {
-	        // check that we have the right encoding
-	        if ( lf->lfCharSet != m_charset )
-	        {
-	            return TRUE;
-	        }
-	    }
-	
-		*/
-		m_fontEnum->OnFacename( name ) ;
-	}
-	DisposeMenu( menu ) ;
+    MenuHandle    menu ;
+    Str255        p_name ;
+
+    short         lines ;
+    
+    menu = NewMenu( 32000 , "\pFont" )  ;
+    AppendResMenu( menu , 'FONT' ) ;
+    lines = CountMenuItems( menu ) ;
+
+    for ( int i = 1 ; i < lines+1  ; i ++ )
+    {
+        GetMenuItemText( menu , i , p_name ) ;
+        wxString c_name = wxMacMakeStringFromPascal(p_name) ;
+
+        /*
+          
+          if ( m_fixedOnly )
+        {
+            // check that it's a fixed pitch font (there is *no* error here, the
+            // flag name is misleading!)
+            if ( tm->tmPitchAndFamily & TMPF_FIXED_PITCH )
+            {
+                // not a fixed pitch font
+                return TRUE;
+            }
+        }
+    
+        if ( m_charset != -1 )
+        {
+            // check that we have the right encoding
+            if ( lf->lfCharSet != m_charset )
+            {
+                return TRUE;
+            }
+        }
+    
+        */
+        m_fontEnum->OnFacename( c_name ) ;
+    }
+    DisposeMenu( menu ) ;
 }
 
 // ----------------------------------------------------------------------------
@@ -160,7 +166,7 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {
-    wxFAIL_MSG(wxT("TODO"));
+    wxFAIL_MSG(wxT("wxFontEnumerator::EnumerateEncodings() not yet implemented"));
 
     return TRUE;
 }