moving out of 'carbon' dir

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

diff --git a/include/wx/dfb/font.h b/include/wx/dfb/font.h
index 04909177db47128a8f28ef637c2c46c45b0cf93f..a3441e48cccf4dac91ac456c2c5b96ebe44d5d2a 100644 (file)
--- a/include/wx/dfb/font.h
+++ b/include/wx/dfb/font.h
@@ -11,7 +11,7 @@
 #ifndef _WX_DFB_FONT_H_
 #define _WX_DFB_FONT_H_
 
 #ifndef _WX_DFB_FONT_H_
 #define _WX_DFB_FONT_H_
 

-#include "wx/dfb/ifacehelpers.h"
+#include "wx/dfb/dfbptr.h"

 
 wxDFB_DECLARE_INTERFACE(IDirectFBFont);
 
 
 wxDFB_DECLARE_INTERFACE(IDirectFBFont);
 


@@ -63,13 +63,16 @@ public:
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 

+    // Unofficial API, don't use
+    virtual void SetNoAntiAliasing(bool no = true);
+    virtual bool GetNoAntiAliasing() const;
+

     // implementation from now on:
     // implementation from now on:

-    IDirectFBFontPtr GetDirectFBFont() const;
+    wxIDirectFBFontPtr GetDirectFBFont(bool antialiased) const;

 
 protected:
 
 protected:

-    // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)