From 4901b3784aeda36fea25671b964d7c53b492244b Mon Sep 17 00:00:00 2001 From: Lauri Nurmi Date: Sun, 19 Jan 2020 23:26:44 +0200 Subject: [PATCH 1/3] Fix wxGTK build when configured with --disable-intl That is, #include scopedptr.h explicitly in nonownedwnd.cpp. --- src/gtk/nonownedwnd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gtk/nonownedwnd.cpp b/src/gtk/nonownedwnd.cpp index 36f2dd9db0..dcc34a500b 100644 --- a/src/gtk/nonownedwnd.cpp +++ b/src/gtk/nonownedwnd.cpp @@ -27,6 +27,7 @@ #include "wx/dcclient.h" #include "wx/dcmemory.h" #include "wx/region.h" + #include "wx/scopedptr.h" #endif // WX_PRECOMP #include "wx/graphics.h" From 04d71c80e35e5108a1d6ff08b66262bea72f05f7 Mon Sep 17 00:00:00 2001 From: Lauri Nurmi Date: Sun, 19 Jan 2020 23:34:45 +0200 Subject: [PATCH 2/3] Fix build when configured with --disable-sysoptions --- src/common/filesys.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 3df18603bd..a72b101059 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -130,7 +130,6 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) return mime; } - else #endif { if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(wxT("html"), false) ) From cc91065c83efa3a788964754e662625b81f3b166 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 20 Jan 2020 21:57:36 +0100 Subject: [PATCH 3/3] Remove an extra block needed after the previous commit Also add a comment for clarity. No real changes. --- src/common/filesys.cpp | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index a72b101059..6b687d96e7 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -130,20 +130,21 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) return mime; } -#endif - { - if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(wxT("html"), false) ) - return wxT("text/html"); - if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(wxT("jpeg"), false) ) - return wxT("image/jpeg"); - if ( ext.IsSameAs(wxT("gif"), false) ) - return wxT("image/gif"); - if ( ext.IsSameAs(wxT("png"), false) ) - return wxT("image/png"); - if ( ext.IsSameAs(wxT("bmp"), false) ) - return wxT("image/bmp"); - return wxEmptyString; - } +#endif // wxUSE_MIMETYPE + + // Without wxUSE_MIMETYPE, recognize just a few hardcoded special cases. + if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(wxT("html"), false) ) + return wxT("text/html"); + if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(wxT("jpeg"), false) ) + return wxT("image/jpeg"); + if ( ext.IsSameAs(wxT("gif"), false) ) + return wxT("image/gif"); + if ( ext.IsSameAs(wxT("png"), false) ) + return wxT("image/png"); + if ( ext.IsSameAs(wxT("bmp"), false) ) + return wxT("image/bmp"); + + return wxString(); }