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

Do NOT have method GetIconFromMimeType except under Unix.

Browse Source
This commit is contained in:
Tim S
2017-03-07 12:43:12 -05:00
parent 2a64f15c17
commit a6f5a45cad
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/mimetype.h
View File

@@ -25,8 +25,6 @@ class WXDLLIMPEXP_CORE wxGTKMimeTypesManagerImpl : public wxMimeTypesManagerImpl
protected: protected:
#if defined(__UNIX__) #if defined(__UNIX__)
wxString GetIconFromMimeType(const wxString& mime) wxOVERRIDE; wxString GetIconFromMimeType(const wxString& mime) wxOVERRIDE;
#else
wxString GetIconFromMimeType(const wxString& mime);
#endif #endif
}; };

2
src/gtk/mimetype.cpp
View File

@@ -19,6 +19,7 @@
#include "wx/gtk/private/string.h" #include "wx/gtk/private/string.h"
#include "wx/gtk/private/object.h" #include "wx/gtk/private/object.h"
#if defined(__UNIX__)
wxString wxGTKMimeTypesManagerImpl::GetIconFromMimeType(const wxString& mime) wxString wxGTKMimeTypesManagerImpl::GetIconFromMimeType(const wxString& mime)
{ {
wxString icon; wxString icon;
@@ -58,6 +59,7 @@ wxString wxGTKMimeTypesManagerImpl::GetIconFromMimeType(const wxString& mime)
#endif // GTK_CHECK_VERSION(2,14,0) #endif // GTK_CHECK_VERSION(2,14,0)
return icon; return icon;
} }
#endif // defined(__UNIX__)
wxMimeTypesManagerImpl *wxGTKMimeTypesManagerFactory::CreateMimeTypesManagerImpl() wxMimeTypesManagerImpl *wxGTKMimeTypesManagerFactory::CreateMimeTypesManagerImpl()
{ {