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

12
src/os2/checklst.cpp
View File

@@ -112,6 +112,9 @@ bool wxCheckListBoxItem::OnDrawItem (
{
wxRect vRect = rRect;
::WinQueryWindowRect( m_pParent->GetHWND()
,&rDc.m_vRclPaint
);
if (IsChecked())
eStat = (wxOwnerDrawn::wxODStatus)(eStat | wxOwnerDrawn::wxODChecked);
@@ -141,9 +144,6 @@ bool wxCheckListBoxItem::OnDrawItem (
m_pParent->GetSize( NULL
,&nParentHeight
);
::WinQueryWindowRect( m_pParent->GetHWND()
,&rDc.m_vRclPaint
);
nY = nParentHeight - nY - nCheckHeight;
vPenBack = wxPen(vColour, 1, wxSOLID);
@@ -372,7 +372,7 @@ wxOwnerDrawn* wxCheckListBox::CreateItem (
// Return item size
// ----------------
//
bool wxCheckListBox::OS2OnMeasure (
long wxCheckListBox::OS2OnMeasure (
WXMEASUREITEMSTRUCT* pItem
)
{
@@ -391,9 +391,9 @@ bool wxCheckListBox::OS2OnMeasure (
// Add place for the check mark
//
pStruct->rclItem.xRight += wxOwnerDrawn::GetDefaultMarginWidth();
return TRUE;
return long(MRFROM2SHORT((USHORT)m_nItemHeight, (USHORT)(pStruct->rclItem.xRight - pStruct->rclItem.xLeft)));
}
return FALSE;
return 0L;
} // end of wxCheckListBox::CreateItem
//