Added missing wx/defs.h includes in propgrid headers

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index 2743dca4693b1993fc42b9d930da1e8df980e6c1..adbecdadeedd3db9c2183db34c8ff444dd1a7487 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -20,9 +20,9 @@ public:
     wxFont() { }
 
     // wxGTK-specific
-    wxFont(const wxString& fontname)
+    wxFont(const wxString& nativeFontInfoString)
     {
-        Create(fontname);
+        Create(nativeFontInfoString);
     }
 
     wxFont(const wxNativeFontInfo& info);
@@ -51,6 +51,18 @@ public:
         Create(size, family, style, weight, underlined, face, encoding);
     }
 
+    wxFont(const wxSize& pixelSize,
+           wxFontFamily family,
+           wxFontStyle style,
+           wxFontWeight weight,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        Create(10, family, style, weight, underlined, face, encoding);
+        SetPixelSize(pixelSize);
+    }
+
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
@@ -83,10 +95,7 @@ public:
     virtual void SetUnderlined( bool underlined );
     virtual void SetEncoding(wxFontEncoding encoding);
 
-    WXDECLARE_COMPAT_SETTERS
-
-    virtual void SetNoAntiAliasing( bool no = true );
-    virtual bool GetNoAntiAliasing() const ;
+    wxDECLARE_COMMON_FONT_METHODS();
 
     // implementation from now on
     void Unshare();