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

Merge branch 'fix-build-when-something-disabled'

Browse Source 
Fix build when using --disable-{intl,sysoptions}.

See https://github.com/wxWidgets/wxWidgets/pull/1712
This commit is contained in:
Vadim Zeitlin
2020-01-22 03:17:47 +01:00
parent 565034aa49 cc91065c83
commit d1da66b5f2
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/filesys.cpp
View File

@@ -130,9 +130,9 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
return mime; return mime;
} }
else #endif // wxUSE_MIMETYPE
#endif
{ // Without wxUSE_MIMETYPE, recognize just a few hardcoded special cases.
if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(wxT("html"), false) ) if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(wxT("html"), false) )
return wxT("text/html"); return wxT("text/html");
if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(wxT("jpeg"), false) ) if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(wxT("jpeg"), false) )
@@ -143,8 +143,8 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
return wxT("image/png"); return wxT("image/png");
if ( ext.IsSameAs(wxT("bmp"), false) ) if ( ext.IsSameAs(wxT("bmp"), false) )
return wxT("image/bmp"); return wxT("image/bmp");
return wxEmptyString;
} return wxString();
} }

1
src/gtk/nonownedwnd.cpp
View File

@@ -27,6 +27,7 @@
#include "wx/dcclient.h" #include "wx/dcclient.h"
#include "wx/dcmemory.h" #include "wx/dcmemory.h"
#include "wx/region.h" #include "wx/region.h"
#include "wx/scopedptr.h"
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/graphics.h" #include "wx/graphics.h"