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

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

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index 9c74ba67cf90a5ce31f177f57b9c260873db74db..def9fe133390349116b83ec84b35583759da7288 100644 (file)
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -333,7 +333,7 @@ $(CFG): makefile.b32
 -WE
 -tWM
 
--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
 -I$(WXDIR)\include\wx\msw\gnuwin32
 
 -L$(BCCDIR)\lib

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 3a502e70d79db0dabdba831ae8383d9122fcb698..a3e8281d27a547c96c29b83c457f51ceea8b46a0 100644 (file)
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -41,6 +41,8 @@
     #define wxLongLongIsLong
 #elif (defined(__VISUALC__) && defined(__WIN32__)) || defined( __VMS__ )
     #define wxLongLong_t __int64
+#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x530)
+    #define wxLongLong_t __int64
 #elif defined(__GNUG__)
     #define wxLongLong_t long long
 #elif defined(__MWERKS__)
@@ -53,7 +55,9 @@
 #else // no native long long type
     // we don't give warnings for the compilers we know about that they don't
     // have any 64 bit integer type
-    #if !defined(__VISAGECPP__) && !defined(__VISUALC__)
+    #if !defined(__VISAGECPP__) && \
+        !defined(__VISUALC__) && \
+        !defined(__BORLANDC__
         #warning "Your compiler does not appear to support 64 bit integers, "\
                  "using emulation class instead."
     #endif // known compilers without long long

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 10e5877e5ab1abdc5cf4a228b972599506f22a38..8685319432773f5b489ef0ba33379f7020c282d2 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -92,7 +92,7 @@
 #endif // broken strptime()
 
 #ifndef WX_TIMEZONE
-    #if defined(__MINGW32__) || defined(__VISAGECPP__)
+    #if defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
         #define WX_TIMEZONE _timezone
     #else // unknown platform - try timezone
         #define WX_TIMEZONE timezone
@@ -2196,7 +2196,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
     }
 
     // and now the interesting part: the timezone
-    int offset;
+    wxDateTime_t offset;
     if ( *p == _T('-') || *p == _T('+') )
     {
         // the explicit offset given: it has the form of hhmm

diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index 2304b540e5b6e8097c38d563594812f7d5b51da1..5fe20263aafae57965ea216e6f306a9d08aece77 100644 (file)
--- a/src/msw/dir.cpp
+++ b/src/msw/dir.cpp
@@ -267,9 +267,12 @@ bool wxDirData::Read(wxString *filename)
     if ( !IsFindDataOk(m_finddata) )
     {
         // open first
-        wxString filespec;
-        filespec << m_dirname << _T('\\')
-                 << (!m_filespec ? _T("*.*") : m_filespec.c_str());
+        wxString filespec = m_dirname;
+        if ( !wxEndsWithPathSeparator(filespec) )
+        {
+            filespec += _T('\\');
+        }
+        filespec += (!m_filespec ? _T("*.*") : m_filespec.c_str());
 
         m_finddata = FindFirst(filespec, PTR_TO_FINDDATA);