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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-12-23 14:05:21 +00:00
parent fb10f04c95
commit ad0dc53bff
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
distrib/msw/tmake/b32.t
View File

@@ -333,7 +333,7 @@ $(CFG): makefile.b32
-WE -WE
-tWM -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 -I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib -L$(BCCDIR)\lib

6
include/wx/longlong.h
View File

@@ -41,6 +41,8 @@
#define wxLongLongIsLong #define wxLongLongIsLong
#elif (defined(__VISUALC__) && defined(__WIN32__)) || defined( __VMS__ ) #elif (defined(__VISUALC__) && defined(__WIN32__)) || defined( __VMS__ )
#define wxLongLong_t __int64 #define wxLongLong_t __int64
#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x530)
#define wxLongLong_t __int64
#elif defined(__GNUG__) #elif defined(__GNUG__)
#define wxLongLong_t long long #define wxLongLong_t long long
#elif defined(__MWERKS__) #elif defined(__MWERKS__)
@@ -53,7 +55,9 @@
#else // no native long long type #else // no native long long type
// we don't give warnings for the compilers we know about that they don't // we don't give warnings for the compilers we know about that they don't
// have any 64 bit integer type // 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, "\ #warning "Your compiler does not appear to support 64 bit integers, "\
"using emulation class instead." "using emulation class instead."
#endif // known compilers without long long #endif // known compilers without long long

4
src/common/datetime.cpp
View File

@@ -92,7 +92,7 @@
#endif // broken strptime() #endif // broken strptime()
#ifndef WX_TIMEZONE #ifndef WX_TIMEZONE
#if defined(__MINGW32__) || defined(__VISAGECPP__) #if defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
#define WX_TIMEZONE _timezone #define WX_TIMEZONE _timezone
#else // unknown platform - try timezone #else // unknown platform - try timezone
#define WX_TIMEZONE timezone #define WX_TIMEZONE timezone
@@ -2196,7 +2196,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
} }
// and now the interesting part: the timezone // and now the interesting part: the timezone
int offset; wxDateTime_t offset;
if ( *p == _T('-') || *p == _T('+') ) if ( *p == _T('-') || *p == _T('+') )
{ {
// the explicit offset given: it has the form of hhmm // the explicit offset given: it has the form of hhmm

9
src/msw/dir.cpp
View File

@@ -267,9 +267,12 @@ bool wxDirData::Read(wxString *filename)
if ( !IsFindDataOk(m_finddata) ) if ( !IsFindDataOk(m_finddata) )
{ {
// open first // open first
wxString filespec; wxString filespec = m_dirname;
filespec << m_dirname << _T('\\') if ( !wxEndsWithPathSeparator(filespec) )
<< (!m_filespec ? _T("*.*") : m_filespec.c_str()); {
filespec += _T('\\');
}
filespec += (!m_filespec ? _T("*.*") : m_filespec.c_str());
m_finddata = FindFirst(filespec, PTR_TO_FINDDATA); m_finddata = FindFirst(filespec, PTR_TO_FINDDATA);