Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implemented HitTest() in the native MSW version; added test for it to the sample

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-04-04 14:58:44 +00:00
parent 7ec5c42e94
commit ee22a3a2a6
3 changed files with 113 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
samples/calendar/calendar.cpp
View File

@@ -102,6 +102,8 @@ public:
void SetDate(const wxDateTime& dt) { m_calendar->SetDate(dt); }
private:
wxCalendarCtrlBase *DoCreateCalendar(const wxDateTime& dt, long style);
void RecreateCalendar(long style);
wxCalendarCtrlBase *m_calendar;
@@ -159,6 +161,8 @@ public:
event.Enable(m_panel->IsUsingGeneric());
}
void OnCalRClick(wxMouseEvent& event);
private:
MyPanel *m_panel;
wxTextCtrl *m_logWindow;
@@ -506,6 +510,48 @@ void MyFrame::OnCalToggleResizable(wxCommandEvent& event)
sizer->Layout();
}
void MyFrame::OnCalRClick(wxMouseEvent& event)
{
wxDateTime dt;
wxDateTime::WeekDay wd;
const wxPoint pt = event.GetPosition();
wxString msg = wxString::Format("Point (%d, %d) is ", pt.x, pt.y);
switch ( m_panel->GetCal()->HitTest(pt, &dt, &wd) )
{
default:
wxFAIL_MSG( "unexpected" );
// fall through
case wxCAL_HITTEST_NOWHERE:
msg += "nowhere";
break;
case wxCAL_HITTEST_HEADER:
msg += wxString::Format("over %s", wxDateTime::GetWeekDayName(wd));
break;
case wxCAL_HITTEST_DAY:
msg += wxString::Format("over %s", dt.FormatISODate());
break;
case wxCAL_HITTEST_INCMONTH:
msg += "over next month button";
break;
case wxCAL_HITTEST_DECMONTH:
msg += "over previous month button";
break;
case wxCAL_HITTEST_SURROUNDING_WEEK:
msg += "over a day from another month";
break;
}
wxLogMessage("%s", msg);
}
#if wxUSE_DATEPICKCTRL
void MyFrame::OnUpdateUIStartWithNone(wxUpdateUIEvent& event)
@@ -575,13 +621,8 @@ MyPanel::MyPanel(wxWindow *parent)
date.Printf(wxT("Selected date: %s"),
wxDateTime::Today().FormatISODate().c_str());
m_date = new wxStaticText(this, wxID_ANY, date);
m_calendar = new wxCalendarCtrl(this, Calendar_CalCtrl,
wxDefaultDateTime,
wxDefaultPosition,
wxDefaultSize,
wxCAL_MONDAY_FIRST |
wxCAL_SHOW_HOLIDAYS |
wxRAISED_BORDER);
m_calendar = DoCreateCalendar(wxDefaultDateTime,
wxCAL_MONDAY_FIRST | wxCAL_SHOW_HOLIDAYS);
// adjust to vertical/horizontal display, check mostly dedicated to WinCE
bool horizontal = ( wxSystemSettings::GetMetric(wxSYS_SCREEN_X) > wxSystemSettings::GetMetric(wxSYS_SCREEN_Y) );
@@ -623,24 +664,36 @@ void MyPanel::OnCalendarWeekDayClick(wxCalendarEvent& event)
wxDateTime::GetWeekDayName(event.GetWeekDay()).c_str());
}
void MyPanel::RecreateCalendar(long style)
wxCalendarCtrlBase *MyPanel::DoCreateCalendar(const wxDateTime& dt, long style)
{
wxCalendarCtrlBase *calendar;
#ifdef wxHAS_NATIVE_CALENDARCTRL
if ( m_usingGeneric )
calendar = new wxGenericCalendarCtrl(this, Calendar_CalCtrl,
m_calendar->GetDate(),
dt,
wxDefaultPosition,
wxDefaultSize,
style);
else
#endif // wxHAS_NATIVE_CALENDARCTRL
calendar = new wxCalendarCtrl(this, Calendar_CalCtrl,
m_calendar->GetDate(),
dt,
wxDefaultPosition,
wxDefaultSize,
style);
calendar->Connect(wxEVT_RIGHT_DOWN,
wxMouseEventHandler(MyFrame::OnCalRClick),
NULL,
wxGetTopLevelParent(this));
return calendar;
}
void MyPanel::RecreateCalendar(long style)
{
wxCalendarCtrlBase *calendar = DoCreateCalendar(m_calendar->GetDate(), style);
m_sizer->Replace(m_calendar, calendar);
delete m_calendar;
m_calendar = calendar;