compilation fix for recent commit

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

diff --git a/include/wx/font.h b/include/wx/font.h
index 262bce29f5fefa093a53e9a7a24965827a64049a..f324d115c9402b8ebb7970ebaf6fff31e41f2fc9 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -114,7 +114,9 @@ public:
     virtual wxString GetFaceName() const = 0;
     virtual wxFontEncoding GetEncoding() const = 0;
     virtual wxNativeFontInfo *GetNativeFontInfo() const;
     virtual wxString GetFaceName() const = 0;
     virtual wxFontEncoding GetEncoding() const = 0;
     virtual wxNativeFontInfo *GetNativeFontInfo() const;

+

     wxString GetNativeFontInfoDesc() const;
     wxString GetNativeFontInfoDesc() const;

+    wxString GetNativeFontInfoUserDesc() const;

 
     // change the font characteristics
     virtual void SetPointSize( int pointSize ) = 0;
 
     // change the font characteristics
     virtual void SetPointSize( int pointSize ) = 0;


@@ -125,7 +127,9 @@ public:
     virtual void SetUnderlined( bool underlined ) = 0;
     virtual void SetEncoding(wxFontEncoding encoding) = 0;
     virtual void SetNativeFontInfo(const wxNativeFontInfo& info);
     virtual void SetUnderlined( bool underlined ) = 0;
     virtual void SetEncoding(wxFontEncoding encoding) = 0;
     virtual void SetNativeFontInfo(const wxNativeFontInfo& info);

+

     void SetNativeFontInfo(const wxString& info);
     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, ...)
 
     // translate the fonts into human-readable string (i.e. GetStyleString()
     // will return "wxITALIC" for an italic font, ...)