Derive wxAuiNotebook from wxBookCtrlBase. Document wxAuiNotebookEvent which now derives from wxBookCtrlEvent. Update the notebook sample to add wxAuiNotebook as an option.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -14,6 +14,7 @@
|
||||
#include "wx/treebook.h"
|
||||
#include "wx/notebook.h"
|
||||
#include "wx/toolbook.h"
|
||||
#include "wx/aui/auibook.h"
|
||||
|
||||
#if wxUSE_LOG && !defined( __SMARTPHONE__ )
|
||||
#define USE_LOG 1
|
||||
@@ -77,6 +78,9 @@ public:
|
||||
#if wxUSE_TOOLBOOK
|
||||
void OnToolbook(wxToolbookEvent& event) { OnBookCtrl(event); }
|
||||
#endif
|
||||
#if wxUSE_AUI
|
||||
void OnAuiNotebook(wxAuiNotebookEvent& event) { OnBookCtrl(event); }
|
||||
#endif
|
||||
|
||||
void OnIdle(wxIdleEvent& event);
|
||||
|
||||
@@ -91,7 +95,7 @@ private:
|
||||
|
||||
void RecreateBook();
|
||||
wxPanel *CreateNewPage() const;
|
||||
int TranslateBookFlag(int nb, int lb, int chb, int tbk, int toolbk) const;
|
||||
int TranslateBookFlag(int nb, int lb, int chb, int tbk, int toolbkm, int aui) const;
|
||||
void AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag, const wxChar * flagName) const;
|
||||
|
||||
// Sample setup
|
||||
@@ -102,6 +106,7 @@ private:
|
||||
Type_Choicebook,
|
||||
Type_Treebook,
|
||||
Type_Toolbook,
|
||||
Type_AuiNotebook,
|
||||
Type_Max
|
||||
} m_type;
|
||||
int m_orient;
|
||||
@@ -137,6 +142,7 @@ enum ID_COMMANDS
|
||||
ID_BOOK_CHOICEBOOK,
|
||||
ID_BOOK_TREEBOOK,
|
||||
ID_BOOK_TOOLBOOK,
|
||||
ID_BOOK_AUINOTEBOOK,
|
||||
ID_BOOK_MAX,
|
||||
|
||||
ID_ORIENT_DEFAULT,
|
||||
|
Reference in New Issue
Block a user