ping method almost there

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

diff --git a/include/wx/font.h b/include/wx/font.h
index ff010a2443be9ef626fc0708372d40fee8efce53..73bcbbafb69b3e2b086ce9f29b48640d3bdf2744 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -97,7 +97,7 @@ 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_CP1250,          // WinLatin2
     wxFONTENCODING_CP1251,          // WinCyrillic
@@ -195,8 +195,10 @@ private:
 // macros
 // ----------------------------------------------------------------------------
 
+#if !defined(__VISAGECPP__)
 // VZ: this is ugly (FIXME)
 #define M_FONTDATA GetFontData()
+#endif
 
 #endif
     // _WX_FONT_H_BASE_