Merge the changes from 3.0 branch.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-12 18:06:37 +00:00
parent e4d0bc4bb1
commit 9b31387508
100 changed files with 7289 additions and 1390 deletions
--- a/interface/wx/listctrl.h
+++ b/interface/wx/listctrl.h
@@ -1372,7 +1372,7 @@ public:
    /**
        The data.
    */
-    long GetData() const;
+    wxUIntPtr GetData() const;

    /**
        The image.