synchronizing the definition of wxLoadQueryNearestFont

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-02-03 14:06:40 +00:00
parent 95695c0a9f
commit b09a481c2e
2 changed files with 4 additions and 4 deletions
--- a/include/wx/unix/fontutil.h
+++ b/include/wx/unix/fontutil.h
@@ -23,8 +23,8 @@
 extern wxNativeFont
 wxLoadQueryNearestFont(int pointSize,
                       int family,
-                       int style,
-                       int weight,
+                       wxFontStyle style,
+                       wxFontWeight weight,
                       bool underlined,
                       const wxString &facename,
                       wxFontEncoding encoding,
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -1079,8 +1079,8 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,

        // first round: search for equal, then for smaller and for larger size
        // with the given weight and style
-        int testweight = weight;
-        int teststyle = style;
+        wxFontWeight testweight = weight;
+        wxFontStyle teststyle = style;

        for ( round = 0; round < 3; round++ )
        {