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

Add version checks for gtk_widget_get_scale_factor()

Browse Source
This commit is contained in:
Paul Cornett
2018-11-01 11:06:53 -07:00
parent ed442cd574
commit dfb48b47f5
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/settings.cpp
View File

@@ -791,7 +791,12 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
G_CALLBACK(notify_gtk_font_name), NULL); G_CALLBACK(notify_gtk_font_name), NULL);
} }
ContainerWidget(); ContainerWidget();
wxGtkStyleContext sc(gtk_widget_get_scale_factor(gs_tlw_parent)); int scale = 1;
#if GTK_CHECK_VERSION(3,10,0)
if (wx_is_at_least_gtk3(10))
scale = gtk_widget_get_scale_factor(gs_tlw_parent);
#endif
wxGtkStyleContext sc(scale);
sc.AddButton().AddLabel(); sc.AddButton().AddLabel();
gtk_style_context_get(sc, GTK_STATE_FLAG_NORMAL, gtk_style_context_get(sc, GTK_STATE_FLAG_NORMAL,
GTK_STYLE_PROPERTY_FONT, &info.description, NULL); GTK_STYLE_PROPERTY_FONT, &info.description, NULL);
@@ -875,7 +880,11 @@ static int GetScrollbarWidth()
if (wx_is_at_least_gtk3(20)) if (wx_is_at_least_gtk3(20))
{ {
GtkBorder border; GtkBorder border;
#if GTK_CHECK_VERSION(3,10,0)
wxGtkStyleContext sc(gtk_widget_get_scale_factor(ScrollBarWidget())); wxGtkStyleContext sc(gtk_widget_get_scale_factor(ScrollBarWidget()));
#else
wxGtkStyleContext sc;
#endif
sc.Add(GTK_TYPE_SCROLLBAR, "scrollbar", "scrollbar", "vertical", "right", NULL); sc.Add(GTK_TYPE_SCROLLBAR, "scrollbar", "scrollbar", "vertical", "right", NULL);
gtk_style_context_get_border(sc, GTK_STATE_FLAG_NORMAL, &border); gtk_style_context_get_border(sc, GTK_STATE_FLAG_NORMAL, &border);