X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4cc4e7b6ccea5e345e54871f25951e3a0fe2570a..2c01d33555e3125057f4575ca7d0d2aba93f421f:/include/wx/bookctrl.h?ds=sidebyside diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h index e1605aef73..d46bc4b879 100644 --- a/include/wx/bookctrl.h +++ b/include/wx/bookctrl.h @@ -12,10 +12,6 @@ #ifndef _WX_BOOKCTRL_H_ #define _WX_BOOKCTRL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "bookctrl.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -179,11 +175,6 @@ 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 virtual wxWindow *DoRemovePage(size_t page) = 0; @@ -242,20 +233,8 @@ private: }; // make a default book control for given platform -#if defined(__WXMSW__) && defined(__SMARTPHONE__) - #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 -#else +#if wxUSE_NOTEBOOK + // dedicated to majority of desktops #include "wx/notebook.h" #define wxBookCtrl wxNotebook #define wxBookCtrlEvent wxNotebookEvent @@ -268,6 +247,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