X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7a2a602b4bd9308be21bc07e40a680f483438e..cad1a197e5a31d40104fd979a2c583aa8f725c93:/include/wx/listctrl.h

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 6d1f51802b..86f7d56b01 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_LISTCTRL_H_BASE_
 #define _WX_LISTCTRL_H_BASE_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "listctrlbase.h"
 #endif
 
@@ -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