Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h
index bfe33ee3e0d75f8f71ddcbfbe9d84a1cf9b0798b..f05177a46dae0631029de6b817fd94dfdf5d1463 100644 (file)
--- a/include/wx/x11/font.h
+++ b/include/wx/x11/font.h
@@ -21,6 +21,20 @@ public:
     // ctors and such
     wxFont() { }
 
     // ctors and such
     wxFont() { }
 

+    wxFont(const wxFontInfo& info)
+    {
+        Create(info.GetPointSize(),
+               info.GetFamily(),
+               info.GetStyle(),
+               info.GetWeight(),
+               info.IsUnderlined(),
+               info.GetFaceName(),
+               info.GetEncoding());
+
+        if ( info.IsUsingSizeInPixels() )
+            SetPixelSize(info.GetPixelSize());
+    }
+

 #if FUTURE_WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,
 #if FUTURE_WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,


@@ -44,7 +58,7 @@ public:
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }

-    
+

     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,
     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,


@@ -56,7 +70,7 @@ public:
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }

-    
+

     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,


@@ -80,7 +94,6 @@ public:
 
     // implement base class pure virtuals
     virtual int GetPointSize() const;
 
     // implement base class pure virtuals
     virtual int GetPointSize() const;

-    virtual wxFontFamily GetFamily() const;

     virtual wxFontStyle GetStyle() const;
     virtual wxFontWeight GetWeight() const;
     virtual bool GetUnderlined() const;
     virtual wxFontStyle GetStyle() const;
     virtual wxFontWeight GetWeight() const;
     virtual bool GetUnderlined() const;


@@ -100,9 +113,6 @@ public:
 
     wxDECLARE_COMMON_FONT_METHODS();
 
 
     wxDECLARE_COMMON_FONT_METHODS();
 

-    virtual void SetNoAntiAliasing( bool no = TRUE );
-    virtual bool GetNoAntiAliasing() const ;
-

     // Implementation
 
 #if wxUSE_PANGO
     // Implementation
 
 #if wxUSE_PANGO


@@ -132,6 +142,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
     virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
     virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );

+    virtual wxFontFamily DoGetFamily() const;

 
     void Unshare();
 
 
     void Unshare();