Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

synchronizing the definition of wxLoadQueryNearestFont

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jouk Jansen
2014-02-03 14:06:40 +00:00
parent 95695c0a9f
commit b09a481c2e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/unix/fontutil.h
View File

@@ -23,8 +23,8 @@
extern wxNativeFont extern wxNativeFont
wxLoadQueryNearestFont(int pointSize, wxLoadQueryNearestFont(int pointSize,
int family, int family,
int style, wxFontStyle style,
int weight, wxFontWeight weight,
bool underlined, bool underlined,
const wxString &facename, const wxString &facename,
wxFontEncoding encoding, wxFontEncoding encoding,

4
src/unix/fontutil.cpp
View File

@@ -1079,8 +1079,8 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
// first round: search for equal, then for smaller and for larger size // first round: search for equal, then for smaller and for larger size
// with the given weight and style // with the given weight and style
int testweight = weight; wxFontWeight testweight = weight;
int teststyle = style; wxFontStyle teststyle = style;
for ( round = 0; round < 3; round++ ) for ( round = 0; round < 3; round++ )
{ {