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

Warning suppressions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2004-03-01 06:24:20 +00:00
parent 52d9d823a1
commit 9923c37dcc
40 changed files with 118 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/os2/ownerdrw.cpp
View File

@@ -111,7 +111,7 @@ bool wxOwnerDrawn::OnMeasureItem(
// 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
//
*pWidth += GetDefaultMarginWidth() * 1.5;
*pWidth = (size_t)(*pWidth + GetDefaultMarginWidth() * 1.5);
//
// JACS: items still look too tightly packed, so adding 5 pixels.
@@ -303,7 +303,7 @@ bool wxOwnerDrawn::OnDrawItem(
wxString sTgt = "\t";
wxString sFullString = m_strName; // need to save the original text
wxString sAccel;
size_t nIndex;
int nIndex;
size_t nWidth;
size_t nCharWidth;
size_t nHeight;
@@ -336,7 +336,7 @@ bool wxOwnerDrawn::OnDrawItem(
,(long *)&nWidth
,(long *)&nHeight
);
sTmp = sFullString[nIndex + 1];
sTmp = sFullString[(size_t)(nIndex + 1)];
rDC.GetTextExtent( sTmp
,(long *)&nCharWidth
,(long *)&nHeight
@@ -464,11 +464,6 @@ bool wxOwnerDrawn::OnDrawItem(
if (eStatus & wxODSelected)
{
RECT vRectBmp = { rRect.x
,rRect.y
,rRect.x + GetMarginWidth() - 1
,rRect.y + m_nHeight - 1
};
POINTL vPnt1 = {rRect.x + 1, rRect.y + 3}; // Leave a little background border
POINTL vPnt2 = {rRect.x + GetMarginWidth(), rRect.y + m_nHeight - 3};