AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2004-09-28 21:53:19 +00:00
parent 1695e2851d
commit 0d01dd512f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changes.txt
View File

@ -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 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 wxFile::Length(), for example, shouldn't be assigned to off_t variable any
more (the compiler might warn you about this). 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 DEPRECATED METHODS SINCE 2.4.x

6
include/wx/listbase.h
View File

@ -242,7 +242,7 @@ public:
void SetData(long data) void SetData(long data)
{ m_mask |= wxLIST_MASK_DATA; m_data = data; } { m_mask |= wxLIST_MASK_DATA; m_data = data; }
void SetData(void *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) void SetWidth(int width)
{ m_mask |= wxLIST_MASK_WIDTH; m_width = width; } { m_mask |= wxLIST_MASK_WIDTH; m_width = width; }
@ -263,7 +263,7 @@ public:
long GetState() const { return m_state & m_stateMask; } long GetState() const { return m_state & m_stateMask; }
const wxString& GetText() const { return m_text; } const wxString& GetText() const { return m_text; }
int GetImage() const { return m_image; } int GetImage() const { return m_image; }
long GetData() const { return m_data; } wxUIntPtr GetData() const { return m_data; }
int GetWidth() const { return m_width; } int GetWidth() const { return m_width; }
wxListColumnFormat GetAlign() const { return (wxListColumnFormat)m_format; } 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) long m_stateMask;// Which flags of m_state are valid (uses same flags)
wxString m_text; // The label/header text wxString m_text; // The label/header text
int m_image; // The zero-based index into an image list 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 // For columns only
int m_format; // left, right, centre int m_format; // left, right, centre