a draft of wxSSBase class - it is yet unused and hopefully doesn't break anything...

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

diff --git a/include/wx/font.h b/include/wx/font.h
index c5bc183ad655f24052e72965559303d890a45dc1..f324d115c9402b8ebb7970ebaf6fff31e41f2fc9 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -78,8 +78,8 @@ class WXDLLEXPORT wxFontBase : public wxGDIObject
 {
 public:
     // creator function
 {
 public:
     // creator function

-#ifdef __WXMAC_X__
-    virtual ~wxFontBase() {}  // Added min for Mac X
+#ifdef __DARWIN__
+    virtual ~wxFontBase() { }

 #endif
 
     // from the font components
 #endif
 
     // from the font components


@@ -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;


@@ -126,7 +128,8 @@ public:
     virtual void SetEncoding(wxFontEncoding encoding) = 0;
     virtual void SetNativeFontInfo(const wxNativeFontInfo& info);
 
     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, ...)
 
     // translate the fonts into human-readable string (i.e. GetStyleString()
     // will return "wxITALIC" for an italic font, ...)


@@ -163,8 +166,6 @@ private:
     #include "wx/gtk/font.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/font.h"
     #include "wx/gtk/font.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/font.h"

-#elif defined(__WXQT__)
-    #include "wx/qt/font.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/font.h"
 #elif defined(__WXPM__)
 #elif defined(__WXMAC__)
     #include "wx/mac/font.h"
 #elif defined(__WXPM__)