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

Take into account wxFONTFLAG_STRIKETHROUGH in wxGTK wxFont ctor.

Browse Source 
Honour wxFONTFLAG_STRIKETHROUGH in wxFont ctor taking flags as this is the
only way to create a strike-through font currently.

See #14559.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-09-15 23:16:46 +00:00
parent f33230391a
commit cba4e486a4
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/font.h
View File

@@ -318,6 +318,10 @@ protected:
return (flags & wxFONTFLAG_UNDERLINED) != 0; return (flags & wxFONTFLAG_UNDERLINED) != 0;
} }
static bool GetStrikethroughFromFlags(int flags)
{
return (flags & wxFONTFLAG_STRIKETHROUGH) != 0;
}
private: private:
// the currently default encoding: by default, it's the default system // the currently default encoding: by default, it's the default system

3
src/gtk/font.cpp
View File

@@ -299,7 +299,8 @@ wxFont::wxFont(int pointSize,
GetStyleFromFlags(flags), GetStyleFromFlags(flags),
GetWeightFromFlags(flags), GetWeightFromFlags(flags),
GetUnderlinedFromFlags(flags), GetUnderlinedFromFlags(flags),
false, face, encoding); GetStrikethroughFromFlags(flags),
face, encoding);
} }
bool wxFont::Create( int pointSize, bool wxFont::Create( int pointSize,