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

Only use underline-rgba property with GTK > 3.16

Browse Source 
This avoids glib warnings

object class 'GtkTextTag' has no property named 'underline-rgba-set'

when calling g_object_get() with older GTK and just avoids doing useless
work.
This commit is contained in:
Vadim Zeitlin
2019-11-04 22:54:42 +01:00
parent a03e2b8b4f
commit 6421ddb9b2
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gtk/textctrl.cpp
View File

@@ -1924,6 +1924,8 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style)
wxColour underlineColour = wxNullColour; wxColour underlineColour = wxNullColour;
#ifdef __WXGTK3__ #ifdef __WXGTK3__
if ( wx_is_at_least_gtk3(16) )
{
GSList* tags = gtk_text_iter_get_tags(&positioni); GSList* tags = gtk_text_iter_get_tags(&positioni);
for ( GSList* tagp = tags; tagp != NULL; tagp = tagp->next ) for ( GSList* tagp = tags; tagp != NULL; tagp = tagp->next )
{ {
@@ -1942,6 +1944,7 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style)
} }
if ( tags ) if ( tags )
g_slist_free(tags); g_slist_free(tags);
}
#endif #endif
if ( underlineType != wxTEXT_ATTR_UNDERLINE_NONE ) if ( underlineType != wxTEXT_ATTR_UNDERLINE_NONE )