Visualage C++ V4.0 duplicate symbol fixes

[wxWidgets.git] / include / wx / font.h

diff --git a/include/wx/font.h b/include/wx/font.h
index ff010a2443be9ef626fc0708372d40fee8efce53..6b1737db518b97972cdcebd08b83c59184d36274 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -12,6 +12,10 @@
 #ifndef _WX_FONT_H_BASE_
 #define _WX_FONT_H_BASE_
 
+#ifdef __GNUG__
+    #pragma interface "fontbase.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -23,6 +27,7 @@
 // forward declarations
 // ----------------------------------------------------------------------------
 
+class WXDLLEXPORT wxFontData;
 class WXDLLEXPORT wxFontBase;
 class WXDLLEXPORT wxFont;
 
@@ -85,6 +90,7 @@ enum wxFontEncoding
     wxFONTENCODING_ISO8859_13,      // Latin7
     wxFONTENCODING_ISO8859_14,      // Latin8
     wxFONTENCODING_ISO8859_15,      // Latin9 (a.k.a. Latin0, includes euro)
+    wxFONTENCODING_ISO8859_MAX,
 
     // Cyrillic charset soup (see http://czyborra.com/charsets/cyrillic.html)
     wxFONTENCODING_KOI8,            // we don't support any of KOI8 variants
@@ -97,11 +103,21 @@ enum wxFontEncoding
     wxFONTENCODING_CP850,           // CP437 merged with Latin1
     wxFONTENCODING_CP852,           // CP437 merged with Latin2
     wxFONTENCODING_CP855,           // another cyrillic encoding
-    wxFONTENCODING_CP866 = wxFONTENCODING_ALTERNATIVE,
+    wxFONTENCODING_CP866,           // and another one
         // and for Windows
+    wxFONTENCODING_CP874,           // WinThai
     wxFONTENCODING_CP1250,          // WinLatin2
     wxFONTENCODING_CP1251,          // WinCyrillic
     wxFONTENCODING_CP1252,          // WinLatin1
+    wxFONTENCODING_CP1253,          // WinGreek (8859-7)
+    wxFONTENCODING_CP1254,          // WinTurkish
+    wxFONTENCODING_CP1255,          // WinHebrew
+    wxFONTENCODING_CP1256,          // WinArabic
+    wxFONTENCODING_CP1257,          // WinBaltic (same as Latin 7)
+    wxFONTENCODING_CP12_MAX,
+    
+    wxFONTENCODING_UNICODE,         // Unicode - currently used only by
+                                    // wxEncodingConverter class
 
     wxFONTENCODING_MAX
 };
@@ -110,7 +126,9 @@ enum wxFontEncoding
 // wxFontBase represents a font object
 // ----------------------------------------------------------------------------
 
-class wxFontBase : public wxGDIObject
+class WXDLLEXPORT wxFontRefData;
+
+class WXDLLEXPORT wxFontBase : public wxGDIObject
 {
 public:
     // creator function
@@ -163,7 +181,7 @@ public:
 
 protected:
     // get the internal data
-    class WXDLLEXPORT wxFontRefData *GetFontData() const
+    wxFontRefData *GetFontData() const
         { return (wxFontRefData *)m_refData; }
 
 private:
@@ -195,7 +213,6 @@ private:
 // macros
 // ----------------------------------------------------------------------------
 
-// VZ: this is ugly (FIXME)
 #define M_FONTDATA GetFontData()
 
 #endif