#include "wx/brush.h"
#include "wx/combobox.h"
#include "wx/stattext.h"
+ #include "wx/textctrl.h"
#endif //WX_PRECOMP
#if wxUSE_CALENDARCTRL
+#include "wx/spinctrl.h"
+
#include "wx/calctrl.h"
#define DEBUG_PAINT 0
public:
wxYearSpinCtrl(wxCalendarCtrl *cal);
+ void OnYearTextChange(wxCommandEvent& event) { m_cal->OnYearChange(event); }
void OnYearChange(wxSpinEvent& event) { m_cal->OnYearChange(event); }
private:
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxYearSpinCtrl, wxSpinCtrl)
+ EVT_TEXT(-1, wxYearSpinCtrl::OnYearTextChange)
EVT_SPINCTRL(-1, wxYearSpinCtrl::OnYearChange)
END_EVENT_TABLE()
m_comboMonth = NULL;
m_spinYear = NULL;
+ m_userChangedYear = FALSE;
+
m_widthCol =
m_heightRow = 0;
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);
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;
+ 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 = NULL;
+ m_spinYear = NULL;
+ m_comboMonth = NULL;
+ m_staticMonth = NULL;
return wxControl::Destroy();
}
void wxCalendarCtrl::ShowCurrentControls()
{
- if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+ if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
if ( AllowMonthChange() )
{
bool wxCalendarCtrl::SetDate(const wxDateTime& date)
{
- bool retval = FALSE;
+ bool retval = TRUE;
bool sameMonth = m_date.GetMonth() == date.GetMonth(),
sameYear = m_date.GetYear() == date.GetYear();
if ( sameMonth && sameYear )
{
// just change the day
- retval = TRUE;
ChangeDay(date);
}
else
{
- if ( !AllowMonthChange() || (!AllowYearChange() && !sameYear) )
+ if ( AllowMonthChange() && (AllowYearChange() || sameYear) )
{
- // forbidden
- return retval;
- }
-
- // change everything
- retval = TRUE;
- m_date = date;
+ // change everything
+ m_date = date;
- if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
- {
- // update the controls
- m_comboMonth->SetSelection(m_date.GetMonth());
-
- if ( AllowYearChange() )
+ if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
- m_spinYear->SetValue(m_date.Format(_T("%Y")));
+ // update the controls
+ m_comboMonth->SetSelection(m_date.GetMonth());
+
+ if ( AllowYearChange() )
+ {
+ if ( !m_userChangedYear )
+ m_spinYear->SetValue(m_date.Format(_T("%Y")));
+ else // don't overwrite what the user typed in
+ m_userChangedYear = FALSE;
+ }
}
- }
- // as the month changed, holidays did too
- SetHolidayAttrs();
+ // as the month changed, holidays did too
+ SetHolidayAttrs();
- // update the calendar
- Refresh();
+ // update the calendar
+ Refresh();
+ }
+ else
+ {
+ // forbidden
+ retval = FALSE;
+ }
}
}
// the constants used for the layout
#define VERT_MARGIN 5 // distance between combo and calendar
+#ifdef __WXMAC__
+#define HORZ_MARGIN 5 // spin
+#else
#define HORZ_MARGIN 15 // spin
-
+#endif
wxSize wxCalendarCtrl::DoGetBestSize() const
{
// calc the size of the calendar
((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) )
- {
- height += VERT_MARGIN + m_spinYear->GetBestSize().y;
- }
- else
+ if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
- 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();
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);
}
if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
// our real height is bigger
- if ( height )
+ if ( height && GetMonthControl())
{
*height += GetMonthControl()->GetSize().y + VERT_MARGIN;
}
wxCoord y = 0;
-/////////////////////////////////////////////////////////////////////////////////////////
-
- if ( (GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+ if ( HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{
// draw the sequential month-selector
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
}
}
SetDateAndNotify(target);
}
-void wxCalendarCtrl::OnYearChange(wxSpinEvent& event)
+void wxCalendarCtrl::OnYearChange(wxCommandEvent& event)
{
+ int year = (int)event.GetInt();
+ if ( year == INT_MIN )
+ {
+ // invalid year in the spin control, ignore it
+ 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();
- int year = (int)event.GetInt();
if ( tm.mday > wxDateTime::GetNumberOfDays(tm.mon, year) )
{
tm.mday = wxDateTime::GetNumberOfDays(tm.mon, year);
// inside the same year but a strange number of months forward/back..
m_spinYear->SetValue(target.GetYear());
}
-
}
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff