Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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/branches/WX_2_4_BRANCH@20987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-06-07 09:59:38 +00:00
parent 2381ea4581
commit 96ec96d318
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/controls/controls.cpp
View File

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

3
src/msw/button.cpp
View File

@@ -415,7 +415,8 @@ static void DrawButtonText(HDC hdc,
COLORREF colOld = SetTextColor(hdc, col); COLORREF colOld = SetTextColor(hdc, col);
int modeOld = SetBkMode(hdc, TRANSPARENT); 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); SetBkMode(hdc, modeOld);
SetTextColor(hdc, colOld); SetTextColor(hdc, colOld);