wxWidgets3: update to svn r70933
This commit is contained in:
1 parent
0ed8af2287
commit
a648aca65c
906 files changed
+39465
-17241
No files matched your search
+13
-1
@@ -4,7 +4,7 @@
|
||||
// wxInputStream and wxOutputStream
|
||||
// Author: Jonathan Liu <[email protected]>
|
||||
// Created: 2009-05-02
|
||||
// RCS-ID: $Id: stdstream.h 64924 2010-07-12 22:50:51Z VZ $
|
||||
// RCS-ID: $Id: stdstream.h 70515 2012-02-05 14:18:37Z VZ $
|
||||
// Copyright: (c) 2009 Jonathan Liu
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -47,6 +47,18 @@ protected:
|
||||
virtual int uflow();
|
||||
virtual int pbackfail(int c = EOF);
|
||||
|
||||
// Special work around for VC8/9 (this bug was fixed in VC10 and later):
|
||||
// these versions have non-standard _Xsgetn_s() that it being called from
|
||||
// the stream code instead of xsgetn() and so our overridden implementation
|
||||
// never actually gets used. To work around this, forward to it explicitly.
|
||||
#if defined(__VISUALC8__) || defined(__VISUALC9__)
|
||||
virtual std::streamsize
|
||||
_Xsgetn_s(char *s, size_t WXUNUSED(size), std::streamsize n)
|
||||
{
|
||||
return xsgetn(s, n);
|
||||
}
|
||||
#endif // VC8 or VC9
|
||||
|
||||
wxInputStream& m_stream;
|
||||
int m_lastChar;
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user