AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for [ 748805 ] Assert failure for specified situation in samples/controls

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2003-06-07 09:59:38 +00:00
parent 6ce5198539
commit 91f2c1540f
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
samples/controls/controls.cpp
View File

@ -1081,15 +1081,19 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
}
case ID_LISTBOX_SEL_NUM:
{
m_listbox->SetSelection( 2 );
m_listboxSorted->SetSelection( 2 );
if (m_listbox->GetCount() > 2)
m_listbox->SetSelection( 2 );
if (m_listboxSorted->GetCount() > 2)
m_listboxSorted->SetSelection( 2 );
m_lbSelectThis->WarpPointer( 40, 14 );
break;
}
case ID_LISTBOX_SEL_STR:
{
m_listbox->SetStringSelection( _T("This") );
m_listboxSorted->SetStringSelection( _T("This") );
if (m_listbox->FindString(_T("This")) > -1)
m_listbox->SetStringSelection( _T("This") );
if (m_listboxSorted->FindString(_T("This")) > -1)
m_listboxSorted->SetStringSelection( _T("This") );
m_lbSelectNum->WarpPointer( 40, 14 );
break;
}

3
src/msw/button.cpp
View File

@ -415,7 +415,8 @@ static void DrawButtonText(HDC hdc,
COLORREF colOld = SetTextColor(hdc, col);
int modeOld = SetBkMode(hdc, TRANSPARENT);
::DrawText(hdc, text, text.length(), pRect, DT_CENTER | DT_VCENTER);
// Note: we must have DT_SINGLELINE for DT_VCENTER to work.
::DrawText(hdc, text, text.length(), pRect, DT_SINGLELINE | DT_CENTER | DT_VCENTER);
SetBkMode(hdc, modeOld);
SetTextColor(hdc, colOld);