fix few doxygen warnings

[wxWidgets.git] / interface / wx / font.h

diff --git a/interface/wx/font.h b/interface/wx/font.h
index e4e99ae1dc566d0c4f43d6304d6f35ccc5f0fbb1..193dbaae1f809dd3ea3926da558605ea0ff951d1 100644 (file)
--- 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.
     */
         @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,
            bool underline = false,
            wxFontWeight weight,
            bool underline = false,

-           const wxString& faceName = "",
+           const wxString& faceName = wxEmptyString,

            wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
     /**
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
     /**


@@ -360,9 +360,9 @@ public:
                  chosen. Under Windows, only scalable TrueType fonts are used.
     */
     wxFont(const wxSize& pixelSize, wxFontFamily family,
                  chosen. Under Windows, only scalable TrueType fonts are used.
     */
     wxFont(const wxSize& pixelSize, wxFontFamily family,

-           int style, wxFontWeight weight,
+           wxFontStyle style, wxFontWeight weight,

            bool underline = false,
            bool underline = false,

-           const wxString& faceName = "",
+           const wxString& faceName = wxEmptyString,

            wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     //@}
 
            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.
     */
         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,
                        bool underline = false,
                        wxFontWeight weight,
                        bool underline = false,

-                       const wxString& faceName = "",
+                       const wxString& faceName = wxEmptyString,

                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     static wxFont* New(int pointSize, wxFontFamily family,
                        int flags = wxFONTFLAG_DEFAULT,
                        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,
                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     static wxFont* New(const wxSize& pixelSize,
                        wxFontFamily family,

-                       int style,
+                       wxFontStyle style,

                        wxFontWeight weight,
                        bool underline = false,
                        wxFontWeight weight,
                        bool underline = false,

-                       const wxString& faceName = "",
+                       const wxString& faceName = wxEmptyString,

                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     static wxFont* New(const wxSize& pixelSize,
                        wxFontFamily family,
                        int flags = wxFONTFLAG_DEFAULT,
                        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);
     //@}
 
                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     //@}