///////////////////////////////////////////////////////////////////////////////
-// Name: generic/calctrl.cpp
+// Name: src/generic/calctrl.cpp
// Purpose: implementation fo the generic wxCalendarCtrl
// Author: Vadim Zeitlin
// Modified by:
EVT_LEFT_DOWN(wxCalendarCtrl::OnClick)
EVT_LEFT_DCLICK(wxCalendarCtrl::OnDClick)
+
+ EVT_SYS_COLOUR_CHANGED(wxCalendarCtrl::OnSysColourChanged)
END_EVENT_TABLE()
#if wxUSE_EXTENDED_RTTI
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;
// 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
- SetBestSize(size);
+ SetInitialSize(size);
SetPosition(pos);
// Since we don't paint the whole background make sure that the platform
// will use the right one.
- SetBackgroundColour(GetBackgroundColour());
+ SetBackgroundColour(m_colBackground);
SetHolidayAttrs();
{
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);
}
// ----------------------------------------------------------------------------
m_spinYear->Hide();
m_staticYear->Show();
}
+ //else: these controls are not even created, don't show/hide them
}
wxControl *wxCalendarCtrl::GetMonthControl() const
{
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;
+
+ // 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);
- 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()
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
}
// ----------------------------------------------------------------------------
#endif
wxCoord y = 0;
- wxCoord x0 = (GetSize().x - m_widthCol*7) /2;
- if (x0 < 0) x0 = 0;
+ wxCoord x0 = wxMax( (GetSize().x - m_widthCol*7) /2 , 0 );
if ( HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
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);
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(x0, 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 )
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
{
// surrounding week or out-of-range
// draw "disabled"
- dc.SetTextForeground(*wxLIGHT_GREY);
+ dc.SetTextForeground(m_colSorrounding);
changedColours = true;
}
else
// 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;
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
{
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;
}
{
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;
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
projects / wxWidgets.git / blobdiff