X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a03dc7a13b8654be11e20b7361ed2d692e7cbca..7a0a6cc8f61cb53ce1c76897489e1e363d1a1fa5:/src/msw/checklst.cpp diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index 99d72f3e89..0769cb2f34 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -146,7 +146,7 @@ private: wxCheckListBox *m_pParent; size_t m_nIndex; - DECLARE_NO_COPY_CLASS(wxCheckListBoxItem) + wxDECLARE_NO_COPY_CLASS(wxCheckListBoxItem); }; wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex) @@ -215,6 +215,9 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc, ImageList_Destroy(himl); + if (stat & wxODHasFocus) + wxRendererNative::Get().DrawFocusRect(m_pParent, dc, rc); + return true; } @@ -377,14 +380,14 @@ bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item) bool wxCheckListBox::IsChecked(unsigned int uiIndex) const { - wxCHECK_MSG( IsValid(uiIndex), false, _T("bad wxCheckListBox index") ); + wxCHECK_MSG( IsValid(uiIndex), false, wxT("bad wxCheckListBox index") ); return GetItem(uiIndex)->IsChecked(); } void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck) { - wxCHECK_RET( IsValid(uiIndex), _T("bad wxCheckListBox index") ); + wxCHECK_RET( IsValid(uiIndex), wxT("bad wxCheckListBox index") ); GetItem(uiIndex)->Check(bCheck); } @@ -446,7 +449,7 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event) wxCheckListBoxItem *item = GetItem(selections[i]); if ( !item ) { - wxFAIL_MSG( _T("no wxCheckListBoxItem?") ); + wxFAIL_MSG( wxT("no wxCheckListBoxItem?") ); continue; } @@ -462,7 +465,7 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event) break; default: - wxFAIL_MSG( _T("what should this key do?") ); + wxFAIL_MSG( wxT("what should this key do?") ); } // we should send an event as this has been done by the user and