From b09a481c2e8fe55f2f7cf027e2d89993684a0a60 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Mon, 3 Feb 2014 14:06:40 +0000 Subject: [PATCH] synchronizing the definition of wxLoadQueryNearestFont git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/unix/fontutil.h | 4 ++-- src/unix/fontutil.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/unix/fontutil.h b/include/wx/unix/fontutil.h index 64cb3a3ccd..a4cf16580a 100644 --- 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, diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp index e61dbae125..f6d6795a75 100644 --- 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++ ) {