more wxHtmlHelpFrame fixes (didn't store customization correctly, still needs some...

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

diff --git a/include/wx/font.h b/include/wx/font.h
index ff010a2443be9ef626fc0708372d40fee8efce53..db89e4edc4979ae62f886dc200dd84d73f5fae9b 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_
 
 #ifndef _WX_FONT_H_BASE_
 #define _WX_FONT_H_BASE_
 

+#ifdef __GNUG__
+    #pragma interface "fontbase.h"
+#endif
+

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -97,7 +101,7 @@ enum wxFontEncoding
     wxFONTENCODING_CP850,           // CP437 merged with Latin1
     wxFONTENCODING_CP852,           // CP437 merged with Latin2
     wxFONTENCODING_CP855,           // another cyrillic encoding
     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_CP1250,          // WinLatin2
     wxFONTENCODING_CP1251,          // WinCyrillic
         // and for Windows
     wxFONTENCODING_CP1250,          // WinLatin2
     wxFONTENCODING_CP1251,          // WinCyrillic


@@ -110,6 +114,8 @@ enum wxFontEncoding
 // wxFontBase represents a font object
 // ----------------------------------------------------------------------------
 
 // wxFontBase represents a font object
 // ----------------------------------------------------------------------------
 

+class WXDLLEXPORT wxFontRefData;
+

 class wxFontBase : public wxGDIObject
 {
 public:
 class wxFontBase : public wxGDIObject
 {
 public:


@@ -163,7 +169,7 @@ public:
 
 protected:
     // get the internal data
 
 protected:
     // get the internal data

-    class WXDLLEXPORT wxFontRefData *GetFontData() const
+    wxFontRefData *GetFontData() const

         { return (wxFontRefData *)m_refData; }
 
 private:
         { return (wxFontRefData *)m_refData; }
 
 private:


@@ -195,7 +201,6 @@ private:
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-// VZ: this is ugly (FIXME)

 #define M_FONTDATA GetFontData()
 
 #endif
 #define M_FONTDATA GetFontData()
 
 #endif