X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1af34108c4602517c89c39a82b6f4353c82d5e31..682214d5c6ec3e56dbdfd0c97d70d87e614b38c2:/include/wx/bookctrl.h diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h index c8fd909060..6bc12d1ec9 100644 --- a/include/wx/bookctrl.h +++ b/include/wx/bookctrl.h @@ -179,8 +179,10 @@ public: } } + // override some base class virtuals virtual void ApplyParentThemeBackground(const wxColour& bg) { SetBackgroundColour(bg); } + virtual bool ProvidesBackground() const { return true; } protected: // remove the page and return a pointer to it @@ -240,21 +242,9 @@ private: }; // make a default book control for given platform -#if defined(__WXMSW__) && defined(__SMARTPHONE__) - #include "wx\choicebook.h" - #define wxBookCtrl wxChoicebook - #define wxBookCtrlEvent wxChoicebookEvent - #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGED wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED - #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGING wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING - #define EVT_BOOKCTRL_PAGE_CHANGED(id, fn) EVT_CHOICEBOOK_PAGE_CHANGED(id, fn) - #define EVT_BOOKCTRL_PAGE_CHANGING(id, fn) EVT_CHOICEBOOK_PAGE_CHANGING(id, fn) - #define wxBC_TOP wxCHB_TOP - #define wxBC_BOTTOM wxCHB_BOTTOM - #define wxBC_LEFT wxCHB_LEFT - #define wxBC_RIGHT wxCHB_RIGHT - #define wxBC_DEFAULT wxCHB_DEFAULT -#else - #include "wx\notebook.h" +#if wxUSE_NOTEBOOK + // dedicated to majority of desktops + #include "wx/notebook.h" #define wxBookCtrl wxNotebook #define wxBookCtrlEvent wxNotebookEvent #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGED wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED @@ -266,6 +256,20 @@ private: #define wxBC_LEFT wxNB_LEFT #define wxBC_RIGHT wxNB_RIGHT #define wxBC_DEFAULT wxNB_DEFAULT +#else + // dedicated to Smartphones + #include "wx/choicebk.h" + #define wxBookCtrl wxChoicebook + #define wxBookCtrlEvent wxChoicebookEvent + #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGED wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED + #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGING wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING + #define EVT_BOOKCTRL_PAGE_CHANGED(id, fn) EVT_CHOICEBOOK_PAGE_CHANGED(id, fn) + #define EVT_BOOKCTRL_PAGE_CHANGING(id, fn) EVT_CHOICEBOOK_PAGE_CHANGING(id, fn) + #define wxBC_TOP wxCHB_TOP + #define wxBC_BOTTOM wxCHB_BOTTOM + #define wxBC_LEFT wxCHB_LEFT + #define wxBC_RIGHT wxCHB_RIGHT + #define wxBC_DEFAULT wxCHB_DEFAULT #endif #endif // wxUSE_BOOKCTRL