Unified flags for orienting wxBookCtrls (with backward compatibility). Centralised code for sizing internals.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-10-21 18:53:51 +00:00
parent eb42e596aa
commit d8fd7acb8b
6 changed files with 78 additions and 105 deletions

View File

@@ -1530,38 +1530,59 @@ enum wxBorder
#define wxSP_ARROW_KEYS 0x1000
#define wxSP_WRAP 0x2000
/*
* wxBookCtrl flags (common for wxNotebook, wxListbook, wxChoicebook, wxTreebook)
*/
#define wxBK_DEFAULT 0x0000
#define wxBK_TOP 0x0010
#define wxBK_BOTTOM 0x0020
#define wxBK_LEFT 0x0040
#define wxBK_RIGHT 0x0080
#define wxBK_ALIGN_MASK ( wxBK_TOP | wxBK_BOTTOM | wxBK_LEFT | wxBK_RIGHT )
/*
* wxNotebook flags
*/
#define wxNB_FIXEDWIDTH 0x0010
#define wxNB_TOP 0x0000 /* default */
#define wxNB_LEFT 0x0020
#define wxNB_RIGHT 0x0040
#define wxNB_BOTTOM 0x0080
#define wxNB_MULTILINE 0x0100
#define wxNB_NOPAGETHEME 0x0200
#define wxNB_FLAT 0x0400
#define wxNB_DEFAULT wxNB_TOP
#if WXWIN_COMPATIBILITY_2_6
/* Use common book wxBK_* flags for describing alignment */
#define wxNB_DEFAULT wxBK_DEFAULT
#define wxNB_TOP wxBK_TOP
#define wxNB_BOTTOM wxBK_BOTTOM
#define wxNB_LEFT wxBK_LEFT
#define wxNB_RIGHT wxBK_RIGHT
#endif
#define wxNB_FIXEDWIDTH 0x0100
#define wxNB_MULTILINE 0x0200
#define wxNB_NOPAGETHEME 0x0400
#define wxNB_FLAT 0x0800
/*
* wxListbook flags
*/
#define wxLB_DEFAULT 0x0
#define wxLB_TOP 0x1
#define wxLB_BOTTOM 0x2
#define wxLB_LEFT 0x4
#define wxLB_RIGHT 0x8
#define wxLB_ALIGN_MASK 0xf
#if WXWIN_COMPATIBILITY_2_6
/* Use common book wxBK_* flags for describing alignment */
#define wxLB_DEFAULT wxBK_DEFAULT
#define wxLB_TOP wxBK_TOP
#define wxLB_BOTTOM wxBK_BOTTOM
#define wxLB_LEFT wxBK_LEFT
#define wxLB_RIGHT wxBK_RIGHT
#define wxLB_ALIGN_MASK wxBK_ALIGN_MASK
#endif
/*
* wxChoicebook flags
*/
#define wxCHB_DEFAULT 0x0
#define wxCHB_TOP 0x1
#define wxCHB_BOTTOM 0x2
#define wxCHB_LEFT 0x4
#define wxCHB_RIGHT 0x8
#define wxCHB_ALIGN_MASK 0xf
#if WXWIN_COMPATIBILITY_2_6
/* Use common book wxBK_* flags for describing alignment */
#define wxCHB_DEFAULT wxBK_DEFAULT
#define wxCHB_TOP wxBK_TOP
#define wxCHB_BOTTOM wxBK_BOTTOM
#define wxCHB_LEFT wxBK_LEFT
#define wxCHB_RIGHT wxBK_RIGHT
#define wxCHB_ALIGN_MASK wxBK_ALIGN_MASK
#endif
/*
* wxTabCtrl flags