X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fa03f04345b620d1a14529b05961116b20a1297..ad0ac642d5764497804bee2caad4fc1f20fc6cea:/include/wx/listbase.h

diff --git a/include/wx/listbase.h b/include/wx/listbase.h
index ef640effcb..597bc3eb50 100644
--- a/include/wx/listbase.h
+++ b/include/wx/listbase.h
@@ -16,6 +16,8 @@
 //    #pragma interface "listctrlbase.h"
 #endif
 
+#include "wx/defs.h"
+
 #if wxUSE_LISTCTRL
 
 #include "wx/colour.h"
@@ -371,7 +373,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 m_item.m_data; }
+    long GetData() const { return wx_static_cast(long, m_item.m_data); }
     long GetMask() const { return m_item.m_mask; }
     const wxListItem& GetItem() const { return m_item; }
 
@@ -444,7 +446,7 @@ END_DECLARE_EVENT_TYPES()
 typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&);
 
 #define wxListEventHandler(func) \
-    (wxObjectEventFunction)wxStaticCastEvent(wxListEventFunction, &func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxListEventFunction, &func)
 
 #define wx__DECLARE_LISTEVT(evt, id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_LIST_ ## evt, id, wxListEventHandler(fn))