1. misc compilation (errors, warnings) fixes (from the build logs)
2. fixed a bug in wxGTK::wxGetResource git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -179,11 +179,11 @@ public:
|
||||
|
||||
wxDate Previous(int dayOfWeek) const
|
||||
{
|
||||
wxDate prev = *this;
|
||||
int dow = GetDayOfWeek();
|
||||
if ( dayOfWeek <= dow )
|
||||
return *this - (dow - dayOfWeek);
|
||||
else
|
||||
return *this - 7 + (dayOfWeek - dow);
|
||||
prev -= dayOfWeek > dow ? 7 - (dayOfWeek - dow) : dow - dayOfWeek;
|
||||
|
||||
return prev;
|
||||
}
|
||||
|
||||
wxString FormatDate(int type = -1) const
|
||||
|
@@ -848,7 +848,7 @@ public:
|
||||
// default to Today() otherwise)
|
||||
const wxChar *ParseFormat(const wxChar *date,
|
||||
const wxChar *format = _T("%c"),
|
||||
const wxDateTime& dateDef = ms_InvDateTime);
|
||||
const wxDateTime& dateDef = wxDateTime::ms_InvDateTime);
|
||||
// parse a string containing the date/time in "free" format, this
|
||||
// function will try to make an educated guess at the string contents
|
||||
const wxChar *ParseDateTime(const wxChar *datetime);
|
||||
|
@@ -401,10 +401,10 @@ wxDateSpan::operator+=(const wxDateSpan& other)
|
||||
|
||||
wxDateSpan& wxDateSpan::Multiply(int factor)
|
||||
{
|
||||
m_years *= m_years;
|
||||
m_months *= m_months;
|
||||
m_weeks *= m_weeks;
|
||||
m_days *= m_days;
|
||||
m_years *= factor;
|
||||
m_months *= factor;
|
||||
m_weeks *= factor;
|
||||
m_days *= factor;
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
@@ -55,14 +55,10 @@
|
||||
#error "See the documentation on the 'longlong' pragma."
|
||||
#endif
|
||||
#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 0 // !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
|
||||
// both warning and pragma warning are not portable, but at least an
|
||||
// unknown pragma should never be an error
|
||||
#pragma warning "Your compiler does not appear to support 64 bit "\
|
||||
"integers, using emulation class instead."
|
||||
|
||||
#define wxUSE_LONGLONG_WX 1
|
||||
#endif // compiler
|
||||
|
Reference in New Issue
Block a user