1. wxCalendarCtrl
2. several wxDateTime bugs corrected, a couple of missing functions added 3. GetBestSize() corrections for several wxGTK controls 4. wxStaticLine doesn't get focus any more under MSW 5. added DoMoveWindow() to wxMotif git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -363,6 +363,14 @@ public:
|
||||
Name_Abbr = 0x02 // return abbreviated name
|
||||
};
|
||||
|
||||
// flags for GetWeekOfYear and GetWeekOfMonth
|
||||
enum WeekFlags
|
||||
{
|
||||
Default_First, // Sunday_First for US, Monday_First for the rest
|
||||
Monday_First, // week starts with a Monday
|
||||
Sunday_First // week starts with a Sunday
|
||||
};
|
||||
|
||||
// helper classes
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
@@ -767,10 +775,12 @@ public:
|
||||
wxDateTime_t GetDayOfYear(const TimeZone& tz = Local) const;
|
||||
// get the week number since the year start (1..52 or 53, 0 if date is
|
||||
// invalid)
|
||||
wxDateTime_t GetWeekOfYear(const TimeZone& tz = Local) const;
|
||||
wxDateTime_t GetWeekOfYear(WeekFlags flags = Monday_First,
|
||||
const TimeZone& tz = Local) const;
|
||||
// get the week number since the month start (1..5, 0 if date is
|
||||
// invalid)
|
||||
wxDateTime_t GetWeekOfMonth(const TimeZone& tz = Local) const;
|
||||
wxDateTime_t GetWeekOfMonth(WeekFlags flags = Monday_First,
|
||||
const TimeZone& tz = Local) const;
|
||||
|
||||
// is this date a work day? This depends on a country, of course,
|
||||
// because the holidays are different in different countries
|
||||
@@ -881,6 +891,9 @@ public:
|
||||
wxString FormatDate() const { return Format(_T("%x")); }
|
||||
// preferred time representation for the current locale
|
||||
wxString FormatTime() const { return Format(_T("%X")); }
|
||||
// return the string representing the date in ISO 8601 format
|
||||
// (YYYY-MM-DD)
|
||||
wxString FormatISODate() const { return Format(_T("%Y-%m-%d")); }
|
||||
|
||||
// implementation
|
||||
// ------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user