explicit scrollbar style flags needed

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

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 4e7186a805602aa932f4c2b874c2ff39996cc32a..0c82eed410a31493c00b002cc07afe7baffeb078 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -17,10 +17,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

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

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/defs.h"
 
 #ifdef __VMS
 #include "wx/defs.h"
 
 #ifdef __VMS


@@ -188,7 +191,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();


@@ -485,14 +488,14 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->m_encoding;
 }
 
     return M_FONTDATA->m_encoding;
 }
 

-wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const

 {
     wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 
     if(M_FONTDATA->m_nativeFontInfo.GetXFontName().IsEmpty())
         GetInternalFont();
 
 {
     wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 
     if(M_FONTDATA->m_nativeFontInfo.GetXFontName().IsEmpty())
         GetInternalFont();
 

-    return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+    return &(M_FONTDATA->m_nativeFontInfo);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -511,7 +514,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();