AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix building/running with GTK+ < 2.14

Browse Source 
See https://github.com/wxWidgets/wxWidgets/pull/293
This commit is contained in:
Paul Cornett 2016-06-08 22:14:50 -07:00
parent c3a224690e
commit acc824adc4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtk/mimetype.cpp
View File

@ -22,6 +22,11 @@
wxString wxGTKMimeTypesManagerImpl::GetIconFromMimeType(const wxString& mime) wxString wxGTKMimeTypesManagerImpl::GetIconFromMimeType(const wxString& mime)
{ {
wxString icon; 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())); wxGtkString type(g_content_type_from_mime_type(mime.utf8_str()));
wxGtkObject<GIcon> gicon(g_content_type_get_icon(type)); wxGtkObject<GIcon> gicon(g_content_type_get_icon(type));
@ -50,7 +55,7 @@ wxString wxGTKMimeTypesManagerImpl::GetIconFromMimeType(const wxString& mime)
gtk_icon_info_free(giconinfo); gtk_icon_info_free(giconinfo);
wxGCC_WARNING_RESTORE() wxGCC_WARNING_RESTORE()
} }
#endif // GTK_CHECK_VERSION(2,14,0)
return icon; return icon;
} }