patch from Søren Erland Vestø for additional wxCalendarCtrl styles (also moved them all to calctrl.h from defs.h)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -43,6 +43,7 @@ All (GUI):
|
|||||||
- polygon support in wxRegion (Klaas Holwerda)
|
- polygon support in wxRegion (Klaas Holwerda)
|
||||||
- wxStreamToTextRedirector to allow easily redirect cout to wxTextCtrl added
|
- wxStreamToTextRedirector to allow easily redirect cout to wxTextCtrl added
|
||||||
- fixed bug with using wxExecute() to capture huge amounts of output
|
- fixed bug with using wxExecute() to capture huge amounts of output
|
||||||
|
- new wxCalendarCtrl styles added (S<>ren Erland Vest<73>)
|
||||||
- wxDirSelector() added (Paul A. Thiessen)
|
- wxDirSelector() added (Paul A. Thiessen)
|
||||||
|
|
||||||
wxHTML:
|
wxHTML:
|
||||||
|
@@ -56,6 +56,8 @@ is changed, so you will often want to update them in
|
|||||||
\twocolitem{\windowstyle{wxCAL\_SHOW\_HOLIDAYS}}{Highlight holidays in the calendar}
|
\twocolitem{\windowstyle{wxCAL\_SHOW\_HOLIDAYS}}{Highlight holidays in the calendar}
|
||||||
\twocolitem{\windowstyle{wxCAL\_NO\_YEAR\_CHANGE}}{Disable the year changing}
|
\twocolitem{\windowstyle{wxCAL\_NO\_YEAR\_CHANGE}}{Disable the year changing}
|
||||||
\twocolitem{\windowstyle{wxCAL\_NO\_MONTH\_CHANGE}}{Disable the month (and, implicitly, the year) changing}
|
\twocolitem{\windowstyle{wxCAL\_NO\_MONTH\_CHANGE}}{Disable the month (and, implicitly, the year) changing}
|
||||||
|
\twocolitem{\windowstyle{wxCAL\_SHOW\_SURROUNDING\_WEEKS}}{Show the neighbouring weeks in the previous and next months}
|
||||||
|
\twocolitem{\windowstyle{wxCAL\_SEQUENTIAL\_MONTH\_SELECTION}}{Use alternative, more compact, style for the month and year selection controls.}
|
||||||
\end{twocollist}
|
\end{twocollist}
|
||||||
|
|
||||||
The default calendar style is {\tt wxCAL\_SHOW\_HOLIDAYS}.
|
The default calendar style is {\tt wxCAL\_SHOW\_HOLIDAYS}.
|
||||||
|
@@ -25,6 +25,35 @@
|
|||||||
|
|
||||||
#include "wx/datetime.h"
|
#include "wx/datetime.h"
|
||||||
|
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
// wxCalendarCtrl flags
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
enum
|
||||||
|
{
|
||||||
|
// show Sunday as the first day of the week (default)
|
||||||
|
wxCAL_SUNDAY_FIRST = 0x0000,
|
||||||
|
|
||||||
|
// show Monder as the first day of the week
|
||||||
|
wxCAL_MONDAY_FIRST = 0x0001,
|
||||||
|
|
||||||
|
// highlight holidays
|
||||||
|
wxCAL_SHOW_HOLIDAYS = 0x0002,
|
||||||
|
|
||||||
|
// disable the year change control, show only the month change one
|
||||||
|
wxCAL_NO_YEAR_CHANGE = 0x0004,
|
||||||
|
|
||||||
|
// don't allow changing neither month nor year (implies
|
||||||
|
// wxCAL_NO_YEAR_CHANGE)
|
||||||
|
wxCAL_NO_MONTH_CHANGE = 0x000c,
|
||||||
|
|
||||||
|
// use MS-style month-selection instead of combo-spin combination
|
||||||
|
wxCAL_SEQUENTIAL_MONTH_SELECTION = 0x0010,
|
||||||
|
|
||||||
|
// show the neighbouring weeks in the previous and next month
|
||||||
|
wxCAL_SHOW_SURROUNDING_WEEKS = 0x0020
|
||||||
|
};
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// constants
|
// constants
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -34,7 +63,10 @@ enum wxCalendarHitTestResult
|
|||||||
{
|
{
|
||||||
wxCAL_HITTEST_NOWHERE, // outside of anything
|
wxCAL_HITTEST_NOWHERE, // outside of anything
|
||||||
wxCAL_HITTEST_HEADER, // on the header (weekdays)
|
wxCAL_HITTEST_HEADER, // on the header (weekdays)
|
||||||
wxCAL_HITTEST_DAY // on a day in the calendar
|
wxCAL_HITTEST_DAY, // on a day in the calendar
|
||||||
|
wxCAL_HITTEST_INCMONTH,
|
||||||
|
wxCAL_HITTEST_DECMONTH,
|
||||||
|
wxCAL_HITTEST_SURROUNDING_WEEK
|
||||||
};
|
};
|
||||||
|
|
||||||
// border types for a date
|
// border types for a date
|
||||||
|
@@ -1047,15 +1047,6 @@ enum wxBorder
|
|||||||
#define wxHW_SCROLLBAR_NEVER 0x0002
|
#define wxHW_SCROLLBAR_NEVER 0x0002
|
||||||
#define wxHW_SCROLLBAR_AUTO 0x0004
|
#define wxHW_SCROLLBAR_AUTO 0x0004
|
||||||
|
|
||||||
/*
|
|
||||||
* wxCalendarCtrl flags
|
|
||||||
*/
|
|
||||||
#define wxCAL_SUNDAY_FIRST 0x0000
|
|
||||||
#define wxCAL_MONDAY_FIRST 0x0001
|
|
||||||
#define wxCAL_SHOW_HOLIDAYS 0x0002
|
|
||||||
#define wxCAL_NO_YEAR_CHANGE 0x0004
|
|
||||||
#define wxCAL_NO_MONTH_CHANGE 0x000c // no month change => no year change
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* extended dialog specifiers. these values are stored in a different
|
* extended dialog specifiers. these values are stored in a different
|
||||||
* flag and thus do not overlap with other style flags. note that these
|
* flag and thus do not overlap with other style flags. note that these
|
||||||
|
@@ -63,9 +63,19 @@ public:
|
|||||||
// set/get the current date
|
// set/get the current date
|
||||||
// ------------------------
|
// ------------------------
|
||||||
|
|
||||||
void SetDate(const wxDateTime& date);
|
bool SetDate(const wxDateTime& date); // we need to be able to control if the event should be sent in SetDateAndNotify(...)
|
||||||
const wxDateTime& GetDate() const { return m_date; }
|
const wxDateTime& GetDate() const { return m_date; }
|
||||||
|
|
||||||
|
// set/get the range in which selection can occur
|
||||||
|
// ---------------------------------------------
|
||||||
|
|
||||||
|
bool SetLowerDateLimit(const wxDateTime& date = wxDefaultDateTime);
|
||||||
|
const wxDateTime& GetLowerDateLimit() const { return m_lowdate; }
|
||||||
|
bool SetUpperDateLimit(const wxDateTime& date = wxDefaultDateTime);
|
||||||
|
const wxDateTime& GetUpperDateLimit() const { return m_highdate; }
|
||||||
|
|
||||||
|
bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, const wxDateTime& upperdate = wxDefaultDateTime);
|
||||||
|
|
||||||
// calendar mode
|
// calendar mode
|
||||||
// -------------
|
// -------------
|
||||||
|
|
||||||
@@ -189,6 +199,13 @@ private:
|
|||||||
// is this date shown?
|
// is this date shown?
|
||||||
bool IsDateShown(const wxDateTime& date) const;
|
bool IsDateShown(const wxDateTime& date) const;
|
||||||
|
|
||||||
|
// is this date in the given range?
|
||||||
|
bool IsDateInRange(const wxDateTime& date) const;
|
||||||
|
|
||||||
|
// range helpers
|
||||||
|
bool ChangeYear(wxDateTime* target) const;
|
||||||
|
bool ChangeMonth(wxDateTime* target) const;
|
||||||
|
|
||||||
// redraw the given date
|
// redraw the given date
|
||||||
void RefreshDate(const wxDateTime& date);
|
void RefreshDate(const wxDateTime& date);
|
||||||
|
|
||||||
@@ -232,6 +249,16 @@ private:
|
|||||||
wxControl *GetMonthControl() const;
|
wxControl *GetMonthControl() const;
|
||||||
wxControl *GetYearControl() const;
|
wxControl *GetYearControl() const;
|
||||||
|
|
||||||
|
// OnPaint helper-methods
|
||||||
|
|
||||||
|
// Highlight the [fromdate : todate] range using pen and brush
|
||||||
|
void HighlightRange(wxPaintDC* dc, const wxDateTime& fromdate, const wxDateTime& todate, wxPen* pen, wxBrush* brush);
|
||||||
|
|
||||||
|
// Get the "coordinates" for the date relative to the month currently displayed.
|
||||||
|
// using (day, week): upper left coord is (1, 1), lower right coord is (7, 6)
|
||||||
|
// if the date isn't visible (-1, -1) is put in (day, week) and false is returned
|
||||||
|
bool GetDateCoord(const wxDateTime& date, int *day, int *week) const;
|
||||||
|
|
||||||
// the subcontrols
|
// the subcontrols
|
||||||
wxStaticText *m_staticMonth;
|
wxStaticText *m_staticMonth;
|
||||||
wxComboBox *m_comboMonth;
|
wxComboBox *m_comboMonth;
|
||||||
@@ -242,6 +269,10 @@ private:
|
|||||||
// the current selection
|
// the current selection
|
||||||
wxDateTime m_date;
|
wxDateTime m_date;
|
||||||
|
|
||||||
|
// the date-range
|
||||||
|
wxDateTime m_lowdate;
|
||||||
|
wxDateTime m_highdate;
|
||||||
|
|
||||||
// default attributes
|
// default attributes
|
||||||
wxColour m_colHighlightFg,
|
wxColour m_colHighlightFg,
|
||||||
m_colHighlightBg,
|
m_colHighlightBg,
|
||||||
@@ -255,7 +286,11 @@ private:
|
|||||||
|
|
||||||
// the width and height of one column/row in the calendar
|
// the width and height of one column/row in the calendar
|
||||||
wxCoord m_widthCol,
|
wxCoord m_widthCol,
|
||||||
m_heightRow;
|
m_heightRow,
|
||||||
|
m_rowOffset;
|
||||||
|
|
||||||
|
wxRect m_leftArrowRect,
|
||||||
|
m_rightArrowRect;
|
||||||
|
|
||||||
// the week day names
|
// the week day names
|
||||||
wxString m_weekdays[7];
|
wxString m_weekdays[7];
|
||||||
|
@@ -72,7 +72,9 @@ public:
|
|||||||
|
|
||||||
wxCalendarCtrl *GetCal() const { return m_calendar; }
|
wxCalendarCtrl *GetCal() const { return m_calendar; }
|
||||||
|
|
||||||
void StartWithMonday(bool on);
|
// turn on/off the specified style bit on the calendar control
|
||||||
|
void ToggleCalStyle(bool on, int style);
|
||||||
|
|
||||||
void HighlightSpecial(bool on);
|
void HighlightSpecial(bool on);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -100,6 +102,9 @@ public:
|
|||||||
void OnCalAllowMonth(wxCommandEvent& event);
|
void OnCalAllowMonth(wxCommandEvent& event);
|
||||||
void OnCalAllowYear(wxCommandEvent& event);
|
void OnCalAllowYear(wxCommandEvent& event);
|
||||||
|
|
||||||
|
void OnCalSeqMonth(wxCommandEvent& event);
|
||||||
|
void OnCalShowSurroundingWeeks(wxCommandEvent& event);
|
||||||
|
|
||||||
void OnAllowYearUpdate(wxUpdateUIEvent& event);
|
void OnAllowYearUpdate(wxUpdateUIEvent& event);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -124,6 +129,8 @@ enum
|
|||||||
Calendar_Cal_Special,
|
Calendar_Cal_Special,
|
||||||
Calendar_Cal_Month,
|
Calendar_Cal_Month,
|
||||||
Calendar_Cal_Year,
|
Calendar_Cal_Year,
|
||||||
|
Calendar_Cal_SeqMonth,
|
||||||
|
Calendar_Cal_SurroundWeeks,
|
||||||
Calendar_CalCtrl = 1000,
|
Calendar_CalCtrl = 1000,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -145,6 +152,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
|||||||
EVT_MENU(Calendar_Cal_Month, MyFrame::OnCalAllowMonth)
|
EVT_MENU(Calendar_Cal_Month, MyFrame::OnCalAllowMonth)
|
||||||
EVT_MENU(Calendar_Cal_Year, MyFrame::OnCalAllowYear)
|
EVT_MENU(Calendar_Cal_Year, MyFrame::OnCalAllowYear)
|
||||||
|
|
||||||
|
EVT_MENU(Calendar_Cal_SeqMonth, MyFrame::OnCalSeqMonth)
|
||||||
|
EVT_MENU(Calendar_Cal_SurroundWeeks, MyFrame::OnCalShowSurroundingWeeks)
|
||||||
|
|
||||||
EVT_UPDATE_UI(Calendar_Cal_Year, MyFrame::OnAllowYearUpdate)
|
EVT_UPDATE_UI(Calendar_Cal_Year, MyFrame::OnAllowYearUpdate)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
@@ -212,7 +222,15 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
|||||||
menuCal->Append(Calendar_Cal_Special, "Highlight &special dates\tCtrl-S",
|
menuCal->Append(Calendar_Cal_Special, "Highlight &special dates\tCtrl-S",
|
||||||
"Test custom highlighting",
|
"Test custom highlighting",
|
||||||
TRUE);
|
TRUE);
|
||||||
|
menuCal->Append(Calendar_Cal_SurroundWeeks,
|
||||||
|
"Show s&urrounding weeks\tCtrl-W",
|
||||||
|
"Show the neighbouring weeks in the prev/next month",
|
||||||
|
TRUE);
|
||||||
menuCal->AppendSeparator();
|
menuCal->AppendSeparator();
|
||||||
|
menuCal->Append(Calendar_Cal_SeqMonth,
|
||||||
|
"To&ggle month selector style\tCtrl-G",
|
||||||
|
"Use another style for the calendar controls",
|
||||||
|
TRUE);
|
||||||
menuCal->Append(Calendar_Cal_Month, "&Month can be changed\tCtrl-M",
|
menuCal->Append(Calendar_Cal_Month, "&Month can be changed\tCtrl-M",
|
||||||
"Allow changing the month in the calendar",
|
"Allow changing the month in the calendar",
|
||||||
TRUE);
|
TRUE);
|
||||||
@@ -256,12 +274,15 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
|
|||||||
|
|
||||||
void MyFrame::OnCalMonday(wxCommandEvent& event)
|
void MyFrame::OnCalMonday(wxCommandEvent& event)
|
||||||
{
|
{
|
||||||
m_panel->StartWithMonday(GetMenuBar()->IsChecked(event.GetId()));
|
bool enable = GetMenuBar()->IsChecked(event.GetId());
|
||||||
|
|
||||||
|
m_panel->ToggleCalStyle(enable, wxCAL_MONDAY_FIRST);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MyFrame::OnCalHolidays(wxCommandEvent& event)
|
void MyFrame::OnCalHolidays(wxCommandEvent& event)
|
||||||
{
|
{
|
||||||
bool enable = GetMenuBar()->IsChecked(event.GetId());
|
bool enable = GetMenuBar()->IsChecked(event.GetId());
|
||||||
|
|
||||||
m_panel->GetCal()->EnableHolidayDisplay(enable);
|
m_panel->GetCal()->EnableHolidayDisplay(enable);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -284,6 +305,20 @@ void MyFrame::OnCalAllowYear(wxCommandEvent& event)
|
|||||||
m_panel->GetCal()->EnableYearChange(allow);
|
m_panel->GetCal()->EnableYearChange(allow);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MyFrame::OnCalSeqMonth(wxCommandEvent& event)
|
||||||
|
{
|
||||||
|
bool allow = GetMenuBar()->IsChecked(event.GetId());
|
||||||
|
|
||||||
|
m_panel->ToggleCalStyle(allow, wxCAL_SEQUENTIAL_MONTH_SELECTION);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MyFrame::OnCalShowSurroundingWeeks(wxCommandEvent& event)
|
||||||
|
{
|
||||||
|
bool allow = GetMenuBar()->IsChecked(event.GetId());
|
||||||
|
|
||||||
|
m_panel->ToggleCalStyle(allow, wxCAL_SHOW_SURROUNDING_WEEKS);
|
||||||
|
}
|
||||||
|
|
||||||
void MyFrame::OnAllowYearUpdate(wxUpdateUIEvent& event)
|
void MyFrame::OnAllowYearUpdate(wxUpdateUIEvent& event)
|
||||||
{
|
{
|
||||||
event.Enable( GetMenuBar()->IsChecked(Calendar_Cal_Month));
|
event.Enable( GetMenuBar()->IsChecked(Calendar_Cal_Month));
|
||||||
@@ -357,13 +392,13 @@ void MyPanel::OnCalendarWeekDayClick(wxCalendarEvent& event)
|
|||||||
wxDateTime::GetWeekDayName(event.GetWeekDay()).c_str());
|
wxDateTime::GetWeekDayName(event.GetWeekDay()).c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
void MyPanel::StartWithMonday(bool on)
|
void MyPanel::ToggleCalStyle(bool on, int flag)
|
||||||
{
|
{
|
||||||
long style = m_calendar->GetWindowStyle();
|
long style = m_calendar->GetWindowStyle();
|
||||||
if ( on )
|
if ( on )
|
||||||
style |= wxCAL_MONDAY_FIRST;
|
style |= flag;
|
||||||
else
|
else
|
||||||
style &= ~wxCAL_MONDAY_FIRST;
|
style &= ~flag;
|
||||||
|
|
||||||
m_calendar->SetWindowStyle(style);
|
m_calendar->SetWindowStyle(style);
|
||||||
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user