merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -17,6 +17,8 @@
|
||||
#pragma interface "datetime.h"
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_DATETIME
|
||||
|
||||
#include <time.h>
|
||||
@@ -657,8 +659,10 @@ public:
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
// set to the given week day in the same week as this one
|
||||
wxDateTime& SetToWeekDayInSameWeek(WeekDay weekday);
|
||||
inline wxDateTime GetWeekDayInSameWeek(WeekDay weekday) const;
|
||||
wxDateTime& SetToWeekDayInSameWeek(WeekDay weekday,
|
||||
WeekFlags flags = Monday_First);
|
||||
inline wxDateTime GetWeekDayInSameWeek(WeekDay weekday,
|
||||
WeekFlags flags = Monday_First) const;
|
||||
|
||||
// set to the next week day following this one
|
||||
wxDateTime& SetToNextWeekDay(WeekDay weekday);
|
||||
@@ -692,8 +696,12 @@ public:
|
||||
// sets the date to the given day of the given week in the year,
|
||||
// returns TRUE on success and FALSE if given date doesn't exist (e.g.
|
||||
// numWeek is > 53)
|
||||
bool SetToTheWeek(wxDateTime_t numWeek, WeekDay weekday = Mon);
|
||||
inline wxDateTime GetWeek(wxDateTime_t numWeek, WeekDay weekday = Mon) const;
|
||||
bool SetToTheWeek(wxDateTime_t numWeek,
|
||||
WeekDay weekday = Mon,
|
||||
WeekFlags flags = Monday_First);
|
||||
inline wxDateTime GetWeek(wxDateTime_t numWeek,
|
||||
WeekDay weekday = Mon,
|
||||
WeekFlags flags = Monday_First) const;
|
||||
|
||||
// sets the date to the last day of the given (or current) month or the
|
||||
// given (or current) year
|
||||
@@ -843,6 +851,15 @@ public:
|
||||
// adoption of the Gregorian calendar is simply unknown.
|
||||
bool IsGregorianDate(GregorianAdoption country = Gr_Standard) const;
|
||||
|
||||
// dos date and time format
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
// set from the DOS packed format
|
||||
wxDateTime& SetFromDOS(unsigned long ddt);
|
||||
|
||||
// pack the date in DOS format
|
||||
unsigned long GetAsDOS() const;
|
||||
|
||||
// comparison (see also functions below for operator versions)
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
|
Reference in New Issue
Block a user