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

compilation warning fixes (patch 651719)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-30 01:00:49 +00:00
parent fd4fea4228
commit 9b1b2084b0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/ownerdrw.cpp
View File

@@ -134,7 +134,7 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
// add space at the end of the menu for the submenu expansion arrow // add space at the end of the menu for the submenu expansion arrow
// this will also allow offsetting the accel string from the right edge // this will also allow offsetting the accel string from the right edge
*pwidth += GetDefaultMarginWidth()*1.5; *pwidth += (size_t) (GetDefaultMarginWidth() * 1.5);
// JACS: items still look too tightly packed, so adding 5 pixels. // JACS: items still look too tightly packed, so adding 5 pixels.
(*pheight) = (*pheight) + 5; (*pheight) = (*pheight) + 5;
@@ -276,7 +276,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
GetTextExtentPoint32(hdc,strMenuText.c_str(), strMenuText.Length(),&sizeRect); GetTextExtentPoint32(hdc,strMenuText.c_str(), strMenuText.Length(),&sizeRect);
::DrawState(hdc, NULL, NULL, ::DrawState(hdc, NULL, NULL,
(LPARAM)strMenuText.c_str(), strMenuText.length(), (LPARAM)strMenuText.c_str(), strMenuText.length(),
x, rc.y+((rc.GetHeight()-sizeRect.cy)/2.0)-1, // centre text vertically x, rc.y+( (int) ((rc.GetHeight()-sizeRect.cy)/2.0) )-1, // centre text vertically
rc.GetWidth()-GetMarginWidth(), sizeRect.cy, rc.GetWidth()-GetMarginWidth(), sizeRect.cy,
DST_PREFIXTEXT | DST_PREFIXTEXT |
(((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0)); (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
@@ -287,7 +287,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
::SetTextAlign(hdc, TA_RIGHT); ::SetTextAlign(hdc, TA_RIGHT);
::DrawState(hdc, NULL, NULL, ::DrawState(hdc, NULL, NULL,
(LPARAM)m_strAccel.c_str(), m_strAccel.length(), (LPARAM)m_strAccel.c_str(), m_strAccel.length(),
rc.GetWidth()-(GetMarginWidth()), rc.y+(rc.GetHeight()-sizeRect.cy)/2.0, rc.GetWidth()-(GetMarginWidth()), rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0),
rc.GetWidth()-GetMarginWidth(), sizeRect.cy, rc.GetWidth()-GetMarginWidth(), sizeRect.cy,
DST_TEXT | DST_TEXT |
(((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0)); (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));