more compilation fixes for VC6 (#9492)

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

diff --git a/include/wx/mgl/font.h b/include/wx/mgl/font.h
index 3f748c413a847e7dd66f1ebb7294285caa84b4bd..06f4002930437f6b792101ccbcbc37cdfe95ea21 100644 (file)
--- a/include/wx/mgl/font.h
+++ b/include/wx/mgl/font.h
@@ -15,10 +15,10 @@
 // classes
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxPaintDC;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxFont;
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_CORE wxPaintDC;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxFont;
 
 struct font_t;
 
@@ -26,7 +26,7 @@ struct font_t;
 // wxFont
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFont : public wxFontBase
+class WXDLLIMPEXP_CORE wxFont : public wxFontBase
 {
 public:
     // ctors and such
@@ -58,7 +58,7 @@ public:
 
     bool Create(const wxNativeFontInfo& fontinfo);
 
-    ~wxFont() {}
+    virtual ~wxFont() {}
 
     // implement base class pure virtuals
     virtual int GetPointSize() const;
@@ -79,12 +79,16 @@ public:
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 
+    // Unofficial API, don't use
+    virtual void SetNoAntiAliasing(bool no = true);
+    virtual bool GetNoAntiAliasing() const;
+
     struct font_t *GetMGLfont_t(float scale, bool antialiased);
 
 protected:
     // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)