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

recreate the column instead of trying to update it in place, it's much simpler like this

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-09 00:14:11 +00:00
parent 558e89e74d
commit 4de60a27a7
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/msw/headerctrl.cpp
View File

@@ -151,16 +151,22 @@ void wxHeaderCtrl::DoSetCount(unsigned int count)
// and add the new ones // and add the new ones
for ( n = 0; n < count; n++ ) for ( n = 0; n < count; n++ )
{ {
DoSetOrInsertItem(Insert, n); DoInsertItem(n);
} }
} }
void wxHeaderCtrl::DoUpdate(unsigned int idx) void wxHeaderCtrl::DoUpdate(unsigned int idx)
{ {
DoSetOrInsertItem(Set, idx); // the native control does provide Header_SetItem() but it's inconvenient
// to use it because it sends HDN_ITEMCHANGING messages and we'd have to
// arrange not to block setting the width from there and the logic would be
// more complicated as we'd have to reset the old values as well as setting
// the new ones -- so instead just recreate the column
Header_DeleteItem(GetHwnd(), idx);
DoInsertItem(idx);
} }
void wxHeaderCtrl::DoSetOrInsertItem(Operation oper, unsigned int idx) void wxHeaderCtrl::DoInsertItem(unsigned int idx)
{ {
const wxHeaderColumnBase& col = GetColumn(idx); const wxHeaderColumnBase& col = GetColumn(idx);
@@ -174,7 +180,7 @@ void wxHeaderCtrl::DoSetOrInsertItem(Operation oper, unsigned int idx)
hdi.cchTextMax = wxStrlen(buf); hdi.cchTextMax = wxStrlen(buf);
const wxBitmap bmp = col.GetBitmap(); const wxBitmap bmp = col.GetBitmap();
if ( bmp.IsOk() || oper == Set ) if ( bmp.IsOk() )
{ {
hdi.mask |= HDI_IMAGE; hdi.mask |= HDI_IMAGE;
@@ -208,7 +214,7 @@ void wxHeaderCtrl::DoSetOrInsertItem(Operation oper, unsigned int idx)
} }
} }
if ( col.GetAlignment() != wxALIGN_NOT || oper == Set ) if ( col.GetAlignment() != wxALIGN_NOT )
{ {
hdi.mask |= HDI_FORMAT; hdi.mask |= HDI_FORMAT;
switch ( col.GetAlignment() ) switch ( col.GetAlignment() )
@@ -243,19 +249,9 @@ void wxHeaderCtrl::DoSetOrInsertItem(Operation oper, unsigned int idx)
hdi.cxy = col.IsHidden() ? 0 : col.GetWidth(); hdi.cxy = col.IsHidden() ? 0 : col.GetWidth();
} }
const LRESULT rc = ::SendMessage(GetHwnd(), if ( ::SendMessage(GetHwnd(), HDM_INSERTITEM, idx, (LPARAM)&hdi) == -1 )
oper == Set ? HDM_SETITEM : HDM_INSERTITEM,
idx,
(LPARAM)&hdi);
if ( oper == Set )
{ {
if ( !rc ) wxLogLastError(_T("Header_InsertItem()"));
wxLogLastError(_T("Header_SetItem()"));
}
else // Insert
{
if ( rc == -1 )
wxLogLastError(_T("Header_InsertItem()"));
} }
} }