Update vc10 build file versions to 3.0.0.

[wxWidgets.git] / include / wx / private / fontmgr.h

diff --git a/include/wx/private/fontmgr.h b/include/wx/private/fontmgr.h
index c9f4395487ceffe5623a29723e03e642b7072b63..c00270a6b1c4274331ff22fe52b72dd177f53bb1 100644 (file)
--- a/include/wx/private/fontmgr.h
+++ b/include/wx/private/fontmgr.h
@@ -3,7 +3,6 @@
 // Purpose:     font management for ports that don't have their own
 // Author:      Vaclav Slavik
 // Created:     2006-11-18
 // Purpose:     font management for ports that don't have their own
 // Author:      Vaclav Slavik
 // Created:     2006-11-18

-// RCS-ID:      $Id$

 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 //              (c) 2006 REA Elektronik GmbH
 // Licence:     wxWindows licence
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 //              (c) 2006 REA Elektronik GmbH
 // Licence:     wxWindows licence


@@ -192,9 +191,7 @@ protected:
 
 
 
 
 
 

-#if defined(__WXMGL__)
-    #include "wx/mgl/private/fontmgr.h"
-#elif defined(__WXDFB__)
+#if defined(__WXDFB__)

     #include "wx/dfb/private/fontmgr.h"
 #endif
 
     #include "wx/dfb/private/fontmgr.h"
 #endif
 


@@ -237,15 +234,10 @@ public:
     void SetUnderlined(bool underlined);
     void SetEncoding(wxFontEncoding encoding);
 
     void SetUnderlined(bool underlined);
     void SetEncoding(wxFontEncoding encoding);
 

-    // Unofficial API, don't use
-    void SetNoAntiAliasing(bool no);
-    bool GetNoAntiAliasing() const { return m_noAA; }
-

 private:
     void EnsureValidFont();
 
     wxNativeFontInfo  m_info;
 private:
     void EnsureValidFont();
 
     wxNativeFontInfo  m_info;

-    bool              m_noAA;

 
     wxFontFace       *m_fontFace;
     wxFontBundle     *m_fontBundle;
 
     wxFontFace       *m_fontFace;
     wxFontBundle     *m_fontBundle;