X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42f30fa288e18beb7dedc5648c009d476c43e9e1..e4da1035e402e722f799d3ed498dfa789b74f02f:/src/motif/font.cpp?ds=sidebyside

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 0af197f78d..c6e1b6dd2c 100644
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -21,6 +21,8 @@
     #pragma implementation "font.h"
 #endif
 
+#include "wx/defs.h"
+
 #ifdef __VMS
 #pragma message disable nosimpint
 #include "wx/vms_x_fix.h"
@@ -30,7 +32,6 @@
 #pragma message enable nosimpint
 #endif
 
-#include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"
@@ -176,12 +177,12 @@ void wxFontRefData::Init(int pointSize,
 
 wxFontRefData::~wxFontRefData()
 {
-    wxNode* node = m_fonts.First();
+    wxList::Node* node = m_fonts.GetFirst();
     while (node)
     {
-        wxXFont* f = (wxXFont*) node->Data();
+        wxXFont* f = (wxXFont*) node->GetData();
         delete f;
-        node = node->Next();
+        node = node->GetNext();
     }
     m_fonts.Clear();
 }
@@ -499,13 +500,13 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
     int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
 
     // search existing fonts first
-    wxNode* node = M_FONTDATA->m_fonts.First();
+    wxList::Node* node = M_FONTDATA->m_fonts.GetFirst();
     while (node)
     {
-        wxXFont* f = (wxXFont*) node->Data();
+        wxXFont* f = (wxXFont*) node->GetData();
         if ((!display || (f->m_display == display)) && (f->m_scale == intScale))
             return f;
-        node = node->Next();
+        node = node->GetNext();
     }
 
     // not found, create a new one