Implement monitoring of file descriptors in wxMotif event loop.

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

diff --git a/include/wx/private/fontmgr.h b/include/wx/private/fontmgr.h
index d886739ae6acc2e126bb9d507678ff0f249b9ac0..f24388718a94bed16111af30def0a15df76052ab 100644 (file)
--- a/include/wx/private/fontmgr.h
+++ b/include/wx/private/fontmgr.h
@@ -192,22 +192,20 @@ protected:
 
 
 
-#if defined(__WXMGL__)
-    #include "wx/mgl/private/fontmgr.h"
-#elif defined(__WXDFB__)
+#if defined(__WXDFB__)
     #include "wx/dfb/private/fontmgr.h"
 #endif
 
 
 
 /// wxFontMgrFontRefData implementation using wxFontsManager classes
-struct wxFontMgrFontRefData : public wxObjectRefData
+class wxFontMgrFontRefData : public wxGDIRefData
 {
 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);
@@ -223,29 +221,24 @@ public:
 
     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);
-    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);
 
-    // Unofficial API, don't use
-    void SetNoAntiAliasing(bool no);
-    bool GetNoAntiAliasing() const { return m_noAA; }
-
 private:
     void EnsureValidFont();
 
     wxNativeFontInfo  m_info;
-    bool              m_noAA;
 
     wxFontFace       *m_fontFace;
     wxFontBundle     *m_fontBundle;