wxDefaultPosition,
wxDefaultSize,
0, NULL,
- wxCB_READONLY)
+ wxCB_READONLY | wxCLIP_SIBLINGS)
{
m_cal = cal;
cal->GetDate().Format(_T("%Y")),
wxDefaultPosition,
wxDefaultSize,
- wxSP_ARROW_KEYS,
+ wxSP_ARROW_KEYS | wxCLIP_SIBLINGS,
-4300, 10000, cal->GetDate().GetYear())
{
m_cal = cal;
m_attrs[n] = NULL;
}
- wxSystemSettings ss;
- m_colHighlightFg = ss.GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
- m_colHighlightBg = ss.GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
+ m_colHighlightFg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+ m_colHighlightBg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
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 | wxWANTS_CHARS, wxDefaultValidator, name) )
+ style | wxCLIP_CHILDREN | wxWANTS_CHARS,
+ wxDefaultValidator, name) )
{
return FALSE;
}
m_lowdate = wxDefaultDateTime;
m_highdate = wxDefaultDateTime;
- if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+ if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
m_spinYear = new wxYearSpinCtrl(this);
m_staticYear = new wxStaticText(GetParent(), -1, m_date.Format(_T("%Y")),
sizeReal = size;
}
- SetSize(sizeReal);
+ // 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);
SetBackgroundColour(*wxWHITE);
SetFont(*wxSWISS_FONT);
// forward wxWin functions to subcontrols
// ----------------------------------------------------------------------------
+bool wxCalendarCtrl::Destroy()
+{
+ if( m_staticYear ) m_staticYear->Destroy();
+ if( m_spinYear ) m_spinYear->Destroy();
+ if( m_comboMonth ) m_comboMonth->Destroy();
+ if( m_staticMonth ) m_staticMonth->Destroy();
+
+ m_staticYear = 0; m_spinYear = 0; m_comboMonth = 0; m_staticMonth = 0;
+
+ return wxControl::Destroy();
+}
+
bool wxCalendarCtrl::Show(bool show)
{
if ( !wxControl::Show(show) )
void wxCalendarCtrl::ShowCurrentControls()
{
- if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+ if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
if ( AllowMonthChange() )
{
else
style |= wxCAL_NO_MONTH_CHANGE;
SetWindowStyle(style);
-
+
ShowCurrentControls();
if ( GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION )
{
bool wxCalendarCtrl::SetDate(const wxDateTime& date)
{
- bool retval = false;
+ bool retval = FALSE;
bool sameMonth = m_date.GetMonth() == date.GetMonth(),
sameYear = m_date.GetYear() == date.GetYear();
if ( sameMonth && sameYear )
{
// just change the day
- retval = true;
+ retval = TRUE;
ChangeDay(date);
}
else
}
// change everything
- retval = true;
+ retval = TRUE;
m_date = date;
if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
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;
}
bool wxCalendarCtrl::IsDateInRange(const wxDateTime& date) const
{
- bool retval = true;
+ 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 ) );
+ retval = ( ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : TRUE )
+ && ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : TRUE ) );
return retval;
}
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() )
{
// rewind back
datetest.SetToPrevWeekDay(GetWindowStyle() & wxCAL_MONDAY_FIRST
? wxDateTime::Mon : wxDateTime::Sun);
-
+
if ( datetest.GetDay() == 1 )
{
retval += 1;
}
}
-
+
return retval;
}
((wxCalendarCtrl *)this)->RecalcGeometry(); // const_cast
wxCoord width = 7*m_widthCol,
- height = 7*m_heightRow + m_rowOffset;
+ height = 7*m_heightRow + m_rowOffset + VERT_MARGIN;
- // the combobox doesn't report its height correctly (it returns the
- // height including the drop down list) so don't use it
-
- if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+ if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
- height += VERT_MARGIN + m_spinYear->GetBestSize().y;
- }
- else
- {
- height += VERT_MARGIN;
+ // 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;
}
-// if ( GetWindowStyle() & (wxRAISED_BORDER | wxSUNKEN_BORDER) ) // This doesn't work. Default is wxBORDER_DEFAULT (0)
- if ( !(GetWindowStyle() & wxBORDER_NONE) )
+ if ( !HasFlag(wxBORDER_NONE) )
{
// the border would clip the last line otherwise
height += 6;
void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
{
- int xDiff = 0;
- int yDiff = 0;
+ int yDiff;
- if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+ if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
wxSize sizeCombo = m_comboMonth->GetSize();
wxSize sizeStatic = m_staticMonth->GetSize();
int dy = (sizeCombo.y - sizeStatic.y) / 2;
-
+
m_comboMonth->Move(x, y);
m_staticMonth->SetSize(x, y + dy, sizeCombo.x, sizeStatic.y);
-
- xDiff = sizeCombo.x + HORZ_MARGIN;
-
+
+ int xDiff = sizeCombo.x + HORZ_MARGIN;
+
m_spinYear->SetSize(x + xDiff, y, width - xDiff, sizeCombo.y);
m_staticYear->SetSize(x + xDiff, y + dy, width - xDiff, sizeStatic.y);
wxSize sizeSpin = m_spinYear->GetSize();
yDiff = wxMax(sizeSpin.y, sizeCombo.y) + VERT_MARGIN;
}
+ else // no controls on the top
+ {
+ yDiff = 0;
+ }
wxControl::DoMoveWindow(x, y + yDiff, width, height - yDiff);
}
wxCoord y = 0;
-/////////////////////////////////////////////////////////////////////////////////////////
-
- if ( (GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+ if ( HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
// draw the sequential month-selector
// Get extent of month-name + year
wxCoord monthw, monthh;
- wxString headertext = m_date.Format("%B %Y");
+ wxString headertext = m_date.Format(wxT("%B %Y"));
dc.GetTextExtent(headertext, &monthw, &monthh);
// draw month-name centered above weekdays
wxCoord monthx = ((m_widthCol * 7) - monthw) / 2;
wxCoord monthy = ((m_heightRow - monthh) / 2) + y;
- dc.DrawText(headertext, monthx, monthy);
+ dc.DrawText(headertext, monthx, monthy);
// calculate the "month-arrows"
wxPoint leftarrow[3];
wxPoint rightarrow[3];
int arrowheight = monthh / 2;
-
+
leftarrow[0] = wxPoint(0, arrowheight / 2);
leftarrow[1] = wxPoint(arrowheight / 2, 0);
leftarrow[2] = wxPoint(arrowheight / 2, arrowheight - 1);
{
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.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));
y += m_heightRow;
}
-/////////////////////////////////////////////////////////////////////////////////////////
-
// first draw the week days
if ( IsExposed(0, y, 7*m_widthCol, m_heightRow) )
{
dc.SetTextForeground(m_colHeaderFg);
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);
bool startOnMonday = (GetWindowStyle() & wxCAL_MONDAY_FIRST) != 0;
for ( size_t wd = 0; wd < 7; wd++ )
n = wd;
wxCoord dayw, dayh;
dc.GetTextExtent(m_weekdays[n], &dayw, &dayh);
-// dc.DrawText(m_weekdays[n], wd*m_widthCol + 1, y);
dc.DrawText(m_weekdays[n], (wd*m_widthCol) + ((m_widthCol- dayw) / 2), y); // center the day-name
}
}
bool changedColours = FALSE,
changedFont = FALSE;
- bool isSel = false;
+ bool isSel = FALSE;
wxCalendarDateAttr *attr = NULL;
if ( date.GetMonth() != m_date.GetMonth() || !IsDateInRange(date) )
if ( !IsDateInRange(date) )
{
wxDateTime firstOOR = GetUpperDateLimit() + wxDateSpan::Day(); // first out-of-range
-
+
wxBrush oorbrush = *wxLIGHT_GREY_BRUSH;
oorbrush.SetStyle(wxFDIAGONAL_HATCH);
{
// do stuff
// date-coordinates
- int fd, fw;
+ int fd, fw;
int td, tw;
// implicit: both dates must be currently shown - checked by GetDateCoord
int cidx = 0;
// "complex" polygon
corners[cidx] = wxPoint((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(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"));
if ( IsDateShown(date) )
{
bool startOnMonday = ( GetWindowStyle() & wxCAL_MONDAY_FIRST ) != 0;
-
+
// Find day
*day = date.GetWeekDay();
-
+
if ( *day == 0 ) // sunday
{
*day = ( startOnMonday ) ? 7 : 1;
{
*day = -1;
*week = -1;
- retval = false;
+ retval = FALSE;
}
#if DEBUG_PAINT
if ( (GetWindowStyle() & 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 )
{
tm.mday = wxDateTime::GetNumberOfDays(tm.mon, year);
}
-
+
wxDateTime target = wxDateTime(tm.mday, tm.mon, year);
if ( ChangeYear(&target) )
projects / wxWidgets.git / blobdiff