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:
Vadim Zeitlin
1999-12-26 21:52:50 +00:00
parent 6957717a00
commit 9c2882d9e1
11 changed files with 44 additions and 50 deletions

View File

@@ -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