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

Refactor owner-drawing code.

Browse Source 
Only keep common code in the base class and extract all menu/listbox-specific
stuff into derived classes.

This makes the code cleaner and more maintainable but introduces some problems
in wxCheckListBox appearance which will be fixed by the next patch.

Closes #10635.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-01-23 13:21:12 +00:00
parent 937d5b6075
commit 98fbab9e7b
26 changed files with 1638 additions and 1394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/os2/checklst.cpp
View File

@@ -39,6 +39,12 @@
#define INCL_PM
#include <os2.h>
// ----------------------------------------------------------------------------
// constants for base class
// ----------------------------------------------------------------------------
static const int CHECK_MARK_WIDTH = 15;
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
@@ -81,6 +87,8 @@ public:
void Check(bool bCheck);
void Toggle(void) { Check(!IsChecked()); }
virtual wxString GetName() const { return m_pParent->GetString(m_nIndex); }
private:
bool m_bChecked;
wxCheckListBox* m_pParent;
@@ -101,7 +109,7 @@ wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox* pParent, size_t nIndex)
// done in OnMeasure while they are used only in OnDraw and we
// know that there will always be OnMeasure before OnDraw
//
SetMarginWidth(GetDefaultMarginWidth());
SetMarginWidth(CHECK_MARK_WIDTH);
} // end of wxCheckListBoxItem::wxCheckListBoxItem
@@ -128,7 +136,7 @@ bool wxCheckListBoxItem::OnDrawItem ( wxDC& rDc,
vRect.y -= 3;
if (wxOwnerDrawn::OnDrawItem( rDc, vRect, eAct, eStat))
{
size_t nCheckWidth = GetDefaultMarginWidth();
size_t nCheckWidth = CHECK_MARK_WIDTH;
size_t nCheckHeight = m_pParent->GetItemHeight();
int nParentHeight;
int nX = rRect.GetX();
@@ -333,7 +341,7 @@ long wxCheckListBox::OS2OnMeasure ( WXMEASUREITEMSTRUCT* pItem )
//
// Add place for the check mark
//
pStruct->rclItem.xRight += wxOwnerDrawn::GetDefaultMarginWidth();
pStruct->rclItem.xRight += CHECK_MARK_WIDTH;
return long(MRFROM2SHORT((USHORT)m_nItemHeight, (USHORT)(pStruct->rclItem.xRight - pStruct->rclItem.xLeft)));
}
return 0L;
@@ -374,7 +382,7 @@ void wxCheckListBox::OnLeftClick ( wxMouseEvent& rEvent )
//
// Clicking on the item selects it, clicking on the checkmark toggles
//
if (rEvent.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth())
if (rEvent.GetX() <= CHECK_MARK_WIDTH)
{
int nParentHeight;
wxScreenDC vDc;