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

More OS/2 update to fix some owner drawn things

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-09-03 22:26:53 +00:00
parent a715019788
commit f5ea767eb8
8 changed files with 49 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/os2/window.cpp
View File

@@ -2841,8 +2841,9 @@ MRESULT wxWindowOS2::OS2WindowProc(
}
else
{
bProcessed = OS2OnMeasureItem(nIdCtrl,
(WXMEASUREITEMSTRUCT *)lParam);
return MRFROMLONG(OS2OnMeasureItem( nIdCtrl
,(WXMEASUREITEMSTRUCT *)lParam
));
}
if ( bProcessed )
@@ -3807,7 +3808,7 @@ bool wxWindowOS2::OS2OnDrawItem(
return FALSE;
} // end of wxWindowOS2::OS2OnDrawItem
bool wxWindowOS2::OS2OnMeasureItem(
long wxWindowOS2::OS2OnMeasureItem(
int lId
, WXMEASUREITEMSTRUCT* pItemStruct
)
@@ -3833,13 +3834,16 @@ bool wxWindowOS2::OS2OnMeasureItem(
,&nHeight
))
{
MRESULT mRc;
pMeasureStruct->rclItem.xRight = nWidth;
pMeasureStruct->rclItem.xLeft = 0L;
pMeasureStruct->rclItem.yTop = nHeight;
pMeasureStruct->rclItem.yBottom = 0L;
return TRUE;
mRc = MRFROM2SHORT(nHeight, nWidth);
return LONGFROMMR(mRc);
}
return FALSE;
return 0L;
}
}
wxWindow* pItem = FindItem(lId);