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

Fix pointer truncation in wxListEvent::GetData() in LLP64 builds.

Browse Source 
We must use wxUIntPtr and not long here to avoid truncating the upper half of
the pointer when sizeof(void*)>sizeof(long).

Closes #15578.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-10-14 15:08:40 +00:00
parent 910f1a96d2
commit 6e6e6d179f
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changes.txt
View File

@@ -568,6 +568,10 @@ All:
- Add possibility to validate the input files against a schema to wxrc. - Add possibility to validate the input files against a schema to wxrc.
- Fix recently broken compilation with Intel compiler. - Fix recently broken compilation with Intel compiler.
All (GUI):
- Fix wxListEvent::GetData() in LLP64 builds.
wxMSW: wxMSW:
- Optional better handling of SAFEARRAYs in wxAutomationObject (PB). - Optional better handling of SAFEARRAYs in wxAutomationObject (PB).

2
include/wx/listbase.h
View File

@@ -510,7 +510,7 @@ public:
const wxString& GetLabel() const { return m_item.m_text; } const wxString& GetLabel() const { return m_item.m_text; }
const wxString& GetText() const { return m_item.m_text; } const wxString& GetText() const { return m_item.m_text; }
int GetImage() const { return m_item.m_image; } int GetImage() const { return m_item.m_image; }
long GetData() const { return static_cast<long>(m_item.m_data); } wxUIntPtr GetData() const { return m_item.m_data; }
long GetMask() const { return m_item.m_mask; } long GetMask() const { return m_item.m_mask; }
const wxListItem& GetItem() const { return m_item; } const wxListItem& GetItem() const { return m_item; }