make sure we don't keep a focus pointer to a window that gets deleted

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

diff --git a/src/mac/fontenum.cpp b/src/mac/fontenum.cpp
index 14491d79e93e542b49aea6b9c4c9a29cf53b3083..43aeb9a7a82b46ee044d4b5d2b89a73ac54add31 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/fontmap.h"
 #include "wx/fontutil.h"
 

+#include "wx/mac/private.h"
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -87,7 +89,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
     wxNativeEncodingInfo info;
     if ( !wxGetNativeFontEncoding(encoding, &info) )
     {
     wxNativeEncodingInfo info;
     if ( !wxGetNativeFontEncoding(encoding, &info) )
     {

-        if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
+        if ( !wxFontMapper::Get()->GetAltForEncoding(encoding, &info) )

         {
             // no such encodings at all
             return FALSE;
         {
             // no such encodings at all
             return FALSE;


@@ -168,7 +170,7 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {

-    wxFAIL_MSG(wxT("TODO"));
+    wxFAIL_MSG(wxT("wxFontEnumerator::EnumerateEncodings() not yet implemented"));

 
     return TRUE;
 }
 
     return TRUE;
 }