compilation fix for recent commit

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

diff --git a/include/wx/font.h b/include/wx/font.h
index fe9632599cefe0d8fde6f9766a69656e7a4f5ba1..f324d115c9402b8ebb7970ebaf6fff31e41f2fc9 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -72,12 +72,15 @@ enum wxFontWeight
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxFontRefData;
-class WXDLLEXPORT wxNativeFontInfo;
+struct WXDLLEXPORT wxNativeFontInfo;
 
 class WXDLLEXPORT wxFontBase : public wxGDIObject
 {
 public:
     // creator function
+#ifdef __DARWIN__
+    virtual ~wxFontBase() { }
+#endif
 
     // from the font components
     static wxFont *New(
@@ -111,7 +114,9 @@ public:
     virtual wxString GetFaceName() const = 0;
     virtual wxFontEncoding GetEncoding() const = 0;
     virtual wxNativeFontInfo *GetNativeFontInfo() const;
+
     wxString GetNativeFontInfoDesc() const;
+    wxString GetNativeFontInfoUserDesc() const;
 
     // change the font characteristics
     virtual void SetPointSize( int pointSize ) = 0;
@@ -123,7 +128,8 @@ public:
     virtual void SetEncoding(wxFontEncoding encoding) = 0;
     virtual void SetNativeFontInfo(const wxNativeFontInfo& info);
 
-    // VZ: there is no void SetNativeFontInfo(const wxString& info), needed?
+    void SetNativeFontInfo(const wxString& info);
+    void SetNativeFontInfoUserDesc(const wxString& info);
 
     // translate the fonts into human-readable string (i.e. GetStyleString()
     // will return "wxITALIC" for an italic font, ...)
@@ -158,8 +164,8 @@ private:
     #include "wx/motif/font.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/font.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/font.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/font.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/font.h"
 #elif defined(__WXPM__)