X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..4b5e5cfb2230d990c6988266340329c420cd1a74:/include/wx/listctrl.h

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 02da28c588..86f7d56b01 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -26,8 +26,6 @@
 
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/listctrl.h"
 #else
     #include "wx/generic/listctrl.h"
 #endif
@@ -41,14 +39,14 @@ class WXDLLEXPORT wxListView : public wxListCtrl
 public:
     wxListView() { }
     wxListView( wxWindow *parent,
-                wxWindowID id = -1,
+                wxWindowID winid = -1,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxLC_REPORT,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString &name = wxT("listctrl") )
     {
-        Create(parent, id, pos, size, style, validator, name);
+        Create(parent, winid, pos, size, style, validator, name);
     }
 
     // focus/selection stuff