Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- MGR: Cleanup wxFlatNotebook warnings. 

clientgui/
        wxFlatNotebook.cpp

svn path=/trunk/boinc/; revision=19971
This commit is contained in:
Rom Walton 2009-12-18 16:54:27 +00:00
parent b054f46b76
commit e9f0f6afee
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
checkin_notes
View File

@ -10291,3 +10291,9 @@ Charlie 5 Dec 2009
client/
check_security.cpp
Rom 18 Dec 2009
- MGR: Cleanup wxFlatNotebook warnings.
clientgui/
wxFlatNotebook.cpp

15
clientgui/common/wxFlatNotebook.cpp
View File

@ -1351,18 +1351,18 @@ int wxPageContainerBase::HitTest(const wxPoint& pt, wxPageInfo& pageInfo, int &t
}
rect = wxRect(btnXPos, 5, 12, 12);
if(rect.Inside(pt))
if(rect.Contains(pt))
{
return (style & wxFNB_NO_X_BUTTON) ? wxFNB_NOWHERE : wxFNB_X;
}
rect = wxRect(btnRightPos, 5, 12, 12);
if(rect.Inside(pt))
if(rect.Contains(pt))
{
return (style & wxFNB_NO_NAV_BUTTONS) ? wxFNB_NOWHERE : wxFNB_RIGHT_ARROW;
}
rect = wxRect(btnLeftPos, 5, 12, 12);
if(rect.Inside(pt))
if(rect.Contains(pt))
{
return (style & wxFNB_NO_NAV_BUTTONS) ? wxFNB_NOWHERE : wxFNB_LEFT_ARROW;
}
@ -1377,7 +1377,7 @@ int wxPageContainerBase::HitTest(const wxPoint& pt, wxPageInfo& pageInfo, int &t
if(style & wxFNB_X_ON_TAB && (int)cur == GetSelection())
{
// 'x' button exists on a tab
if(m_pagesInfoVec[cur].GetXRect().Inside(pt))
if(m_pagesInfoVec[cur].GetXRect().Contains(pt))
{
pageInfo = pgInfo;
tabIdx = (int)cur;
@ -1387,7 +1387,7 @@ int wxPageContainerBase::HitTest(const wxPoint& pt, wxPageInfo& pageInfo, int &t
wxRect tabRect = wxRect(pgInfo.GetPosition().x, pgInfo.GetPosition().y,
pgInfo.GetSize().x, pgInfo.GetSize().y);
if(tabRect.Inside(pt))
if(tabRect.Contains(pt))
{
// We have a match
// wxGetApp().SafeMessageBox(pgInfo.m_strCaption);
@ -1918,14 +1918,13 @@ void wxPageContainerBase::OnMouseLeave(wxMouseEvent& event)
m_nTabXButtonStatus = wxFNB_BTN_NONE;
wxClientDC dc(this);
dc.BeginDrawing();
DrawX(dc);
DrawLeftArrow(dc);
DrawRightArrow(dc);
DrawTabX(dc, m_pagesInfoVec[GetSelection()].GetXRect(), GetSelection());
dc.EndDrawing();
event.Skip();
event.Skip();
}
void wxPageContainerBase::OnMouseEnterWindow(wxMouseEvent& event)