made font a non-pointer; code cleanup

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

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index 615c023bcefd4669c918ccc5b7b77201a3d83f29..3883770cf30f463e61fc53ecc842b71d2a8bfe70 100644 (file)
--- 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,
@@ -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;
@@ -174,6 +177,8 @@ protected:
     // common part of all ctors
     void Init();
 
+    // Always rely on GetBestSize, which will look at all the pages
+    virtual void SetInitialBestSize(const wxSize& WXUNUSED(size)) { }
 
     // the array of all pages of this control
     wxArrayPages m_pages;
@@ -195,9 +200,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;