No real changes, just cleanup week days handling in wxGenericCalendarCtrl.

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

diff --git a/include/wx/private/fontmgr.h b/include/wx/private/fontmgr.h
index f01604dd1e2c708ea0ebabe13a05e78c00092cbd..389e4d5abcf7f8e536e349638c180cd1180aab9f 100644 (file)
--- a/include/wx/private/fontmgr.h
+++ b/include/wx/private/fontmgr.h
@@ -201,13 +201,13 @@ protected:
 
 
 /// wxFontMgrFontRefData implementation using wxFontsManager classes
 
 
 /// wxFontMgrFontRefData implementation using wxFontsManager classes

-class wxFontMgrFontRefData : public wxObjectRefData
+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 +223,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;