X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15aad3b9386e52524eefbd2619571a038070419b..e2473d4c48a842a960292abc555747f135f93cd0:/include/wx/bookctrl.h

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index 615c023bce..26f1f2d31c 100644
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -27,7 +27,7 @@
 #include "wx/control.h"
 #include "wx/dynarray.h"
 
-WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxWindow *, wxArrayPages);
+WX_DEFINE_EXPORTED_ARRAY_PTR(wxWindow *, wxArrayPages);
 
 class WXDLLEXPORT wxImageList;
 
@@ -47,7 +47,7 @@ public:
     }
 
     wxBookCtrl(wxWindow *parent,
-               wxWindowID id,
+               wxWindowID winid,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
@@ -55,12 +55,12 @@ public:
     {
         Init();
 
-        (void)Create(parent, id, pos, size, style, name);
+        (void)Create(parent, winid, pos, size, style, name);
     }
 
     // quasi ctor
     bool Create(wxWindow *parent,
-                wxWindowID id,
+                wxWindowID winid,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
@@ -195,9 +195,9 @@ protected:
 class WXDLLEXPORT wxBookCtrlEvent : public wxNotifyEvent
 {
 public:
-    wxBookCtrlEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
+    wxBookCtrlEvent(wxEventType commandType = wxEVT_NULL, int winid = 0,
                     int nSel = -1, int nOldSel = -1)
-        : wxNotifyEvent(commandType, id)
+        : wxNotifyEvent(commandType, winid)
         {
             m_nSel = nSel;
             m_nOldSel = nOldSel;