From 311131d369e59b7ad6ed76a5f777c3fc3865e52c Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 10 Mar 2005 19:22:46 +0000 Subject: [PATCH] Apart smartphones use choicebook when notebook is not available (like testing smartphone layout using desktop build). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/bookctrl.h | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h index e1605aef73..6bc12d1ec9 100644 --- a/include/wx/bookctrl.h +++ b/include/wx/bookctrl.h @@ -242,20 +242,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 +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 -- 2.45.2