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

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 02da28c588..e52e869167 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     04.12.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -16,6 +16,8 @@
     #pragma interface "listctrlbase.h"
 #endif
 
+#include "wx/defs.h" // headers should include this before first wxUSE_XXX check
+
 #if wxUSE_LISTCTRL
 
 #include "wx/listbase.h"
@@ -26,8 +28,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 +41,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