Merge branch 'msvc-warns'

Fix an annoying MSVC warning in SDK headers.

Remove wxUSE_IOSTREAMH.

See https://github.com/wxWidgets/wxWidgets/pull/1614
This commit is contained in:
Vadim Zeitlin
2019-10-23 19:50:14 +02:00
29 changed files with 34 additions and 279 deletions

View File

@@ -29,7 +29,7 @@
#endif
#if wxUSE_STD_IOSTREAM
#include "wx/ioswrap.h"
#include <iostream>
#else
#include "wx/txtstrm.h"
#endif

View File

@@ -32,13 +32,8 @@
#undef new
#endif
#include "wx/ioswrap.h"
#if wxUSE_IOSTREAMH
#include <fstream.h>
#else
#include <fstream>
#endif
#include <iostream>
#include <fstream>
#include "wx/wfstream.h"
#include "wx/datstrm.h"

View File

@@ -40,7 +40,6 @@
#endif
#include "wx/sizer.h"
#include "wx/ioswrap.h"
#include "widgets.h"