Send generic wxTreeCtrl wxEVT_COMMAND_TREE_KEY_DOWN events from OnKeyDown rather...

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

diff --git a/src/mgl/fontenum.cpp b/src/mgl/fontenum.cpp
index 044e47185112db0498c7fa3639443a984205ec87..5659d4b64332401378fe574d08a4217f1d5cf70e 100644 (file)
--- a/src/mgl/fontenum.cpp
+++ b/src/mgl/fontenum.cpp
@@ -27,12 +27,12 @@
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/string.h"
+    #include "wx/utils.h"
 #endif
 
-#include "wx/utils.h"
-
 #include "wx/encinfo.h"
 #include "wx/fontutil.h"
+#include "wx/private/fontmgr.h"
 
 #include <mgraph.h>
 
@@ -49,19 +49,19 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {
     bool found = false;
-    wxMGLFontFamilyList *list = wxTheFontsManager->GetFamilyList();
-    wxMGLFontFamilyList::Node *node;
-    wxMGLFontFamily *f = NULL;
+    const wxFontBundleList& list = wxFontsManager::Get()->GetBundles();
+    wxFontBundleList::Node *node;
+    wxFontBundle *f = NULL;
     wxNativeEncodingInfo info;
 
     if ( encoding != wxFONTENCODING_SYSTEM )
         wxGetNativeFontEncoding(encoding, &info);
 
-    for (node = list->GetFirst(); node; node = node->GetNext())
+    for (node = list.GetFirst(); node; node = node->GetNext())
     {
         f = node->GetData();
         info.facename = f->GetName();
-        if ( (!fixedWidthOnly || f->GetInfo()->isFixed) &&
+        if ( (!fixedWidthOnly || f->IsFixed()) &&
              (encoding == wxFONTENCODING_SYSTEM || wxTestFontEncoding(info)) )
         {
             found = true;