include wrapwin.h instead of windows.h directly (fixes CE compilation problems)

[wxWidgets.git] / include / wx / bookctrl.h

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index 579350fa4f97f6e1d2c6792e798e8b4fb6240fe0..883a27bebc9e3b13d51a993e5ec3f572f8e1d28f 100644 (file)
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -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,
@@ -161,6 +161,9 @@ public:
         }
     }
 
+    virtual void ApplyParentThemeBackground(const wxColour& bg)
+        { SetBackgroundColour(bg); }
+
 protected:
     // remove the page and return a pointer to it
     virtual wxWindow *DoRemovePage(size_t page) = 0;
@@ -195,9 +198,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;