Better #if checks for mac in ProcessPlatformProperty

[wxWidgets.git] / src / motif / font.cpp

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 7c5b6320291a000cda5d97c28ea641b17c115015..c4c0f9fcd6286d17eea3295d47f8f507da105d06 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "font.h"
 #endif
 
     #pragma implementation "font.h"
 #endif
 


@@ -137,7 +137,7 @@ wxXFont::~wxXFont()
     XmFontList fontList = (XmFontList) m_fontList;
     XmFontListFree (fontList);
 
     XmFontList fontList = (XmFontList) m_fontList;
     XmFontListFree (fontList);
 

-#if wxCHECK_MOTIF_VERSION( 2, 0 )
+#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()

     XmRenderTable renderTable = (XmRenderTable) m_renderTable;
     XmRenderTableFree (renderTable);
 #endif
     XmRenderTable renderTable = (XmRenderTable) m_renderTable;
     XmRenderTableFree (renderTable);
 #endif


@@ -188,7 +188,7 @@ void wxFontRefData::Init(int pointSize,
 
 wxFontRefData::~wxFontRefData()
 {
 
 wxFontRefData::~wxFontRefData()
 {

-    wxList::Node* node = m_fonts.GetFirst();
+    wxList::compatibility_iterator node = m_fonts.GetFirst();

     while (node)
     {
         wxXFont* f = (wxXFont*) node->GetData();
     while (node)
     {
         wxXFont* f = (wxXFont*) node->GetData();


@@ -511,7 +511,7 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
     int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
 
     // search existing fonts first
     int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
 
     // search existing fonts first

-    wxList::Node* node = M_FONTDATA->m_fonts.GetFirst();
+    wxList::compatibility_iterator node = M_FONTDATA->m_fonts.GetFirst();

     while (node)
     {
         wxXFont* f = (wxXFont*) node->GetData();
     while (node)
     {
         wxXFont* f = (wxXFont*) node->GetData();