wxListItem::m_data is now of type wxUIntPtr, not long, for compatibility with 64...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 22f80ef4bb06db75511a67bd9ef83b78d91ea963..755f246ace15403681abdbe615407a311189fa9e 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -154,6 +154,8 @@ INCOMPATIBLE CHANGES SINCE 2.4.x
   even on 32 bit platforms, instead of off_t and so the return value of
   wxFile::Length(), for example, shouldn't be assigned to off_t variable any
   more (the compiler might warn you about this).
+- wxListItem::m_data is now of type wxUIntPtr, not long, for compatibility
+  with 64 bit systems
 
 
 DEPRECATED METHODS SINCE 2.4.x

diff --git a/include/wx/listbase.h b/include/wx/listbase.h
index 1f405ac1ff04ac2dfba8da56fbee306cd5003966..91ae3af7b50b570803e289bb3a338402af90e3d5 100644 (file)
--- a/include/wx/listbase.h
+++ b/include/wx/listbase.h
@@ -242,7 +242,7 @@ public:
     void SetData(long data)
         { m_mask |= wxLIST_MASK_DATA; m_data = data; }
     void SetData(void *data)
-        { m_mask |= wxLIST_MASK_DATA; m_data = (long)data; }
+        { m_mask |= wxLIST_MASK_DATA; m_data = wxPtrToUInt(data); }
 
     void SetWidth(int width)
         { m_mask |= wxLIST_MASK_WIDTH; m_width = width; }
@@ -263,7 +263,7 @@ public:
     long GetState() const { return m_state & m_stateMask; }
     const wxString& GetText() const { return m_text; }
     int GetImage() const { return m_image; }
-    long GetData() const { return m_data; }
+    wxUIntPtr GetData() const { return m_data; }
 
     int GetWidth() const { return m_width; }
     wxListColumnFormat GetAlign() const { return (wxListColumnFormat)m_format; }
@@ -292,7 +292,7 @@ public:
     long            m_stateMask;// Which flags of m_state are valid (uses same flags)
     wxString        m_text;     // The label/header text
     int             m_image;    // The zero-based index into an image list
-    long            m_data;     // App-defined data
+    wxUIntPtr       m_data;     // App-defined data
 
     // For columns only
     int             m_format;   // left, right, centre