From: Vadim Zeitlin Date: Wed, 5 Mar 2008 12:39:59 +0000 (+0000) Subject: disable wxHAS_TEXT_WINDOW_STREAM for the old MSVC iostream.h library; don't disable... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8ca2ebc8f1e6baf7a9dc1b0c944462abdfbbb923?ds=inline disable wxHAS_TEXT_WINDOW_STREAM for the old MSVC iostream.h library; don't disable it for DLL builds (why?) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index b86137bc11..926e6c226b 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -25,13 +25,11 @@ #include "wx/dynarray.h" // wxArrayInt #include "wx/gdicmn.h" // wxPoint -// Open Watcom 1.3 does allow only ios::rdbuf() while -// we want something with streambuf parameter -// Also, can't use streambuf if making or using a DLL :-( - +// some compilers don't have standard compliant rdbuf() (and MSVC has it only +// in its new iostream library, not in the old one used with iostream.h) #if defined(__WATCOMC__) || \ defined(__MWERKS__) || \ - (defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL))) + ((defined(__VISUALC5__) || defined(__VISUALC6__)) && wxUSE_IOSTREAMH) #define wxHAS_TEXT_WINDOW_STREAM 0 #elif wxUSE_STD_IOSTREAM #include "wx/ioswrap.h"