From dfb48b47f5fcd5748b0abcb6200b42ae98e8c6ec Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Thu, 1 Nov 2018 11:06:53 -0700 Subject: [PATCH] Add version checks for gtk_widget_get_scale_factor() --- src/gtk/settings.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index c7f3a092a2..fbbe942ab8 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -791,7 +791,12 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) G_CALLBACK(notify_gtk_font_name), NULL); } 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(); gtk_style_context_get(sc, GTK_STATE_FLAG_NORMAL, GTK_STYLE_PROPERTY_FONT, &info.description, NULL); @@ -875,7 +880,11 @@ static int GetScrollbarWidth() if (wx_is_at_least_gtk3(20)) { GtkBorder border; +#if GTK_CHECK_VERSION(3,10,0) wxGtkStyleContext sc(gtk_widget_get_scale_factor(ScrollBarWidget())); +#else + wxGtkStyleContext sc; +#endif sc.Add(GTK_TYPE_SCROLLBAR, "scrollbar", "scrollbar", "vertical", "right", NULL); gtk_style_context_get_border(sc, GTK_STATE_FLAG_NORMAL, &border);