#include "wx/settings.h"
#include "wx/brush.h"
#include "wx/combobox.h"
+ #include "wx/stattext.h"
#endif //WX_PRECOMP
+// Can only use wxSpinEvent if this is enabled
+#if wxUSE_SPINBTN
+
#include "wx/calctrl.h"
#define DEBUG_PAINT 0
EVT_LEFT_DOWN(wxCalendarCtrl::OnClick)
EVT_LEFT_DCLICK(wxCalendarCtrl::OnDClick)
-
- EVT_CALENDAR_MONTH(-1, wxCalendarCtrl::OnCalMonthChange)
- EVT_CALENDAR_YEAR(-1, wxCalendarCtrl::OnCalMonthChange)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxMonthComboBox, wxComboBox)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxCommandEvent)
+
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_CALENDAR_SEL_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_CALENDAR_DAY_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_CALENDAR_MONTH_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_CALENDAR_YEAR_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_CALENDAR_DOUBLECLICKED)
+DEFINE_EVENT_TYPE(wxEVT_CALENDAR_WEEKDAY_CLICKED)
// ============================================================================
// implementation
}
SetSelection(m_cal->GetDate().GetMonth());
+ SetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
}
wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl *cal)
long style,
const wxString& WXUNUSED(name))
{
- SetWindowStyle(style | (wxRAISED_BORDER | wxWANTS_CHARS));
+ // needed to get the arrow keys normally used for the dialog navigation
+ SetWindowStyle(style | wxWANTS_CHARS);
m_date = date.IsValid() ? date : wxDateTime::Today();
- m_comboMonth = new wxMonthComboBox(this);
m_spinYear = new wxYearSpinCtrl(this);
+ m_staticYear = new wxStaticText(GetParent(), -1, 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")),
+ wxDefaultPosition, wxDefaultSize,
+ wxALIGN_CENTRE);
+
+ ShowCurrentControls();
wxSize sizeReal;
if ( size.x == -1 || size.y == -1 )
return FALSE;
}
- m_comboMonth->Show(show);
- m_spinYear->Show(show);
+ GetMonthControl()->Show(show);
+ GetYearControl()->Show(show);
return TRUE;
}
return FALSE;
}
- m_comboMonth->Enable(enable);
- m_spinYear->Enable(enable);
+ GetMonthControl()->Enable(enable);
+ GetYearControl()->Enable(enable);
return TRUE;
}
+// ----------------------------------------------------------------------------
+// enable/disable month/year controls
+// ----------------------------------------------------------------------------
+
+void wxCalendarCtrl::ShowCurrentControls()
+{
+ if ( AllowMonthChange() )
+ {
+ m_comboMonth->Show();
+ m_staticMonth->Hide();
+
+ if ( AllowYearChange() )
+ {
+ m_spinYear->Show();
+ m_staticYear->Hide();
+
+ // skip the rest
+ return;
+ }
+ }
+ else
+ {
+ m_comboMonth->Hide();
+ m_staticMonth->Show();
+ }
+
+ // year change not allowed here
+ m_spinYear->Hide();
+ m_staticYear->Show();
+}
+
+wxControl *wxCalendarCtrl::GetMonthControl() const
+{
+ return AllowMonthChange() ? (wxControl *)m_comboMonth : (wxControl *)m_staticMonth;
+}
+
+wxControl *wxCalendarCtrl::GetYearControl() const
+{
+ return AllowYearChange() ? (wxControl *)m_spinYear : (wxControl *)m_staticYear;
+}
+
+void wxCalendarCtrl::EnableYearChange(bool enable)
+{
+ if ( enable != AllowYearChange() )
+ {
+ long style = GetWindowStyle();
+ if ( enable )
+ style &= ~wxCAL_NO_YEAR_CHANGE;
+ else
+ style |= wxCAL_NO_YEAR_CHANGE;
+ SetWindowStyle(style);
+
+ ShowCurrentControls();
+ }
+}
+
+void wxCalendarCtrl::EnableMonthChange(bool enable)
+{
+ if ( enable != AllowMonthChange() )
+ {
+ long style = GetWindowStyle();
+ if ( enable )
+ style &= ~wxCAL_NO_MONTH_CHANGE;
+ else
+ style |= wxCAL_NO_MONTH_CHANGE;
+ SetWindowStyle(style);
+
+ ShowCurrentControls();
+ }
+}
+
// ----------------------------------------------------------------------------
// changing date
// ----------------------------------------------------------------------------
void wxCalendarCtrl::SetDate(const wxDateTime& date)
{
- if ( m_date.GetMonth() == date.GetMonth() &&
- m_date.GetYear() == date.GetYear() )
+ bool sameMonth = m_date.GetMonth() == date.GetMonth(),
+ sameYear = m_date.GetYear() == date.GetYear();
+
+ if ( sameMonth && sameYear )
{
// just change the day
ChangeDay(date);
}
else
{
+ if ( !AllowMonthChange() || (!AllowYearChange() && !sameYear) )
+ {
+ // forbidden
+ return;
+ }
+
// change everything
m_date = date;
// update the controls
m_comboMonth->SetSelection(m_date.GetMonth());
- m_spinYear->SetValue(m_date.Format(_T("%Y")));
+
+ if ( AllowYearChange() )
+ {
+ m_spinYear->SetValue(m_date.Format(_T("%Y")));
+ }
+
+ // as the month changed, holidays did too
+ SetHolidayAttrs();
// update the calendar
Refresh();
// size or position changes: the combobox and spinctrl are along the top of
// the available area and the calendar takes up therest of the space
+// the static controls are supposed to be always smaller than combo/spin so we
+// always use the latter for size calculations and position the static to take
+// the same space
+
// the constants used for the layout
#define VERT_MARGIN 5 // distance between combo and calendar
#define HORZ_MARGIN 15 // spin
wxCoord width = 7*m_widthCol,
height = 7*m_heightRow;
- wxSize sizeCombo = m_comboMonth->GetBestSize(),
- sizeSpin = m_spinYear->GetBestSize();
+ // the combobox doesn't report its height correctly (it returns the
+ // height including the drop down list) so don't use it
+ height += VERT_MARGIN + m_spinYear->GetBestSize().y;
- height += VERT_MARGIN + wxMax(sizeCombo.y, sizeSpin.y);
+ if ( GetWindowStyle() & (wxRAISED_BORDER | wxSUNKEN_BORDER) )
+ {
+ // the border would clip the last line otherwise
+ height += 6;
+ }
return wxSize(width, height);
}
void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
{
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);
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();
int yDiff = wxMax(sizeSpin.y, sizeCombo.y) + VERT_MARGIN;
// our real top corner is not in this position
if ( y )
{
- *y -= m_comboMonth->GetSize().y + VERT_MARGIN;
+ *y -= GetMonthControl()->GetSize().y + VERT_MARGIN;
}
}
// our real height is bigger
if ( height )
{
- *height += m_comboMonth->GetSize().y + VERT_MARGIN;
+ *height += GetMonthControl()->GetSize().y + VERT_MARGIN;
}
}
RecalcGeometry();
#if DEBUG_PAINT
- printf("--- starting to paint, selection: %s, week %u\n",
+ wxLogDebug("--- starting to paint, selection: %s, week %u\n",
m_date.Format("%a %d-%m-%Y %H:%M:%S").c_str(),
GetWeek(m_date));
#endif
if ( IsExposed(0, 0, 7*m_widthCol, m_heightRow) )
{
#if DEBUG_PAINT
- puts("painting the header");
+ wxLogDebug("painting the header");
#endif
dc.SetBackgroundMode(wxTRANSPARENT);
wxDateTime date = GetStartDate();
#if DEBUG_PAINT
- printf("starting calendar from %s\n",
+ wxLogDebug("starting calendar from %s\n",
date.Format("%a %d-%m-%Y %H:%M:%S").c_str());
#endif
}
#if DEBUG_PAINT
- printf("painting week %d at y = %d\n", nWeek, y);
+ wxLogDebug("painting week %d at y = %d\n", nWeek, y);
#endif
for ( size_t wd = 0; wd < 7; wd++ )
wxCalendarDateAttr *attr = m_attrs[day - 1];
- bool isSel = m_date == date;
+ bool isSel = date.IsSameDate(m_date);
if ( isSel )
{
dc.SetTextForeground(m_colHighlightFg);
}
}
#if DEBUG_PAINT
- puts("+++ finished painting");
+ wxLogDebug("+++ finished painting");
#endif
}
rect.width = 7*m_widthCol;
rect.height = m_heightRow;
+#ifdef __WXMSW__
+ // VZ: for some reason, the selected date seems to occupy more space under
+ // MSW - this is probably some bug in the font size calculations, but I
+ // don't know where exactly. This fix is ugly and leads to more
+ // refreshes than really needed, but without it the selected days
+ // leaves even more ugly underscores on screen.
+ rect.Inflate(0, 1);
+#endif // MSW
+
#if DEBUG_PAINT
- printf("*** refreshing week %d at (%d, %d)-(%d, %d)\n",
+ wxLogDebug("*** refreshing week %d at (%d, %d)-(%d, %d)\n",
GetWeek(date),
rect.x, rect.y,
rect.x + rect.width, rect.y + rect.height);
tm.mday = wxDateTime::GetNumberOfDays(mon, tm.year);
}
- SetDate(wxDateTime(tm.mday, mon, tm.year));
-
- GenerateEvents(wxEVT_CALENDAR_MONTH_CHANGED, wxEVT_CALENDAR_SEL_CHANGED);
+ SetDateAndNotify(wxDateTime(tm.mday, mon, tm.year));
}
void wxCalendarCtrl::OnYearChange(wxSpinEvent& event)
tm.mday = wxDateTime::GetNumberOfDays(tm.mon, year);
}
- SetDate(wxDateTime(tm.mday, tm.mon, year));
-
- GenerateEvents(wxEVT_CALENDAR_YEAR_CHANGED, wxEVT_CALENDAR_SEL_CHANGED);
+ SetDateAndNotify(wxDateTime(tm.mday, tm.mon, year));
}
// ----------------------------------------------------------------------------
// holidays handling
// ----------------------------------------------------------------------------
-void wxCalendarCtrl::OnCalMonthChange(wxCalendarEvent& event)
-{
- SetHolidayAttrs();
-
- event.Skip();
-}
-
void wxCalendarCtrl::EnableHolidayDisplay(bool display)
{
long style = GetWindowStyle();
{
m_date = cal->GetDate();
}
+
+#endif // wxUSE_SPINBTN
+
projects / wxWidgets.git / blobdiff