diff --git a/docs/changes.txt b/docs/changes.txt
index d73c20e3a5..e17b388f19 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -568,6 +568,10 @@ All:
 - Add possibility to validate the input files against a schema to wxrc.
 - Fix recently broken compilation with Intel compiler.
 
+All (GUI):
+
+- Fix wxListEvent::GetData() in LLP64 builds.
+
 wxMSW:
 
 - Optional better handling of SAFEARRAYs in wxAutomationObject (PB).
diff --git a/include/wx/listbase.h b/include/wx/listbase.h
index 80f65f2a33..5e6fb7cae3 100644
--- a/include/wx/listbase.h
+++ b/include/wx/listbase.h
@@ -510,7 +510,7 @@ public:
     const wxString& GetLabel() const { return m_item.m_text; }
     const wxString& GetText() const { return m_item.m_text; }
     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; }
     const wxListItem& GetItem() const { return m_item; }