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

patches from Ricky Gonzales <gonzales@pyramid3.net> for BC++ Builder

Browse Source 
compilation


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-11-15 13:57:22 +00:00
parent 7aa4cce853
commit c09f28798b
7 changed files with 632 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/msw/gsockmsw.h
View File

@@ -21,6 +21,9 @@
#include "gsocket.h"
#endif
#if defined(__BORLANDC__)
#include <windows.h>
#endif
#include <winsock.h>
#ifdef __cplusplus

7
include/wx/msw/setup0.h
View File

@@ -402,13 +402,6 @@
#define wxUSE_ODBC 0
#endif
// With C++Builder we get lots of doubly-defined symbols
// when including both winsock.h and winsock2.h
#if defined(__BORLANDC__) && (__BORLANDC__ == 0x530)
#undef wxUSE_SOCKETS
#undef wxUSE_SOCKETS 0
#endif
#if defined(__WXMSW__) && defined(__WATCOMC__)
#undef wxUSE_LIBJPEG
#define wxUSE_LIBJPEG 0

4
include/wx/wxchar.h
View File

@@ -170,9 +170,9 @@ typedef _TUCHAR wxUChar;
// wchar_t is available
# undef wxUSE_WCHAR_T
// This test is for C++Builder
#if __BORLANDC__ == 0x530
#if __BORLANDC__ >= 0x530
# define wxUSE_WCHAR_T 0
#elif
#else
# define wxUSE_WCHAR_T 1
# define wxNEED_WCSLEN
#endif