From acc824adc4b6390c80bc36ee394480160906839c Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Wed, 8 Jun 2016 22:14:50 -0700 Subject: [PATCH] Fix building/running with GTK+ < 2.14 See https://github.com/wxWidgets/wxWidgets/pull/293 --- src/gtk/mimetype.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gtk/mimetype.cpp b/src/gtk/mimetype.cpp index 33b5797516..000d44632d 100644 --- a/src/gtk/mimetype.cpp +++ b/src/gtk/mimetype.cpp @@ -22,6 +22,11 @@ wxString wxGTKMimeTypesManagerImpl::GetIconFromMimeType(const wxString& mime) { wxString icon; +#if GTK_CHECK_VERSION(2,14,0) +#ifndef __WXGTK3__ + if (gtk_check_version(2,14,0)) + return icon; +#endif wxGtkString type(g_content_type_from_mime_type(mime.utf8_str())); wxGtkObject gicon(g_content_type_get_icon(type)); @@ -50,7 +55,7 @@ wxString wxGTKMimeTypesManagerImpl::GetIconFromMimeType(const wxString& mime) gtk_icon_info_free(giconinfo); wxGCC_WARNING_RESTORE() } - +#endif // GTK_CHECK_VERSION(2,14,0) return icon; }