Added a bug report; C++Builder compile fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/bugs.txt b/docs/bugs.txt
index 6944b9e5956c115f5ca8c89a6e902b65b06693d7..61544ddc9c2302eb8e636fb590d16b18a2969599 100644 (file)
--- a/docs/bugs.txt
+++ b/docs/bugs.txt
@@ -88,6 +88,21 @@ PLATFORMS: wxGTK
 DATE IDENTIFIED: 10/11/1999
 IDENTIFIED BY: Jonathan Brown <jbrown@sso.sytexinc.com>
 
+BUG NUMBER:             5
+SHORT DESCRIPTION: no vertical space inside wxHTML
+DETAILS: We are working on making a demonstration of projects we do here
+using Python & wxWindows & HTML (wxPython/wxHTML thus). We 'd like to
+have the opportunity to specify vertical space, eg <br><br>, or <p><p>
+in HTML. These constructs currently do not work. I looked in the source
+code (nice job btw), but am not sure where to hack the solution. I
+am willing to discuss this in more detail. 
+WORKAROUND: Create a transparent gif of 1x1 pixel and use width & height
+to fool the renderer
+wxWINDOWS VERSION: wxWindows 2.1.11
+PLATFORMS: Windows + Python 1.5
+DATE IDENTIFIED: 10/11/1999
+IDENTIFIED BY: A.T.Hofkamp
+
 
 ---------------------------END OF BUGLIST-------------------------
 

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index bcf7216e306a467ea2cdd474c53eabec66705393..d76043d8723cbedd2848043ad537f2b30f876832 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -411,6 +411,13 @@
 #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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 75396ac0b79c2c34f63184a6d2cce903c25f57dd..ffe6190badfddd6df65236dfdf9d1189d28f8c16 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -169,15 +169,19 @@ typedef  _TUCHAR     wxUChar;
 #  endif
    // wchar_t is available
 #  undef wxUSE_WCHAR_T
+// This test is for C++Builder
+#if __BORLANDC__ == 0x530
+#  define wxUSE_WCHAR_T 0
+#elif
 #  define wxUSE_WCHAR_T 1
-
+#  define wxNEED_WCSLEN
+#endif
 #  define wxNEED_WX_CTYPE_H
 // #define  wxStrtok    strtok_r // Borland C++ 4.52 doesn't have strtok_r
 #  define wxNEED_WX_STRING_H
 #  define wxNEED_WX_STDIO_H
 #  define wxNEED_WX_STDLIB_H
 #  define wxNEED_WX_TIME_H
-#  define wxNEED_WCSLEN
 
 #else//!TCHAR-aware compilers