Fixed wxSplitterEvent to set it's id to be the splitter window's id so

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

diff --git a/include/wx/font.h b/include/wx/font.h
index 73bcbbafb69b3e2b086ce9f29b48640d3bdf2744..cf30f6585dfa3798f6b245ddcab53f4bd9fdbeac 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
 // ----------------------------------------------------------------------------


@@ -23,6 +27,7 @@
 // forward declarations
 // ----------------------------------------------------------------------------
 
 // forward declarations
 // ----------------------------------------------------------------------------
 

+class WXDLLEXPORT wxFontData;

 class WXDLLEXPORT wxFontBase;
 class WXDLLEXPORT wxFont;
 
 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_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
 
     // Cyrillic charset soup (see http://czyborra.com/charsets/cyrillic.html)
     wxFONTENCODING_KOI8,            // we don't support any of KOI8 variants


@@ -102,6 +108,12 @@ enum wxFontEncoding
     wxFONTENCODING_CP1250,          // WinLatin2
     wxFONTENCODING_CP1251,          // WinCyrillic
     wxFONTENCODING_CP1252,          // WinLatin1
     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_MAX
 };
 
     wxFONTENCODING_MAX
 };


@@ -110,6 +122,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 +177,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,10 +209,7 @@ private:
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-#if !defined(__VISAGECPP__)
-// VZ: this is ugly (FIXME)

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

-#endif

 
 #endif
     // _WX_FONT_H_BASE_
 
 #endif
     // _WX_FONT_H_BASE_