fixes to ShowFullScreen (KDE 3.1)

[wxWidgets.git] / src / mac / fontenum.cpp

diff --git a/src/mac/fontenum.cpp b/src/mac/fontenum.cpp
index 14491d79e93e542b49aea6b9c4c9a29cf53b3083..4a91e5703f1bee306fd2166efeb7f78a3bdb2df1 100644 (file)
--- a/src/mac/fontenum.cpp
+++ b/src/mac/fontenum.cpp
@@ -37,6 +37,8 @@
 #include "wx/fontmap.h"
 #include "wx/fontutil.h"
 
+#include "wx/mac/private.h"
+
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -87,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;
@@ -103,7 +105,7 @@ void wxFontEnumeratorHelper::DoEnumerate()
 {
        MenuHandle      menu ;
        Str255          p_name ;
-       char        c_name[256] ;
+
        short           lines ;
        
        menu = NewMenu( 32000 , "\pFont" )  ;
@@ -113,12 +115,8 @@ void wxFontEnumeratorHelper::DoEnumerate()
        for ( int i = 1 ; i < lines+1  ; i ++ )
        {
            GetMenuItemText( menu , i , p_name ) ;
-#if TARGET_CARBON
-           p2cstrcpy( c_name, p_name ) ;
-#else
-               p2cstr( p_name ) ;
-           strcpy( c_name, (char *)p_name ) ;
-#endif
+           wxString c_name = wxMacMakeStringFromPascal(p_name) ;
+
            /*
              
              if ( m_fixedOnly )
@@ -168,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;
 }