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

Fixed bug in wxCalendarCtrl::HitTest() when clicking on month change arrows

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-11-24 09:25:49 +00:00
parent 5f324bb622
commit afcdd052c1
2 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -96,6 +96,7 @@ All:
- Fixed long standing bug in wxFileConfig groups renaming (Antti Koivisto). - Fixed long standing bug in wxFileConfig groups renaming (Antti Koivisto).
- New option wxFS_READ | wxFS_SEEKABLE for wxFileSystem::OpenFile() to return - New option wxFS_READ | wxFS_SEEKABLE for wxFileSystem::OpenFile() to return
a stream that is seekable. a stream that is seekable.
- Fixed bug in wxCalendarCtrl::HitTest() when clicking on month change arrows
wxMSW: wxMSW:

28
src/generic/calctrl.cpp
View File

@@ -1487,21 +1487,17 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos,
wxDateTime::WeekDay *wd) wxDateTime::WeekDay *wd)
{ {
RecalcGeometry(); 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_corr.y; // the position where the calendar really begins
wxCoord x0 = wxMax((GetSize().x - m_widthCol*7)/2, 0);
/////////////////////////////////////////////////////////////////////////////////////////////////////// if ( HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )
if ( (GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
{ {
// Header: month // Header: month
// we need to find out if the hit is on left arrow, on month or on right arrow // we need to find out if the hit is on left arrow, on month or on right arrow
// left arrow? // left arrow?
if ( wxRegion(m_leftArrowRect).Contains(pos_corr) == wxInRegion ) if ( m_leftArrowRect.Contains(pos) )
{ {
if ( date ) if ( date )
{ {
@@ -1518,7 +1514,7 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos,
return wxCAL_HITTEST_DECMONTH; return wxCAL_HITTEST_DECMONTH;
} }
if ( wxRegion(m_rightArrowRect).Contains(pos_corr) == wxInRegion ) if ( m_rightArrowRect.Contains(pos) )
{ {
if ( date ) if ( date )
{ {
@@ -1537,14 +1533,11 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos,
} }
/////////////////////////////////////////////////////////////////////////////////////////////////////// // header: week days
// Header: Days int wday = (pos.x - x0) / m_widthCol;
if ( pos.y < (m_heightRow + m_rowOffset) )
int wday = pos_corr.x / m_widthCol;
// if ( y < m_heightRow )
if ( y < (m_heightRow + m_rowOffset) )
{ {
if ( y > m_rowOffset ) if ( pos.y > m_rowOffset )
{ {
if ( wd ) if ( wd )
{ {
@@ -1564,8 +1557,7 @@ wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos,
} }
} }
// int week = (y - m_heightRow) / m_heightRow; int week = (pos.y - (m_heightRow + m_rowOffset)) / m_heightRow;
int week = (y - (m_heightRow + m_rowOffset)) / m_heightRow;
if ( week >= 6 || wday >= 7 ) if ( week >= 6 || wday >= 7 )
{ {
return wxCAL_HITTEST_NOWHERE; return wxCAL_HITTEST_NOWHERE;