activating DrawRectangle optimization

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

diff --git a/include/wx/private/fontmgr.h b/include/wx/private/fontmgr.h
index 78ab862ae3291e052ad67e938525478748d17a71..f24388718a94bed16111af30def0a15df76052ab 100644 (file)
--- a/include/wx/private/fontmgr.h
+++ b/include/wx/private/fontmgr.h
@@ -192,9 +192,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
 


@@ -205,9 +203,9 @@ class wxFontMgrFontRefData : public wxGDIRefData
 {
 public:
     wxFontMgrFontRefData(int size = wxDEFAULT,
 {
 public:
     wxFontMgrFontRefData(int size = wxDEFAULT,

-                  int family = wxDEFAULT,
-                  int style = wxDEFAULT,
-                  int weight = wxDEFAULT,
+                  wxFontFamily family = wxFONTFAMILY_DEFAULT,
+                  wxFontStyle style = wxFONTSTYLE_NORMAL,
+                  wxFontWeight weight = wxFONTWEIGHT_NORMAL,

                   bool underlined = false,
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
                   bool underlined = false,
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);


@@ -223,29 +221,24 @@ public:
 
     int GetPointSize() const { return m_info.pointSize; }
     wxString GetFaceName() const { return m_info.faceName; }
 
     int GetPointSize() const { return m_info.pointSize; }
     wxString GetFaceName() const { return m_info.faceName; }

-    int GetFamily() const { return m_info.family; }
-    int GetStyle() const { return m_info.style; }
-    int GetWeight() const { return m_info.weight; }
+    wxFontFamily GetFamily() const { return m_info.family; }
+    wxFontStyle GetStyle() const { return m_info.style; }
+    wxFontWeight GetWeight() const { return m_info.weight; }

     bool GetUnderlined() const { return m_info.underlined; }
     wxFontEncoding GetEncoding() const { return m_info.encoding; }
 
     void SetPointSize(int pointSize);
     bool GetUnderlined() const { return m_info.underlined; }
     wxFontEncoding GetEncoding() const { return m_info.encoding; }
 
     void SetPointSize(int pointSize);

-    void SetFamily(int family);
-    void SetStyle(int style);
-    void SetWeight(int weight);
+    void SetFamily(wxFontFamily family);
+    void SetStyle(wxFontStyle style);
+    void SetWeight(wxFontWeight weight);

     void SetFaceName(const wxString& faceName);
     void SetUnderlined(bool underlined);
     void SetEncoding(wxFontEncoding encoding);
 
     void SetFaceName(const wxString& faceName);
     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;