///////////////////////////////////////////////////////////////////////////////
-// Name: generic/calctrl.cpp
+// Name: src/generic/calctrl.cpp
// Purpose: implementation fo the generic wxCalendarCtrl
// Author: Vadim Zeitlin
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "calctrl.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/settings.h"
#include "wx/brush.h"
#include "wx/combobox.h"
+ #include "wx/listbox.h"
#include "wx/stattext.h"
#include "wx/textctrl.h"
#endif //WX_PRECOMP
#include "wx/spinctrl.h"
+// if wxDatePickerCtrl code doesn't define the date event, do it here as we
+// need it as well
+#if !wxUSE_DATEPICKCTRL
+ #define _WX_DEFINE_DATE_EVENTS_
+#endif
+
#include "wx/calctrl.h"
#define DEBUG_PAINT 0
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-class wxMonthComboBox : public wxComboBox
-{
-public:
- wxMonthComboBox(wxCalendarCtrl *cal);
-
- void OnMonthChange(wxCommandEvent& event) { m_cal->OnMonthChange(event); }
-
-private:
- wxCalendarCtrl *m_cal;
-
- DECLARE_EVENT_TABLE()
- DECLARE_NO_COPY_CLASS(wxMonthComboBox)
-};
-
-class wxYearSpinCtrl : public wxSpinCtrl
-{
-public:
- wxYearSpinCtrl(wxCalendarCtrl *cal);
-
- void OnYearTextChange(wxCommandEvent& event) { m_cal->OnYearChange(event); }
- void OnYearChange(wxSpinEvent& event) { m_cal->OnYearChange(event); }
-
-private:
- wxCalendarCtrl *m_cal;
-
- DECLARE_EVENT_TABLE()
- DECLARE_NO_COPY_CLASS(wxYearSpinCtrl)
-};
-
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
EVT_LEFT_DOWN(wxCalendarCtrl::OnClick)
EVT_LEFT_DCLICK(wxCalendarCtrl::OnDClick)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxMonthComboBox, wxComboBox)
- EVT_COMBOBOX(-1, wxMonthComboBox::OnMonthChange)
-END_EVENT_TABLE()
-BEGIN_EVENT_TABLE(wxYearSpinCtrl, wxSpinCtrl)
- EVT_TEXT(-1, wxYearSpinCtrl::OnYearTextChange)
- EVT_SPINCTRL(-1, wxYearSpinCtrl::OnYearChange)
+ EVT_SYS_COLOUR_CHANGED(wxCalendarCtrl::OnSysColourChanged)
END_EVENT_TABLE()
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxCalendarCtrlStyle )
+
+wxBEGIN_FLAGS( wxCalendarCtrlStyle )
+ // new style border flags, we put them first to
+ // use them for streaming out
+ wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+ wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+ wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+ wxFLAGS_MEMBER(wxBORDER_RAISED)
+ wxFLAGS_MEMBER(wxBORDER_STATIC)
+ wxFLAGS_MEMBER(wxBORDER_NONE)
+
+ // old style border flags
+ wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+ wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+ wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+ wxFLAGS_MEMBER(wxRAISED_BORDER)
+ wxFLAGS_MEMBER(wxSTATIC_BORDER)
+ wxFLAGS_MEMBER(wxBORDER)
+
+ // standard window styles
+ wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+ wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+ wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+ wxFLAGS_MEMBER(wxWANTS_CHARS)
+ wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+ wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+ wxFLAGS_MEMBER(wxVSCROLL)
+ wxFLAGS_MEMBER(wxHSCROLL)
+
+ wxFLAGS_MEMBER(wxCAL_SUNDAY_FIRST)
+ wxFLAGS_MEMBER(wxCAL_MONDAY_FIRST)
+ wxFLAGS_MEMBER(wxCAL_SHOW_HOLIDAYS)
+ wxFLAGS_MEMBER(wxCAL_NO_YEAR_CHANGE)
+ wxFLAGS_MEMBER(wxCAL_NO_MONTH_CHANGE)
+ wxFLAGS_MEMBER(wxCAL_SEQUENTIAL_MONTH_SELECTION)
+ wxFLAGS_MEMBER(wxCAL_SHOW_SURROUNDING_WEEKS)
+
+wxEND_FLAGS( wxCalendarCtrlStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxCalendarCtrl, wxControl,"wx/calctrl.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxCalendarCtrl)
+ wxEVENT_RANGE_PROPERTY( Updated , wxEVT_CALENDAR_SEL_CHANGED , wxEVT_CALENDAR_WEEKDAY_CLICKED , wxCalendarEvent )
+ wxHIDE_PROPERTY( Children )
+ wxPROPERTY( Date,wxDateTime, SetDate , GetDate, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY_FLAGS( WindowStyle , wxCalendarCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxCalendarCtrl)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxCalendarCtrl , wxWindow* , Parent , wxWindowID , Id , wxDateTime , Date , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrl, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxCommandEvent)
+#endif
+IMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxDateEvent)
// ----------------------------------------------------------------------------
// events
// implementation
// ============================================================================
-// ----------------------------------------------------------------------------
-// wxMonthComboBox and wxYearSpinCtrl
-// ----------------------------------------------------------------------------
-
-wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl *cal)
- : wxComboBox(cal->GetParent(), -1,
- wxEmptyString,
- wxDefaultPosition,
- wxDefaultSize,
- 0, NULL,
- wxCB_READONLY | wxCLIP_SIBLINGS)
-{
- m_cal = cal;
-
- wxDateTime::Month m;
- for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) )
- {
- Append(wxDateTime::GetMonthName(m));
- }
-
- SetSelection(m_cal->GetDate().GetMonth());
- SetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
-}
-
-wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl *cal)
- : wxSpinCtrl(cal->GetParent(), -1,
- cal->GetDate().Format(_T("%Y")),
- wxDefaultPosition,
- wxDefaultSize,
- wxSP_ARROW_KEYS | wxCLIP_SIBLINGS,
- -4300, 10000, cal->GetDate().GetYear())
-
-{
- m_cal = cal;
-}
-
// ----------------------------------------------------------------------------
// wxCalendarCtrl
// ----------------------------------------------------------------------------
const wxString& name)
{
Init();
-
+
(void)Create(parent, id, date, pos, size, style, name);
}
{
m_comboMonth = NULL;
m_spinYear = NULL;
+ m_staticYear = NULL;
+ m_staticMonth = NULL;
- m_userChangedYear = FALSE;
+ m_userChangedYear = false;
m_widthCol =
m_heightRow = 0;
m_attrs[n] = NULL;
}
+ InitColours();
+}
+
+void wxCalendarCtrl::InitColours()
+{
m_colHighlightFg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
m_colHighlightBg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+ m_colBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+ m_colSorrounding = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
m_colHolidayFg = *wxRED;
// don't set m_colHolidayBg - by default, same as our bg colour
const wxString& name)
{
if ( !wxControl::Create(parent, id, pos, size,
- style | wxCLIP_CHILDREN | wxWANTS_CHARS,
+ style | wxCLIP_CHILDREN | wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE,
wxDefaultValidator, name) )
{
- return FALSE;
+ return false;
}
// needed to get the arrow keys normally used for the dialog navigation
if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
- m_spinYear = new wxYearSpinCtrl(this);
- m_staticYear = new wxStaticText(GetParent(), -1, m_date.Format(_T("%Y")),
+ CreateYearSpinCtrl();
+ m_staticYear = new wxStaticText(GetParent(), wxID_ANY, m_date.Format(_T("%Y")),
wxDefaultPosition, wxDefaultSize,
wxALIGN_CENTRE);
- m_comboMonth = new wxMonthComboBox(this);
- m_staticMonth = new wxStaticText(GetParent(), -1, m_date.Format(_T("%B")),
+ CreateMonthComboBox();
+ m_staticMonth = new wxStaticText(GetParent(), wxID_ANY, m_date.Format(_T("%B")),
wxDefaultPosition, wxDefaultSize,
wxALIGN_CENTRE);
}
ShowCurrentControls();
- wxSize sizeReal;
- if ( size.x == -1 || size.y == -1 )
- {
- sizeReal = DoGetBestSize();
- if ( size.x != -1 )
- sizeReal.x = size.x;
- if ( size.y != -1 )
- sizeReal.y = size.y;
- }
- else
- {
- sizeReal = size;
- }
-
// we need to set the position as well because the main control position
// is not the same as the one specified in pos if we have the controls
// above it
- SetSize(pos.x, pos.y, sizeReal.x, sizeReal.y);
+ SetInitialSize(size);
+ SetPosition(pos);
- SetBackgroundColour(*wxWHITE);
- SetFont(*wxSWISS_FONT);
+ // Since we don't paint the whole background make sure that the platform
+ // will use the right one.
+ SetBackgroundColour(m_colBackground);
SetHolidayAttrs();
- return TRUE;
+ return true;
}
wxCalendarCtrl::~wxCalendarCtrl()
{
delete m_attrs[n];
}
+
+ if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+ {
+ delete m_comboMonth;
+ delete m_staticMonth;
+ delete m_spinYear;
+ delete m_staticYear;
+ }
+}
+
+void wxCalendarCtrl::SetWindowStyleFlag(long style)
+{
+ // changing this style doesn't work because the controls are not
+ // created/shown/hidden accordingly
+ wxASSERT_MSG( (style & wxCAL_SEQUENTIAL_MONTH_SELECTION) ==
+ (m_windowStyle & wxCAL_SEQUENTIAL_MONTH_SELECTION),
+ _T("wxCAL_SEQUENTIAL_MONTH_SELECTION can't be changed after creation") );
+
+ wxControl::SetWindowStyleFlag(style);
+}
+
+// ----------------------------------------------------------------------------
+// Create the wxComboBox and wxSpinCtrl
+// ----------------------------------------------------------------------------
+
+void wxCalendarCtrl::CreateMonthComboBox()
+{
+ m_comboMonth = new wxComboBox(GetParent(), wxID_ANY,
+ wxEmptyString,
+ wxDefaultPosition,
+ wxDefaultSize,
+ 0, NULL,
+ wxCB_READONLY | wxCLIP_SIBLINGS);
+
+ wxDateTime::Month m;
+ for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) )
+ {
+ m_comboMonth->Append(wxDateTime::GetMonthName(m));
+ }
+
+ m_comboMonth->SetSelection(GetDate().GetMonth());
+ m_comboMonth->SetSize(wxDefaultCoord,
+ wxDefaultCoord,
+ wxDefaultCoord,
+ wxDefaultCoord,
+ wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
+
+ m_comboMonth->Connect(wxEVT_COMMAND_COMBOBOX_SELECTED,
+ wxCommandEventHandler(wxCalendarCtrl::OnMonthChange),
+ NULL, this);
+}
+
+void wxCalendarCtrl::CreateYearSpinCtrl()
+{
+ m_spinYear = new wxSpinCtrl(GetParent(), wxID_ANY,
+ GetDate().Format(_T("%Y")),
+ wxDefaultPosition,
+ wxDefaultSize,
+ wxSP_ARROW_KEYS | wxCLIP_SIBLINGS,
+ -4300, 10000, GetDate().GetYear());
+
+ m_spinYear->Connect(wxEVT_COMMAND_TEXT_UPDATED,
+ wxCommandEventHandler(wxCalendarCtrl::OnYearTextChange),
+ NULL, this);
+
+ m_spinYear->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED,
+ wxCommandEventHandler(wxCalendarCtrl::OnYearChange),
+ NULL, this);
}
// ----------------------------------------------------------------------------
{
if ( !wxControl::Show(show) )
{
- return FALSE;
+ return false;
}
if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
}
}
- return TRUE;
+ return true;
}
bool wxCalendarCtrl::Enable(bool enable)
{
if ( !wxControl::Enable(enable) )
{
- return FALSE;
+ return false;
}
if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
GetYearControl()->Enable(enable);
}
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
m_spinYear->Hide();
m_staticYear->Show();
}
+ //else: these controls are not even created, don't show/hide them
}
wxControl *wxCalendarCtrl::GetMonthControl() const
bool wxCalendarCtrl::SetDate(const wxDateTime& date)
{
- bool retval = TRUE;
+ bool retval = true;
bool sameMonth = m_date.GetMonth() == date.GetMonth(),
sameYear = m_date.GetYear() == date.GetYear();
{
if ( !m_userChangedYear )
m_spinYear->SetValue(m_date.Format(_T("%Y")));
- else // don't overwrite what the user typed in
- m_userChangedYear = FALSE;
}
}
else
{
// forbidden
- retval = FALSE;
+ retval = false;
}
}
}
+ m_userChangedYear = false;
+
return retval;
}
bool wxCalendarCtrl::SetLowerDateLimit(const wxDateTime& date /* = wxDefaultDateTime */)
{
- bool retval = TRUE;
+ bool retval = true;
- if ( !(date.IsValid()) || ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : TRUE ) )
+ if ( !(date.IsValid()) || ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : true ) )
{
m_lowdate = date;
}
else
{
- retval = FALSE;
+ retval = false;
}
return retval;
bool wxCalendarCtrl::SetUpperDateLimit(const wxDateTime& date /* = wxDefaultDateTime */)
{
- bool retval = TRUE;
+ bool retval = true;
- if ( !(date.IsValid()) || ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : TRUE ) )
+ if ( !(date.IsValid()) || ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : true ) )
{
m_highdate = date;
}
else
{
- retval = FALSE;
+ retval = false;
}
return retval;
bool wxCalendarCtrl::SetDateRange(const wxDateTime& lowerdate /* = wxDefaultDateTime */, const wxDateTime& upperdate /* = wxDefaultDateTime */)
{
- bool retval = TRUE;
+ bool retval = true;
if (
- ( !( lowerdate.IsValid() ) || ( ( upperdate.IsValid() ) ? ( lowerdate <= upperdate ) : TRUE ) ) &&
- ( !( upperdate.IsValid() ) || ( ( lowerdate.IsValid() ) ? ( upperdate >= lowerdate ) : TRUE ) ) )
+ ( !( lowerdate.IsValid() ) || ( ( upperdate.IsValid() ) ? ( lowerdate <= upperdate ) : true ) ) &&
+ ( !( upperdate.IsValid() ) || ( ( lowerdate.IsValid() ) ? ( upperdate >= lowerdate ) : true ) ) )
{
m_lowdate = lowerdate;
m_highdate = upperdate;
}
else
{
- retval = FALSE;
+ retval = false;
}
return retval;
}
else
{
- return TRUE;
+ return true;
}
}
bool wxCalendarCtrl::IsDateInRange(const wxDateTime& date) const
{
- bool retval = TRUE;
// Check if the given date is in the range specified
- retval = ( ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : TRUE )
- && ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : TRUE ) );
- return retval;
+ return ( ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : true )
+ && ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : true ) );
}
bool wxCalendarCtrl::ChangeYear(wxDateTime* target) const
{
- bool retval = FALSE;
+ bool retval = false;
if ( !(IsDateInRange(*target)) )
{
if ( target->GetYear() >= GetLowerDateLimit().GetYear() )
{
*target = GetLowerDateLimit();
- retval = TRUE;
+ retval = true;
}
else
{
if ( target->GetYear() <= GetUpperDateLimit().GetYear() )
{
*target = GetUpperDateLimit();
- retval = TRUE;
+ retval = true;
}
else
{
}
else
{
- retval = TRUE;
+ retval = true;
}
return retval;
bool wxCalendarCtrl::ChangeMonth(wxDateTime* target) const
{
- bool retval = TRUE;
+ bool retval = true;
if ( !(IsDateInRange(*target)) )
{
- retval = FALSE;
+ retval = false;
if ( target->GetMonth() < m_date.GetMonth() )
{
// the combobox doesn't report its height correctly (it returns the
// height including the drop down list) so don't use it
height += m_spinYear->GetBestSize().y;
+
+
+ wxCoord w2 = m_comboMonth->GetBestSize().x + HORZ_MARGIN + GetCharWidth()*6;
+ if (width < w2)
+ width = w2;
}
if ( !HasFlag(wxBORDER_NONE) )
width += 4;
}
- return wxSize(width, height);
+ wxSize best(width, height);
+ CacheBestSize(best);
+ return best;
}
void wxCalendarCtrl::DoSetSize(int x, int y,
{
int yDiff;
- if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+ if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && m_staticMonth )
{
- wxSize sizeCombo = m_comboMonth->GetSize();
+ wxSize sizeCombo = m_comboMonth->GetEffectiveMinSize();
wxSize sizeStatic = m_staticMonth->GetSize();
wxSize sizeSpin = m_spinYear->GetSize();
- int dy = (sizeCombo.y - sizeStatic.y) / 2;
-/*
-In the calender the size of the combobox for the year
-is just defined by a margin from the month combobox to
-the left border. While in wxUniv the year control can't
-show all 4 digits, in wxMsw it show almost twice as
-much. Instead the year should use it's best size and be
-left aligned to the calendar. Just in case the month in
-any language is longer than it has space in the
-calendar it is shortend.This way the year always can
-show the 4 digits.
-
-This patch relies on the fact that a combobox has a
-good best size implementation. This is not the case
-with wxMSW but I don't know why.
-
-Otto Wyss
-*/
-
-#ifdef __WXUNIVERSAL__
- if (sizeCombo.x + HORZ_MARGIN - sizeSpin.x > width)
- {
- m_comboMonth->SetSize(x, y, width - HORZ_MARGIN - sizeSpin.x, sizeCombo.y);
- }
- else
- {
- m_comboMonth->Move(x, y);
- }
- m_staticMonth->Move(x, y + dy);
- m_spinYear->Move(x + width - sizeSpin.x, y);
- m_staticYear->Move(x + width - sizeSpin.x, y + dy);
+
+ // wxMSW sometimes reports the wrong combo height,
+ // so on this platform we'll use the spin control
+ // height instead.
+#ifdef __WXMSW__
+ int maxHeight = sizeSpin.y;
+ int requiredSpinHeight = -1;
#else
+ int maxHeight = sizeCombo.y;
+ int requiredSpinHeight = sizeCombo.y;
+#endif
+ int dy = (maxHeight - sizeStatic.y) / 2;
m_comboMonth->Move(x, y);
- m_staticMonth->SetSize(x, y + dy, sizeCombo.x, sizeStatic.y);
+ m_staticMonth->SetSize(x, y + dy, sizeCombo.x, -1, sizeStatic.y);
int xDiff = sizeCombo.x + HORZ_MARGIN;
- m_spinYear->SetSize(x + xDiff, y, width - xDiff, sizeCombo.y);
+ m_spinYear->SetSize(x + xDiff, y, width - xDiff, requiredSpinHeight);
m_staticYear->SetSize(x + xDiff, y + dy, width - xDiff, sizeStatic.y);
-#endif
- yDiff = wxMax(sizeSpin.y, sizeCombo.y) + VERT_MARGIN;
+
+ yDiff = wxMax(sizeSpin.y, maxHeight) + VERT_MARGIN;
}
else // no controls on the top
{
void wxCalendarCtrl::DoGetPosition(int *x, int *y) const
{
wxControl::DoGetPosition(x, y);
-
- if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+#ifndef __WXPM__
+ if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && GetMonthControl() )
{
// our real top corner is not in this position
if ( y )
*y -= GetMonthControl()->GetSize().y + VERT_MARGIN;
}
}
+#endif
}
void wxCalendarCtrl::DoGetSize(int *width, int *height) const
{
wxControl::DoGetSize(width, height);
-
- if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+#ifndef __WXPM__
+ if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
// our real height is bigger
if ( height && GetMonthControl())
*height += GetMonthControl()->GetSize().y + VERT_MARGIN;
}
}
+#endif
}
void wxCalendarCtrl::RecalcGeometry()
{
- if ( m_widthCol != 0 )
- return;
-
wxClientDC dc(this);
- dc.SetFont(m_font);
+ dc.SetFont(GetFont());
- // determine the column width (we assume that the weekday names are always
- // wider (in any language) than the numbers)
+ // determine the column width (weekday names are not necessarily wider
+ // than the numbers (in some languages), so let's not assume that they are)
m_widthCol = 0;
+ for ( int day = 10; day <= 31; day++)
+ {
+ wxCoord width;
+ dc.GetTextExtent(wxString::Format(wxT("%d"), day), &width, &m_heightRow);
+ if ( width > m_widthCol )
+ {
+ // 1.5 times the width gives nice margins even if the weekday
+ // names are short
+ m_widthCol = width+width/2;
+ }
+ }
wxDateTime::WeekDay wd;
for ( wd = wxDateTime::Sun; wd < wxDateTime::Inv_WeekDay; wxNextWDay(wd) )
{
m_widthCol += 2;
m_heightRow += 2;
- m_rowOffset = (GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ? m_heightRow : 0; // conditional in relation to style
+ m_rowOffset = HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ? m_heightRow : 0; // conditional in relation to style
}
// ----------------------------------------------------------------------------
{
wxPaintDC dc(this);
- dc.SetFont(m_font);
+ dc.SetFont(GetFont());
RecalcGeometry();
#endif
wxCoord y = 0;
+ wxCoord x0 = wxMax( (GetSize().x - m_widthCol*7) /2 , 0 );
if ( HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
dc.SetTextForeground(*wxBLACK);
dc.SetBrush(wxBrush(m_colHeaderBg, wxSOLID));
dc.SetPen(wxPen(m_colHeaderBg, 1, wxSOLID));
- dc.DrawRectangle(0, y, 7*m_widthCol, m_heightRow);
+ dc.DrawRectangle(0, y, GetClientSize().x, m_heightRow);
// Get extent of month-name + year
wxCoord monthw, monthh;
dc.GetTextExtent(headertext, &monthw, &monthh);
// draw month-name centered above weekdays
- wxCoord monthx = ((m_widthCol * 7) - monthw) / 2;
+ wxCoord monthx = ((m_widthCol * 7) - monthw) / 2 + x0;
wxCoord monthy = ((m_heightRow - monthh) / 2) + y;
dc.DrawText(headertext, monthx, monthy);
leftarrow[1] = wxPoint(arrowheight / 2, 0);
leftarrow[2] = wxPoint(arrowheight / 2, arrowheight - 1);
- rightarrow[0] = wxPoint(0, 0);
+ rightarrow[0] = wxPoint(0,0);
rightarrow[1] = wxPoint(arrowheight / 2, arrowheight / 2);
rightarrow[2] = wxPoint(0, arrowheight - 1);
// draw the "month-arrows"
wxCoord arrowy = (m_heightRow - arrowheight) / 2;
- wxCoord larrowx = (m_widthCol - (arrowheight / 2)) / 2;
- wxCoord rarrowx = ((m_widthCol - (arrowheight / 2)) / 2) + m_widthCol*6;
- m_leftArrowRect = wxRect(0, 0, 0, 0);
- m_rightArrowRect = wxRect(0, 0, 0, 0);
+ wxCoord larrowx = (m_widthCol - (arrowheight / 2)) / 2 + x0;
+ wxCoord rarrowx = ((m_widthCol - (arrowheight / 2)) / 2) + m_widthCol*6 + x0;
+ m_leftArrowRect = m_rightArrowRect = wxRect(0,0,0,0);
if ( AllowMonthChange() )
{
wxDateTime ldpm = wxDateTime(1,m_date.GetMonth(), m_date.GetYear()) - wxDateSpan::Day(); // last day prev month
// Check if range permits change
- if ( IsDateInRange(ldpm) && ( ( ldpm.GetYear() == m_date.GetYear() ) ? TRUE : AllowYearChange() ) )
+ if ( IsDateInRange(ldpm) && ( ( ldpm.GetYear() == m_date.GetYear() ) ? true : AllowYearChange() ) )
{
m_leftArrowRect = wxRect(larrowx - 3, arrowy - 3, (arrowheight / 2) + 8, (arrowheight + 6));
- dc.SetBrush(wxBrush(*wxBLACK, wxSOLID));
- dc.SetPen(wxPen(*wxBLACK, 1, wxSOLID));
+ dc.SetBrush(*wxBLACK_BRUSH);
+ dc.SetPen(*wxBLACK_PEN);
dc.DrawPolygon(3, leftarrow, larrowx , arrowy, wxWINDING_RULE);
dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.DrawRectangle(m_leftArrowRect);
}
wxDateTime fdnm = wxDateTime(1,m_date.GetMonth(), m_date.GetYear()) + wxDateSpan::Month(); // first day next month
- if ( IsDateInRange(fdnm) && ( ( fdnm.GetYear() == m_date.GetYear() ) ? TRUE : AllowYearChange() ) )
+ if ( IsDateInRange(fdnm) && ( ( fdnm.GetYear() == m_date.GetYear() ) ? true : AllowYearChange() ) )
{
m_rightArrowRect = wxRect(rarrowx - 4, arrowy - 3, (arrowheight / 2) + 8, (arrowheight + 6));
- dc.SetBrush(wxBrush(*wxBLACK, wxSOLID));
- dc.SetPen(wxPen(*wxBLACK, 1, wxSOLID));
+ dc.SetBrush(*wxBLACK_BRUSH);
+ dc.SetPen(*wxBLACK_PEN);
dc.DrawPolygon(3, rightarrow, rarrowx , arrowy, wxWINDING_RULE);
dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.DrawRectangle(m_rightArrowRect);
}
// first draw the week days
- if ( IsExposed(0, y, 7*m_widthCol, m_heightRow) )
+ if ( IsExposed(x0, y, x0 + 7*m_widthCol, m_heightRow) )
{
#if DEBUG_PAINT
wxLogDebug("painting the header");
dc.DrawRectangle(0, y, GetClientSize().x, m_heightRow);
bool startOnMonday = (GetWindowStyle() & wxCAL_MONDAY_FIRST) != 0;
- for ( size_t wd = 0; wd < 7; wd++ )
+ for ( int wd = 0; wd < 7; wd++ )
{
size_t n;
if ( startOnMonday )
n = wd;
wxCoord dayw, dayh;
dc.GetTextExtent(m_weekdays[n], &dayw, &dayh);
- dc.DrawText(m_weekdays[n], (wd*m_widthCol) + ((m_widthCol- dayw) / 2), y); // center the day-name
+ dc.DrawText(m_weekdays[n], x0 + (wd*m_widthCol) + ((m_widthCol- dayw) / 2), y); // center the day-name
}
}
for ( size_t nWeek = 1; nWeek <= 6; nWeek++, y += m_heightRow )
{
// if the update region doesn't intersect this row, don't paint it
- if ( !IsExposed(0, y, 7*m_widthCol, m_heightRow - 1) )
+ if ( !IsExposed(x0, y, x0 + 7*m_widthCol, m_heightRow - 1) )
{
date += wxDateSpan::Week();
wxLogDebug("painting week %d at y = %d\n", nWeek, y);
#endif
- for ( size_t wd = 0; wd < 7; wd++ )
+ for ( int wd = 0; wd < 7; wd++ )
{
+ dc.SetTextBackground(m_colBackground);
if ( IsDateShown(date) )
{
// don't use wxDate::Format() which prepends 0s
wxCoord width;
dc.GetTextExtent(dayStr, &width, (wxCoord *)NULL);
- bool changedColours = FALSE,
- changedFont = FALSE;
+ bool changedColours = false,
+ changedFont = false;
- bool isSel = FALSE;
+ bool isSel = false;
wxCalendarDateAttr *attr = NULL;
if ( date.GetMonth() != m_date.GetMonth() || !IsDateInRange(date) )
{
// surrounding week or out-of-range
// draw "disabled"
- dc.SetTextForeground(*wxLIGHT_GREY);
- changedColours = TRUE;
+ dc.SetTextForeground(m_colSorrounding);
+ changedColours = true;
}
else
{
dc.SetTextForeground(m_colHighlightFg);
dc.SetTextBackground(m_colHighlightBg);
- changedColours = TRUE;
+ changedColours = true;
}
else if ( attr )
{
if ( colFg.Ok() )
{
dc.SetTextForeground(colFg);
- changedColours = TRUE;
+ changedColours = true;
}
if ( colBg.Ok() )
{
dc.SetTextBackground(colBg);
- changedColours = TRUE;
+ changedColours = true;
}
if ( attr->HasFont() )
{
dc.SetFont(attr->GetFont());
- changedFont = TRUE;
+ changedFont = true;
}
}
}
- wxCoord x = wd*m_widthCol + (m_widthCol - width) / 2;
+ wxCoord x = wd*m_widthCol + (m_widthCol - width) / 2 + x0;
dc.DrawText(dayStr, x, y + 1);
if ( !isSel && attr && attr->HasBorder() )
}
else
{
- colBorder = m_foregroundColour;
+ colBorder = GetForegroundColour();
}
wxPen pen(colBorder, 1, wxSOLID);
if ( changedColours )
{
- dc.SetTextForeground(m_foregroundColour);
- dc.SetTextBackground(m_backgroundColour);
+ dc.SetTextForeground(GetForegroundColour());
+ dc.SetTextBackground(GetBackgroundColour());
}
if ( changedFont )
{
- dc.SetFont(m_font);
+ dc.SetFont(GetFont());
}
}
//else: just don't draw it
// always refresh the whole row at once because our OnPaint() will draw
// the whole row anyhow - and this allows the small optimisation in
// OnClick() below to work
- rect.x = 0;
+ rect.x = wxMax( (GetSize().x - m_widthCol*7) /2 , 0 );
rect.y = (m_heightRow * GetWeek(date)) + m_rowOffset;
rect.x + rect.width, rect.y + rect.height);
#endif
- Refresh(TRUE, &rect);
+ Refresh(true, &rect);
}
-void wxCalendarCtrl::HighlightRange(wxPaintDC* pDC, const wxDateTime& fromdate, const wxDateTime& todate, wxPen* pPen, wxBrush* pBrush)
+void wxCalendarCtrl::HighlightRange(wxPaintDC* pDC, const wxDateTime& fromdate, const wxDateTime& todate, const wxPen* pPen, const wxBrush* pBrush)
{
// Highlights the given range using pen and brush
// Does nothing if todate < fromdate
if ( ( (tw - fw) == 1 ) && ( td < fd ) )
{
// special case: interval 7 days or less not in same week
- // split in two seperate intervals
+ // split in two separate intervals
wxDateTime tfd = fromdate + wxDateSpan::Days(7-fd);
wxDateTime ftd = tfd + wxDateSpan::Day();
#if DEBUG_PAINT
- wxLogDebug("Highlight: Seperate segments");
+ wxLogDebug("Highlight: Separate segments");
#endif
- // draw seperately
+ // draw separately
HighlightRange(pDC, fromdate, tfd, pPen, pBrush);
HighlightRange(pDC, ftd, todate, pPen, pBrush);
}
{
int numpoints;
wxPoint corners[8]; // potentially 8 corners in polygon
+ wxCoord x0 = wxMax( (GetSize().x - m_widthCol*7) /2 , 0 );
if ( fw == tw )
{
// simple case: same week
numpoints = 4;
- corners[0] = wxPoint((fd - 1) * m_widthCol, (fw * m_heightRow) + m_rowOffset);
- corners[1] = wxPoint((fd - 1) * m_widthCol, ((fw + 1 ) * m_heightRow) + m_rowOffset);
- corners[2] = wxPoint(td * m_widthCol, ((tw + 1) * m_heightRow) + m_rowOffset);
- corners[3] = wxPoint(td * m_widthCol, (tw * m_heightRow) + m_rowOffset);
+ corners[0] = wxPoint(x0 + (fd - 1) * m_widthCol, (fw * m_heightRow) + m_rowOffset);
+ corners[1] = wxPoint(x0 + (fd - 1) * m_widthCol, ((fw + 1 ) * m_heightRow) + m_rowOffset);
+ corners[2] = wxPoint(x0 + td * m_widthCol, ((tw + 1) * m_heightRow) + m_rowOffset);
+ corners[3] = wxPoint(x0 + td * m_widthCol, (tw * m_heightRow) + m_rowOffset);
}
else
{
int cidx = 0;
// "complex" polygon
- corners[cidx] = wxPoint((fd - 1) * m_widthCol, (fw * m_heightRow) + m_rowOffset); cidx++;
+ corners[cidx] = wxPoint(x0 + (fd - 1) * m_widthCol, (fw * m_heightRow) + m_rowOffset); cidx++;
if ( fd > 1 )
{
- corners[cidx] = wxPoint((fd - 1) * m_widthCol, ((fw + 1) * m_heightRow) + m_rowOffset); cidx++;
- corners[cidx] = wxPoint(0, ((fw + 1) * m_heightRow) + m_rowOffset); cidx++;
+ corners[cidx] = wxPoint(x0 + (fd - 1) * m_widthCol, ((fw + 1) * m_heightRow) + m_rowOffset); cidx++;
+ corners[cidx] = wxPoint(x0, ((fw + 1) * m_heightRow) + m_rowOffset); cidx++;
}
- corners[cidx] = wxPoint(0, ((tw + 1) * m_heightRow) + m_rowOffset); cidx++;
- corners[cidx] = wxPoint(td * m_widthCol, ((tw + 1) * m_heightRow) + m_rowOffset); cidx++;
+ corners[cidx] = wxPoint(x0, ((tw + 1) * m_heightRow) + m_rowOffset); cidx++;
+ corners[cidx] = wxPoint(x0 + td * m_widthCol, ((tw + 1) * m_heightRow) + m_rowOffset); cidx++;
if ( td < 7 )
{
- corners[cidx] = wxPoint(td * m_widthCol, (tw * m_heightRow) + m_rowOffset); cidx++;
- corners[cidx] = wxPoint(7 * m_widthCol, (tw * m_heightRow) + m_rowOffset); cidx++;
+ corners[cidx] = wxPoint(x0 + td * m_widthCol, (tw * m_heightRow) + m_rowOffset); cidx++;
+ corners[cidx] = wxPoint(x0 + 7 * m_widthCol, (tw * m_heightRow) + m_rowOffset); cidx++;
}
- corners[cidx] = wxPoint(7 * m_widthCol, (fw * m_heightRow) + m_rowOffset); cidx++;
+ corners[cidx] = wxPoint(x0 + 7 * m_widthCol, (fw * m_heightRow) + m_rowOffset); cidx++;
numpoints = cidx;
}
bool wxCalendarCtrl::GetDateCoord(const wxDateTime& date, int *day, int *week) const
{
- bool retval = TRUE;
+ bool retval = true;
#if DEBUG_PAINT
wxLogDebug("+++ GetDateCoord: (%s) +++", date.Format("%d %m %Y"));
}
else
{
- day += ( startOnMonday ) ? 0 : 1;
+ *day += ( startOnMonday ) ? 0 : 1;
}
int targetmonth = date.GetMonth() + (12 * date.GetYear());
{
*day = -1;
*week = -1;
- retval = FALSE;
+ retval = false;
}
#if DEBUG_PAINT
case wxCAL_HITTEST_HEADER:
{
- wxCalendarEvent event(this, wxEVT_CALENDAR_WEEKDAY_CLICKED);
- event.m_wday = wday;
- (void)GetEventHandler()->ProcessEvent(event);
+ wxCalendarEvent eventWd(this, wxEVT_CALENDAR_WEEKDAY_CLICKED);
+ eventWd.m_wday = wday;
+ (void)GetEventHandler()->ProcessEvent(eventWd);
}
break;
{
RecalcGeometry();
- wxCoord y = pos.y;
+ // the position where the calendar really begins
+ wxCoord x0 = wxMax((GetSize().x - m_widthCol*7)/2, 0);
-///////////////////////////////////////////////////////////////////////////////////////////////////////
- if ( (GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+ if ( HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
// Header: month
// we need to find out if the hit is on left arrow, on month or on right arrow
// left arrow?
- if ( wxRegion(m_leftArrowRect).Contains(pos) == wxInRegion )
+ if ( m_leftArrowRect.Contains(pos) )
{
if ( date )
{
return wxCAL_HITTEST_DECMONTH;
}
- if ( wxRegion(m_rightArrowRect).Contains(pos) == wxInRegion )
+ if ( m_rightArrowRect.Contains(pos) )
{
if ( date )
{
}
-///////////////////////////////////////////////////////////////////////////////////////////////////////
- // Header: Days
- int wday = pos.x / m_widthCol;
-// if ( y < m_heightRow )
- if ( y < (m_heightRow + m_rowOffset) )
+ // header: week days
+ int wday = (pos.x - x0) / m_widthCol;
+ if ( pos.y < (m_heightRow + m_rowOffset) )
{
- if ( y > m_rowOffset )
+ if ( pos.y > m_rowOffset )
{
if ( wd )
{
}
}
-// int week = (y - m_heightRow) / m_heightRow;
- int week = (y - (m_heightRow + m_rowOffset)) / m_heightRow;
+ int week = (pos.y - (m_heightRow + m_rowOffset)) / m_heightRow;
if ( week >= 6 || wday >= 7 )
{
return wxCAL_HITTEST_NOWHERE;
return;
}
- // set the flag for SetDate(): otherwise it would overwrite the year
- // typed in by the user
- m_userChangedYear = TRUE;
-
wxDateTime::Tm tm = m_date.GetTm();
if ( tm.mday > wxDateTime::GetNumberOfDays(tm.mon, year) )
}
}
+void wxCalendarCtrl::OnYearTextChange(wxCommandEvent& event)
+{
+ SetUserChangedYear();
+ OnYearChange(event);
+}
+
+// Responds to colour changes, and passes event on to children.
+void wxCalendarCtrl::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+ // reinit colours
+ InitColours();
+
+ // Propagate the event to the children
+ wxControl::OnSysColourChanged(event);
+
+ // Redraw control area
+ SetBackgroundColour(m_colBackground);
+ Refresh();
+}
+
// ----------------------------------------------------------------------------
// keyboard interface
// ----------------------------------------------------------------------------
}
break;
- case WXK_PRIOR:
+ case WXK_PAGEUP:
target = m_date - wxDateSpan::Month();
ChangeMonth(&target);
SetDateAndNotify(target); // always
break;
- case WXK_NEXT:
+ case WXK_PAGEDOWN:
target = m_date + wxDateSpan::Month();
ChangeMonth(&target);
SetDateAndNotify(target); // always
attr = new wxCalendarDateAttr;
}
- attr->SetHoliday(TRUE);
+ attr->SetHoliday(true);
// can't use SetAttr() because it would delete this pointer
m_attrs[day - 1] = attr;
{
if ( m_attrs[day] )
{
- m_attrs[day]->SetHoliday(FALSE);
+ m_attrs[day]->SetHoliday(false);
}
}
}
-// ----------------------------------------------------------------------------
-// wxCalendarEvent
-// ----------------------------------------------------------------------------
-void wxCalendarEvent::Init()
+//static
+wxVisualAttributes
+wxCalendarCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
{
- m_wday = wxDateTime::Inv_WeekDay;
-}
-
-wxCalendarEvent::wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type)
- : wxCommandEvent(type, cal->GetId())
-{
- m_date = cal->GetDate();
- SetEventObject(cal);
+ // Use the same color scheme as wxListBox
+ return wxListBox::GetClassDefaultAttributes(variant);
}
#endif // wxUSE_CALENDARCTRL
-
projects / wxWidgets.git / blobdiff