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

fixed bug in wxCalendarCtrl (132199) and bug in wxDateTime::IsSameDate() this fix discovered

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-02-13 17:55:26 +00:00
parent d52e91c980
commit f41cb81efc
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changes.txt
View File

@@ -12,10 +12,12 @@ wxBase:
- wxMimeTypesManager now can create file associations too - wxMimeTypesManager now can create file associations too
- wxCopyFile() respects the file permissions (Roland Scholz) - wxCopyFile() respects the file permissions (Roland Scholz)
- wxFTP::GetFileSize() added (S<>ren Erland Vest<73>) - wxFTP::GetFileSize() added (S<>ren Erland Vest<73>)
- wxDateTime::IsSameDate() bug fixed
All (GUI): All (GUI):
- new wxToggleButton class (John Norris, Axel Schlueter) - new wxToggleButton class (John Norris, Axel Schlueter)
- wxCalendarCtrl now highlighting the date with time part bug fixed
wxMSW: wxMSW:

7
include/wx/datetime.inl
View File

@@ -249,7 +249,12 @@ inline bool wxDateTime::IsBetween(const wxDateTime& t1,
inline bool wxDateTime::IsSameDate(const wxDateTime& dt) const inline bool wxDateTime::IsSameDate(const wxDateTime& dt) const
{ {
return (m_time - dt.m_time).Abs() < MILLISECONDS_PER_DAY; Tm tm1 = GetTm(),
tm2 = dt.GetTm();
return tm1.year == tm2.year &&
tm1.mon == tm2.mon &&
tm1.mday == tm2.mday;
} }
inline bool wxDateTime::IsSameTime(const wxDateTime& dt) const inline bool wxDateTime::IsSameTime(const wxDateTime& dt) const

4
src/generic/calctrl.cpp
View File

@@ -480,7 +480,7 @@ wxSize wxCalendarCtrl::DoGetBestSize() const
if ( GetWindowStyle() & (wxRAISED_BORDER | wxSUNKEN_BORDER) ) if ( GetWindowStyle() & (wxRAISED_BORDER | wxSUNKEN_BORDER) )
{ {
// the border would clip the last line otherwise // the border would clip the last line otherwise
height += 4; height += 6;
} }
return wxSize(width, height); return wxSize(width, height);
@@ -648,7 +648,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
wxCalendarDateAttr *attr = m_attrs[day - 1]; wxCalendarDateAttr *attr = m_attrs[day - 1];
bool isSel = m_date == date; bool isSel = date.IsSameDate(m_date);
if ( isSel ) if ( isSel )
{ {
dc.SetTextForeground(m_colHighlightFg); dc.SetTextForeground(m_colHighlightFg);