wxChoicebook follows wxListBook internal changes. Styles centralized for all wxBookCtrls.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-09-17 17:24:34 +00:00
parent 5dd0f8257c
commit bb08a4a194
5 changed files with 70 additions and 87 deletions

View File

@@ -39,26 +39,6 @@ class WXDLLEXPORT wxListEvent;
class WXDLLEXPORT wxStaticLine;
#endif // wxUSE_LINE_IN_LISTBOOK
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// wxListbook styles
enum
{
// default alignment: left everywhere except Mac where it is top
wxLB_DEFAULT = 0,
// put the list control to the left/right/top/bottom of the page area
wxLB_TOP = 0x1,
wxLB_BOTTOM = 0x2,
wxLB_LEFT = 0x4,
wxLB_RIGHT = 0x8,
// the mask which can be used to extract the alignment from the style
wxLB_ALIGN_MASK = 0xf
};
// ----------------------------------------------------------------------------
// wxListbook
// ----------------------------------------------------------------------------
@@ -153,7 +133,7 @@ class WXDLLEXPORT wxListbookEvent : public wxBookCtrlEvent
{
public:
wxListbookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
int nSel = -1, int nOldSel = -1)
int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND)
: wxBookCtrlEvent(commandType, id, nSel, nOldSel)
{
}
@@ -171,7 +151,7 @@ typedef void (wxEvtHandler::*wxListbookEventFunction)(wxListbookEvent&);
DECLARE_EVENT_TABLE_ENTRY( \
wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, \
id, \
-1, \
wxID_ANY, \
(wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxListbookEventFunction, &fn ), \
NULL \
),
@@ -180,7 +160,7 @@ typedef void (wxEvtHandler::*wxListbookEventFunction)(wxListbookEvent&);
DECLARE_EVENT_TABLE_ENTRY( \
wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, \
id, \
-1, \
wxID_ANY, \
(wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxListbookEventFunction, &fn ), \
NULL \
),