X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2681874846b4b1277dead453036f8cf7e9ad48fe..9d33840bab4e10d701dd36f9b8660f6a13f05afe:/interface/wx/font.h

diff --git a/interface/wx/font.h b/interface/wx/font.h
index 3ffd7e94c3..193dbaae1f 100644
--- a/interface/wx/font.h
+++ b/interface/wx/font.h
@@ -310,10 +310,10 @@ public:
         @remarks If the desired font does not exist, the closest match will be
                  chosen. Under Windows, only scalable TrueType fonts are used.
     */
-    wxFont(int pointSize, wxFontFamily family, int style,
+    wxFont(int pointSize, wxFontFamily family, wxFontStyle style,
            wxFontWeight weight,
-           const bool underline = false,
-           const wxString& faceName = "",
+           bool underline = false,
+           const wxString& faceName = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
     /**
@@ -360,9 +360,9 @@ public:
                  chosen. Under Windows, only scalable TrueType fonts are used.
     */
     wxFont(const wxSize& pixelSize, wxFontFamily family,
-           int style, wxFontWeight weight,
-           const bool underline = false,
-           const wxString& faceName = "",
+           wxFontStyle style, wxFontWeight weight,
+           bool underline = false,
+           const wxString& faceName = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     //@}
 
@@ -473,26 +473,26 @@ public:
         Using @c New() is currently the only way to directly create a font with
         the given size in pixels on platforms other than wxMSW.
     */
-    static wxFont* New(int pointSize, wxFontFamily family, int style,
+    static wxFont* New(int pointSize, wxFontFamily family, wxFontStyle style,
                        wxFontWeight weight,
-                       const bool underline = false,
-                       const wxString& faceName = "",
+                       bool underline = false,
+                       const wxString& faceName = wxEmptyString,
                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     static wxFont* New(int pointSize, wxFontFamily family,
                        int flags = wxFONTFLAG_DEFAULT,
-                       const wxString& faceName = "",
+                       const wxString& faceName = wxEmptyString,
                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     static wxFont* New(const wxSize& pixelSize,
                        wxFontFamily family,
-                       int style,
+                       wxFontStyle style,
                        wxFontWeight weight,
-                       const bool underline = false,
-                       const wxString& faceName = "",
+                       bool underline = false,
+                       const wxString& faceName = wxEmptyString,
                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     static wxFont* New(const wxSize& pixelSize,
                        wxFontFamily family,
                        int flags = wxFONTFLAG_DEFAULT,
-                       const wxString& faceName = "",
+                       const wxString& faceName = wxEmptyString,
                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     //@}
 
@@ -529,7 +529,7 @@ public:
 
         @see GetFamily(), SetFaceName()
     */
-    void SetFamily(wxFontFamily family);
+    virtual void SetFamily(wxFontFamily family);
 
     /**
         Creates the font corresponding to the given native font description string
@@ -586,7 +586,7 @@ public:
 
         @see GetStyle()
     */
-    void SetStyle(wxFontStyle style);
+    virtual void SetStyle(wxFontStyle style);
 
     /**
         Sets underlining.
@@ -606,7 +606,7 @@ public:
 
         @see GetWeight()
     */
-    void SetWeight(wxFontWeight weight);
+    virtual void SetWeight(wxFontWeight weight);
 
     /**
         Inequality operator.
@@ -692,10 +692,9 @@ public:
         Finds a font of the given specification, or creates one and adds it to the
         list. See the @ref wxFont "wxFont constructor" for details of the arguments.
     */
-    wxFont* FindOrCreateFont(int point_size, int family, int style,
-                             int weight,
-                             bool underline = false,
-                             const wxString& facename = NULL,
+    wxFont* FindOrCreateFont(int point_size, wxFontFamily family, wxFontStyle style,
+                             wxFontWeight weight, bool underline = false,
+                             const wxString& facename = wxEmptyString,
                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 };
 
@@ -710,7 +709,7 @@ wxFontList* wxTheFontList;
 // Global functions/macros
 // ============================================================================
 
-/** @ingroup group_funcmacro_misc */
+/** @addtogroup group_funcmacro_misc */
 //@{
 
 /**