1. undid my wrong fix to wxWindowBase::Centre
2. corrected fatal bug in wxCheckLstBox (double deletion of items) 3. wxTextCtrl::SetValue() only does it if the new text is different from the old one 4. wxBitmap(const wxIcon&) ctor added 5. compilation fixes for VC++ and generic Win32 implementation of wxGetCurrentTime() in timercmn.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -314,7 +314,10 @@ void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
|
||||
for ( i = 0; i < nItems; i++ ) {
|
||||
wxOwnerDrawn *pNewItem = CreateItem((size_t)(pos + i));
|
||||
pNewItem->SetName(items[i]);
|
||||
pNewItem->SetFont(GetFont());
|
||||
|
||||
m_aItems.Insert(pNewItem, (size_t)(pos + i));
|
||||
|
||||
ListBox_SetItemData((HWND)GetHWND(), i + pos, pNewItem);
|
||||
}
|
||||
}
|
||||
@@ -323,9 +326,11 @@ void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
|
||||
bool wxCheckListBox::SetFont( const wxFont &font )
|
||||
{
|
||||
size_t i;
|
||||
for (i=0; i < m_aItems.GetCount(); i++)
|
||||
for ( i = 0; i < m_aItems.GetCount(); i++ )
|
||||
m_aItems[i]->SetFont(font);
|
||||
|
||||
wxListBox::SetFont(font);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user