///////////////////////////////////////////////////////////////////////////////
-// Name: generic/calctrl.cpp
+// Name: src/generic/calctrl.cpp
// Purpose: implementation fo the generic wxCalendarCtrl
// Author: Vadim Zeitlin
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #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"
+ #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->SetUserChangedYear();
- 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(wxID_ANY, wxMonthComboBox::OnMonthChange)
-END_EVENT_TABLE()
-BEGIN_EVENT_TABLE(wxYearSpinCtrl, wxSpinCtrl)
- EVT_TEXT(wxID_ANY, wxYearSpinCtrl::OnYearTextChange)
- EVT_SPINCTRL(wxID_ANY, wxYearSpinCtrl::OnYearChange)
+ EVT_SYS_COLOUR_CHANGED(wxCalendarCtrl::OnSysColourChanged)
END_EVENT_TABLE()
#if wxUSE_EXTENDED_RTTI
#else
IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrl, wxControl)
#endif
-IMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxCommandEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxDateEvent)
// ----------------------------------------------------------------------------
// events
// implementation
// ============================================================================
-// ----------------------------------------------------------------------------
-// wxMonthComboBox and wxYearSpinCtrl
-// ----------------------------------------------------------------------------
-
-wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl *cal)
- : wxComboBox(cal->GetParent(), wxID_ANY,
- 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(wxDefaultPosition.x,
- wxDefaultPosition.y,
- wxDefaultSize.x,
- wxDefaultSize.y,
- wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
-}
-
-wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl *cal)
- : wxSpinCtrl(cal->GetParent(), wxID_ANY,
- cal->GetDate().Format(_T("%Y")),
- wxDefaultPosition,
- wxDefaultSize,
- wxSP_ARROW_KEYS | wxCLIP_SIBLINGS,
- -4300, 10000, cal->GetDate().GetYear())
-
-{
- m_cal = cal;
-}
-
// ----------------------------------------------------------------------------
// wxCalendarCtrl
// ----------------------------------------------------------------------------
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;
if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
- m_spinYear = new wxYearSpinCtrl(this);
+ CreateYearSpinCtrl();
m_staticYear = new wxStaticText(GetParent(), wxID_ANY, m_date.Format(_T("%Y")),
wxDefaultPosition, wxDefaultSize,
wxALIGN_CENTRE);
- m_comboMonth = new wxMonthComboBox(this);
+ CreateMonthComboBox();
m_staticMonth = new wxStaticText(GetParent(), wxID_ANY, m_date.Format(_T("%B")),
wxDefaultPosition, wxDefaultSize,
wxALIGN_CENTRE);
// above it
SetBestSize(size);
SetPosition(pos);
-
+
+ // Since we don't paint the whole background make sure that the platform
+ // will use the right one.
+ SetBackgroundColour(m_colBackground);
+
SetHolidayAttrs();
return true;
}
}
+// ----------------------------------------------------------------------------
+// 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);
+}
+
// ----------------------------------------------------------------------------
// forward wxWin functions to subcontrols
// ----------------------------------------------------------------------------
// 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) )
wxSize best(width, height);
CacheBestSize(best);
- return 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 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);
-#else
m_comboMonth->Move(x, y);
m_staticMonth->SetSize(x, y + dy, sizeCombo.x, sizeStatic.y);
m_spinYear->SetSize(x + xDiff, y, width - xDiff, sizeCombo.y);
m_staticYear->SetSize(x + xDiff, y + dy, width - xDiff, sizeStatic.y);
-#endif
+
yDiff = wxMax(sizeSpin.y, sizeCombo.y) + VERT_MARGIN;
}
else // no controls on the top
{
wxControl::DoGetPosition(x, y);
- if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+ if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && GetMonthControl() )
{
// our real top corner is not in this position
if ( y )
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) )
{
#endif
wxCoord y = 0;
+ wxCoord x0 = wxMax( (GetSize().x - m_widthCol*7) /2 , 0 );
if ( HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
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() )
{
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(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
{
// surrounding week or out-of-range
// draw "disabled"
- dc.SetTextForeground(*wxLIGHT_GREY);
+ dc.SetTextForeground(m_colSorrounding);
changedColours = true;
}
else
}
}
- 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() )
// 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
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;
}
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;
wxDateTime::WeekDay *wd)
{
RecalcGeometry();
+ // use the correct x-pos
+ wxCoord x0 = wxMax((GetSize().x - m_widthCol*7) /2, 0);
+ wxPoint pos_corr = pos;
+ pos_corr.x -= x0;
- wxCoord y = pos.y;
+ wxCoord y = pos_corr.y;
///////////////////////////////////////////////////////////////////////////////////////////////////////
if ( (GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
// 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 ( wxRegion(m_leftArrowRect).Contains(pos_corr) == wxInRegion )
{
if ( date )
{
return wxCAL_HITTEST_DECMONTH;
}
- if ( wxRegion(m_rightArrowRect).Contains(pos) == wxInRegion )
+ if ( wxRegion(m_rightArrowRect).Contains(pos_corr) == wxInRegion )
{
if ( date )
{
///////////////////////////////////////////////////////////////////////////////////////////////////////
// Header: Days
- int wday = pos.x / m_widthCol;
+
+ int wday = pos_corr.x / m_widthCol;
// if ( y < m_heightRow )
if ( y < (m_heightRow + m_rowOffset) )
{
}
}
+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
return wxListBox::GetClassDefaultAttributes(variant);
}
-
-// ----------------------------------------------------------------------------
-// wxCalendarEvent
-// ----------------------------------------------------------------------------
-
-void wxCalendarEvent::Init()
-{
- m_wday = wxDateTime::Inv_WeekDay;
-}
-
-wxCalendarEvent::wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type)
- : wxCommandEvent(type, cal->GetId())
-{
- m_date = cal->GetDate();
- SetEventObject(cal);
-}
-
#endif // wxUSE_CALENDARCTRL
-
projects / wxWidgets.git / blobdiff