X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da494b405d0826b343ea6d249bbac27061e11d3e..b380439d52f06ad6fb26b318d18167a6449d9725:/src/motif/font.cpp?ds=sidebyside diff --git a/src/motif/font.cpp b/src/motif/font.cpp index 7c5b632029..c4c0f9fcd6 100644 --- a/src/motif/font.cpp +++ b/src/motif/font.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "font.h" #endif @@ -137,7 +137,7 @@ wxXFont::~wxXFont() 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 @@ -188,7 +188,7 @@ void wxFontRefData::Init(int pointSize, wxFontRefData::~wxFontRefData() { - wxList::Node* node = m_fonts.GetFirst(); + wxList::compatibility_iterator node = m_fonts.GetFirst(); 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 - wxList::Node* node = M_FONTDATA->m_fonts.GetFirst(); + wxList::compatibility_iterator node = M_FONTDATA->m_fonts.GetFirst(); while (node) { wxXFont* f = (wxXFont*) node->GetData();