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

Fix mem corruption due to string no longer being in scope

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-05-20 17:01:20 +00:00
parent a130a96cd3
commit 2a9f020897
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/generic/datavgen.cpp
View File

@@ -1412,6 +1412,7 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay()
if (col->IsHidden()) if (col->IsHidden())
continue; // don't add it! continue; // don't add it!
wxString title( col->GetTitle() );
HDITEM hdi; HDITEM hdi;
hdi.mask = HDI_TEXT | HDI_FORMAT | HDI_WIDTH; hdi.mask = HDI_TEXT | HDI_FORMAT | HDI_WIDTH;
if (col->GetBitmap().IsOk()) if (col->GetBitmap().IsOk())
@@ -1420,7 +1421,7 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay()
hdi.mask |= HDI_IMAGE; hdi.mask |= HDI_IMAGE;
hdi.iImage = m_imageList->GetImageCount()-1; hdi.iImage = m_imageList->GetImageCount()-1;
} }
hdi.pszText = (wxChar *) col->GetTitle().wx_str(); hdi.pszText = (wxChar *) title.wx_str();
hdi.cxy = col->GetWidth(); hdi.cxy = col->GetWidth();
hdi.cchTextMax = sizeof(hdi.pszText)/sizeof(hdi.pszText[0]); hdi.cchTextMax = sizeof(hdi.pszText)/sizeof(hdi.pszText[0]);
hdi.fmt = HDF_LEFT | HDF_STRING; hdi.fmt = HDF_LEFT | HDF_STRING;