From cba4e486a4f8ab05674bac6ed8c6bfa58ab25131 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 15 Sep 2012 23:16:46 +0000 Subject: [PATCH] Take into account wxFONTFLAG_STRIKETHROUGH in wxGTK wxFont ctor. 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 --- include/wx/font.h | 4 ++++ src/gtk/font.cpp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/wx/font.h b/include/wx/font.h index 27f42bbca8..b14281221e 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -318,6 +318,10 @@ protected: return (flags & wxFONTFLAG_UNDERLINED) != 0; } + static bool GetStrikethroughFromFlags(int flags) + { + return (flags & wxFONTFLAG_STRIKETHROUGH) != 0; + } private: // the currently default encoding: by default, it's the default system diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 06260392d9..5ff6a3a10f 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -299,7 +299,8 @@ wxFont::wxFont(int pointSize, GetStyleFromFlags(flags), GetWeightFromFlags(flags), GetUnderlinedFromFlags(flags), - false, face, encoding); + GetStrikethroughFromFlags(flags), + face, encoding); } bool wxFont::Create( int pointSize, -- 2.50.0