X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/702b1c7e8a333fbfad2a5e8bd31772f4d8217529..b6db2d145af115920246a91cee384c5a260b2da0:/samples/aui/auidemo.cpp
diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp
index de7776def2..c695aa025c 100644
--- a/samples/aui/auidemo.cpp
+++ b/samples/aui/auidemo.cpp
@@ -62,6 +62,7 @@ class MyFrame : public wxFrame
ID_CreateGrid,
ID_CreateText,
ID_CreateHTML,
+ ID_CreateNotebook,
ID_CreateSizeReport,
ID_GridContent,
ID_TextContent,
@@ -84,6 +85,18 @@ class MyFrame : public wxFrame
ID_VerticalGradient,
ID_HorizontalGradient,
ID_Settings,
+ ID_NotebookNoCloseButton,
+ ID_NotebookCloseButton,
+ ID_NotebookCloseButtonAll,
+ ID_NotebookCloseButtonActive,
+ ID_NotebookAllowTabMove,
+ ID_NotebookAllowTabExternalMove,
+ ID_NotebookAllowTabSplit,
+ ID_NotebookWindowList,
+ ID_NotebookScrollButtons,
+ ID_NotebookTabFixedWidth,
+ ID_NotebookArtGloss,
+ ID_NotebookArtSimple,
ID_FirstPerspective = ID_CreatePerspective+1000
};
@@ -97,7 +110,7 @@ public:
~MyFrame();
- wxDockArt* GetDockArt();
+ wxAuiDockArt* GetDockArt();
void DoUpdate();
private:
@@ -107,7 +120,7 @@ private:
wxSizeReportCtrl* CreateSizeReportCtrl(int width = 80, int height = 80);
wxPoint GetStartPosition();
wxHtmlWindow* CreateHTMLCtrl(wxWindow* parent = NULL);
- wxAuiMultiNotebook* CreateNotebook();
+ wxAuiNotebook* CreateNotebook();
wxString GetIntroText();
@@ -127,20 +140,25 @@ private:
void OnCopyPerspectiveCode(wxCommandEvent& evt);
void OnRestorePerspective(wxCommandEvent& evt);
void OnSettings(wxCommandEvent& evt);
+ void OnAllowNotebookDnD(wxAuiNotebookEvent& evt);
+ void OnNotebookPageClose(wxAuiNotebookEvent& evt);
void OnExit(wxCommandEvent& evt);
void OnAbout(wxCommandEvent& evt);
void OnGradient(wxCommandEvent& evt);
void OnManagerFlag(wxCommandEvent& evt);
+ void OnNotebookFlag(wxCommandEvent& evt);
void OnUpdateUI(wxUpdateUIEvent& evt);
- void OnPaneClose(wxFrameManagerEvent& evt);
+ void OnPaneClose(wxAuiManagerEvent& evt);
private:
- wxFrameManager m_mgr;
+ wxAuiManager m_mgr;
wxArrayString m_perspectives;
wxMenu* m_perspectives_menu;
+ long m_notebook_style;
+ long m_notebook_theme;
DECLARE_EVENT_TABLE()
};
@@ -156,7 +174,7 @@ public:
wxSizeReportCtrl(wxWindow* parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- wxFrameManager* mgr = NULL)
+ wxAuiManager* mgr = NULL)
: wxControl(parent, id, pos, size, wxNO_BORDER)
{
m_mgr = mgr;
@@ -186,7 +204,7 @@ private:
if (m_mgr)
{
- wxPaneInfo pi = m_mgr->GetPane(this);
+ wxAuiPaneInfo pi = m_mgr->GetPane(this);
s.Printf(wxT("Layer: %d"), pi.dock_layer);
dc.GetTextExtent(s, &w, &h);
@@ -217,7 +235,7 @@ private:
}
private:
- wxFrameManager* m_mgr;
+ wxAuiManager* m_mgr;
DECLARE_EVENT_TABLE()
};
@@ -251,14 +269,15 @@ class SettingsPanel : public wxPanel
public:
SettingsPanel(wxWindow* parent, MyFrame* frame)
- : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize)
+ : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize),
+ m_frame(frame)
{
//wxBoxSizer* vert = new wxBoxSizer(wxVERTICAL);
//vert->Add(1, 1, 1, wxEXPAND);
wxBoxSizer* s1 = new wxBoxSizer(wxHORIZONTAL);
- m_border_size = new wxSpinCtrl(this, ID_PaneBorderSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
+ m_border_size = new wxSpinCtrl(this, ID_PaneBorderSize, wxString::Format(wxT("%d"), frame->GetDockArt()->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE)), wxDefaultPosition, wxSize(50,20), wxSP_ARROW_KEYS, 0, 100, frame->GetDockArt()->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE));
s1->Add(1, 1, 1, wxEXPAND);
s1->Add(new wxStaticText(this, wxID_ANY, wxT("Pane Border Size:")));
s1->Add(m_border_size);
@@ -267,7 +286,7 @@ public:
//vert->Add(s1, 0, wxEXPAND | wxLEFT | wxBOTTOM, 5);
wxBoxSizer* s2 = new wxBoxSizer(wxHORIZONTAL);
- m_sash_size = new wxSpinCtrl(this, ID_SashSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
+ m_sash_size = new wxSpinCtrl(this, ID_SashSize, wxString::Format(wxT("%d"), frame->GetDockArt()->GetMetric(wxAUI_DOCKART_SASH_SIZE)), wxDefaultPosition, wxSize(50,20), wxSP_ARROW_KEYS, 0, 100, frame->GetDockArt()->GetMetric(wxAUI_DOCKART_SASH_SIZE));
s2->Add(1, 1, 1, wxEXPAND);
s2->Add(new wxStaticText(this, wxID_ANY, wxT("Sash Size:")));
s2->Add(m_sash_size);
@@ -276,7 +295,7 @@ public:
//vert->Add(s2, 0, wxEXPAND | wxLEFT | wxBOTTOM, 5);
wxBoxSizer* s3 = new wxBoxSizer(wxHORIZONTAL);
- m_caption_size = new wxSpinCtrl(this, ID_CaptionSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
+ m_caption_size = new wxSpinCtrl(this, ID_CaptionSize, wxString::Format(wxT("%d"), frame->GetDockArt()->GetMetric(wxAUI_DOCKART_CAPTION_SIZE)), wxDefaultPosition, wxSize(50,20), wxSP_ARROW_KEYS, 0, 100, frame->GetDockArt()->GetMetric(wxAUI_DOCKART_CAPTION_SIZE));
s3->Add(1, 1, 1, wxEXPAND);
s3->Add(new wxStaticText(this, wxID_ANY, wxT("Caption Size:")));
s3->Add(m_caption_size);
@@ -384,10 +403,9 @@ public:
SetSizer(cont_sizer);
GetSizer()->SetSizeHints(this);
- m_frame = frame;
- m_border_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_ART_PANE_BORDER_SIZE));
- m_sash_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_ART_SASH_SIZE));
- m_caption_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_ART_CAPTION_SIZE));
+ m_border_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE));
+ m_sash_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_DOCKART_SASH_SIZE));
+ m_caption_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_DOCKART_CAPTION_SIZE));
UpdateColors();
}
@@ -411,54 +429,54 @@ private:
void UpdateColors()
{
- wxColour bk = m_frame->GetDockArt()->GetColor(wxAUI_ART_BACKGROUND_COLOUR);
+ wxColour bk = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_BACKGROUND_COLOUR);
m_background_color->SetBitmapLabel(CreateColorBitmap(bk));
- wxColour cap = m_frame->GetDockArt()->GetColor(wxAUI_ART_INACTIVE_CAPTION_COLOUR);
+ wxColour cap = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR);
m_inactive_caption_color->SetBitmapLabel(CreateColorBitmap(cap));
- wxColour capgrad = m_frame->GetDockArt()->GetColor(wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR);
+ wxColour capgrad = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR);
m_inactive_caption_gradient_color->SetBitmapLabel(CreateColorBitmap(capgrad));
- wxColour captxt = m_frame->GetDockArt()->GetColor(wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR);
+ wxColour captxt = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR);
m_inactive_caption_text_color->SetBitmapLabel(CreateColorBitmap(captxt));
- wxColour acap = m_frame->GetDockArt()->GetColor(wxAUI_ART_ACTIVE_CAPTION_COLOUR);
+ wxColour acap = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR);
m_active_caption_color->SetBitmapLabel(CreateColorBitmap(acap));
- wxColour acapgrad = m_frame->GetDockArt()->GetColor(wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR);
+ wxColour acapgrad = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR);
m_active_caption_gradient_color->SetBitmapLabel(CreateColorBitmap(acapgrad));
- wxColour acaptxt = m_frame->GetDockArt()->GetColor(wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR);
+ wxColour acaptxt = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR);
m_active_caption_text_color->SetBitmapLabel(CreateColorBitmap(acaptxt));
- wxColour sash = m_frame->GetDockArt()->GetColor(wxAUI_ART_SASH_COLOUR);
+ wxColour sash = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_SASH_COLOUR);
m_sash_color->SetBitmapLabel(CreateColorBitmap(sash));
- wxColour border = m_frame->GetDockArt()->GetColor(wxAUI_ART_BORDER_COLOUR);
+ wxColour border = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_BORDER_COLOUR);
m_border_color->SetBitmapLabel(CreateColorBitmap(border));
- wxColour gripper = m_frame->GetDockArt()->GetColor(wxAUI_ART_GRIPPER_COLOUR);
+ wxColour gripper = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_GRIPPER_COLOUR);
m_gripper_color->SetBitmapLabel(CreateColorBitmap(gripper));
}
void OnPaneBorderSize(wxSpinEvent& event)
{
- m_frame->GetDockArt()->SetMetric(wxAUI_ART_PANE_BORDER_SIZE,
+ m_frame->GetDockArt()->SetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE,
event.GetPosition());
m_frame->DoUpdate();
}
void OnSashSize(wxSpinEvent& event)
{
- m_frame->GetDockArt()->SetMetric(wxAUI_ART_SASH_SIZE,
+ m_frame->GetDockArt()->SetMetric(wxAUI_DOCKART_SASH_SIZE,
event.GetPosition());
m_frame->DoUpdate();
}
void OnCaptionSize(wxSpinEvent& event)
{
- m_frame->GetDockArt()->SetMetric(wxAUI_ART_CAPTION_SIZE,
+ m_frame->GetDockArt()->SetMetric(wxAUI_DOCKART_CAPTION_SIZE,
event.GetPosition());
m_frame->DoUpdate();
}
@@ -473,16 +491,16 @@ private:
int var = 0;
switch (event.GetId())
{
- case ID_BackgroundColor: var = wxAUI_ART_BACKGROUND_COLOUR; break;
- case ID_SashColor: var = wxAUI_ART_SASH_COLOUR; break;
- case ID_InactiveCaptionColor: var = wxAUI_ART_INACTIVE_CAPTION_COLOUR; break;
- case ID_InactiveCaptionGradientColor: var = wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR; break;
- case ID_InactiveCaptionTextColor: var = wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR; break;
- case ID_ActiveCaptionColor: var = wxAUI_ART_ACTIVE_CAPTION_COLOUR; break;
- case ID_ActiveCaptionGradientColor: var = wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR; break;
- case ID_ActiveCaptionTextColor: var = wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR; break;
- case ID_BorderColor: var = wxAUI_ART_BORDER_COLOUR; break;
- case ID_GripperColor: var = wxAUI_ART_GRIPPER_COLOUR; break;
+ case ID_BackgroundColor: var = wxAUI_DOCKART_BACKGROUND_COLOUR; break;
+ case ID_SashColor: var = wxAUI_DOCKART_SASH_COLOUR; break;
+ case ID_InactiveCaptionColor: var = wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR; break;
+ case ID_InactiveCaptionGradientColor: var = wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR; break;
+ case ID_InactiveCaptionTextColor: var = wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR; break;
+ case ID_ActiveCaptionColor: var = wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR; break;
+ case ID_ActiveCaptionGradientColor: var = wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR; break;
+ case ID_ActiveCaptionTextColor: var = wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR; break;
+ case ID_BorderColor: var = wxAUI_DOCKART_BORDER_COLOUR; break;
+ case ID_GripperColor: var = wxAUI_DOCKART_GRIPPER_COLOUR; break;
default: return;
}
@@ -530,6 +548,9 @@ END_EVENT_TABLE()
bool MyApp::OnInit()
{
+ if ( !wxApp::OnInit() )
+ return false;
+
wxFrame* frame = new MyFrame(NULL,
wxID_ANY,
wxT("wxAUI Sample Application"),
@@ -549,6 +570,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(MyFrame::ID_CreateText, MyFrame::OnCreateText)
EVT_MENU(MyFrame::ID_CreateHTML, MyFrame::OnCreateHTML)
EVT_MENU(MyFrame::ID_CreateSizeReport, MyFrame::OnCreateSizeReport)
+ EVT_MENU(MyFrame::ID_CreateNotebook, MyFrame::OnCreateNotebook)
EVT_MENU(MyFrame::ID_CreatePerspective, MyFrame::OnCreatePerspective)
EVT_MENU(MyFrame::ID_CopyPerspectiveCode, MyFrame::OnCopyPerspectiveCode)
EVT_MENU(ID_AllowFloating, MyFrame::OnManagerFlag)
@@ -560,6 +582,18 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(ID_NoVenetianFade, MyFrame::OnManagerFlag)
EVT_MENU(ID_TransparentDrag, MyFrame::OnManagerFlag)
EVT_MENU(ID_AllowActivePane, MyFrame::OnManagerFlag)
+ EVT_MENU(ID_NotebookTabFixedWidth, MyFrame::OnNotebookFlag)
+ EVT_MENU(ID_NotebookNoCloseButton, MyFrame::OnNotebookFlag)
+ EVT_MENU(ID_NotebookCloseButton, MyFrame::OnNotebookFlag)
+ EVT_MENU(ID_NotebookCloseButtonAll, MyFrame::OnNotebookFlag)
+ EVT_MENU(ID_NotebookCloseButtonActive, MyFrame::OnNotebookFlag)
+ EVT_MENU(ID_NotebookAllowTabMove, MyFrame::OnNotebookFlag)
+ EVT_MENU(ID_NotebookAllowTabExternalMove, MyFrame::OnNotebookFlag)
+ EVT_MENU(ID_NotebookAllowTabSplit, MyFrame::OnNotebookFlag)
+ EVT_MENU(ID_NotebookScrollButtons, MyFrame::OnNotebookFlag)
+ EVT_MENU(ID_NotebookWindowList, MyFrame::OnNotebookFlag)
+ EVT_MENU(ID_NotebookArtGloss, MyFrame::OnNotebookFlag)
+ EVT_MENU(ID_NotebookArtSimple, MyFrame::OnNotebookFlag)
EVT_MENU(ID_NoGradient, MyFrame::OnGradient)
EVT_MENU(ID_VerticalGradient, MyFrame::OnGradient)
EVT_MENU(ID_HorizontalGradient, MyFrame::OnGradient)
@@ -572,6 +606,16 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(ID_NotebookContent, MyFrame::OnChangeContentPane)
EVT_MENU(wxID_EXIT, MyFrame::OnExit)
EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
+ EVT_UPDATE_UI(ID_NotebookTabFixedWidth, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_NotebookNoCloseButton, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_NotebookCloseButton, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_NotebookCloseButtonAll, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_NotebookCloseButtonActive, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_NotebookAllowTabMove, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_NotebookAllowTabExternalMove, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_NotebookAllowTabSplit, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_NotebookScrollButtons, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_NotebookWindowList, MyFrame::OnUpdateUI)
EVT_UPDATE_UI(ID_AllowFloating, MyFrame::OnUpdateUI)
EVT_UPDATE_UI(ID_TransparentHint, MyFrame::OnUpdateUI)
EVT_UPDATE_UI(ID_VenetianBlindsHint, MyFrame::OnUpdateUI)
@@ -585,7 +629,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_UPDATE_UI(ID_HorizontalGradient, MyFrame::OnUpdateUI)
EVT_MENU_RANGE(MyFrame::ID_FirstPerspective, MyFrame::ID_FirstPerspective+1000,
MyFrame::OnRestorePerspective)
- EVT_AUI_PANECLOSE(MyFrame::OnPaneClose)
+ EVT_AUI_PANE_CLOSE(MyFrame::OnPaneClose)
+ EVT_AUINOTEBOOK_ALLOW_DND(wxID_ANY, MyFrame::OnAllowNotebookDnD)
+ EVT_AUINOTEBOOK_PAGE_CLOSE(wxID_ANY, MyFrame::OnNotebookPageClose)
END_EVENT_TABLE()
@@ -597,12 +643,16 @@ MyFrame::MyFrame(wxWindow* parent,
long style)
: wxFrame(parent, id, title, pos, size, style)
{
- // tell wxFrameManager to manage this frame
+ // tell wxAuiManager to manage this frame
m_mgr.SetManagedWindow(this);
// set frame icon
SetIcon(wxIcon(sample_xpm));
+ // set up default notebook style
+ m_notebook_style = wxAUI_NB_DEFAULT_STYLE | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER;
+ m_notebook_theme = 0;
+
// create menu
wxMenuBar* mb = new wxMenuBar;
@@ -614,13 +664,14 @@ MyFrame::MyFrame(wxWindow* parent,
view_menu->Append(ID_CreateHTML, _("Create HTML Control"));
view_menu->Append(ID_CreateTree, _("Create Tree"));
view_menu->Append(ID_CreateGrid, _("Create Grid"));
+ view_menu->Append(ID_CreateNotebook, _("Create Notebook"));
view_menu->Append(ID_CreateSizeReport, _("Create Size Reporter"));
view_menu->AppendSeparator();
view_menu->Append(ID_GridContent, _("Use a Grid for the Content Pane"));
view_menu->Append(ID_TextContent, _("Use a Text Control for the Content Pane"));
view_menu->Append(ID_HTMLContent, _("Use an HTML Control for the Content Pane"));
view_menu->Append(ID_TreeContent, _("Use a Tree Control for the Content Pane"));
- view_menu->Append(ID_NotebookContent, _("Use a AUI wxMultiNotebook control for the Content Pane"));
+ view_menu->Append(ID_NotebookContent, _("Use a wxAuiNotebook control for the Content Pane"));
view_menu->Append(ID_SizeReportContent, _("Use a Size Reporter for the Content Pane"));
wxMenu* options_menu = new wxMenu;
@@ -641,6 +692,22 @@ MyFrame::MyFrame(wxWindow* parent,
options_menu->AppendSeparator();
options_menu->Append(ID_Settings, _("Settings Pane"));
+ wxMenu* notebook_menu = new wxMenu;
+ notebook_menu->AppendRadioItem(ID_NotebookArtGloss, _("Glossy Theme (Default)"));
+ notebook_menu->AppendRadioItem(ID_NotebookArtSimple, _("Simple Theme"));
+ notebook_menu->AppendSeparator();
+ notebook_menu->AppendRadioItem(ID_NotebookNoCloseButton, _("No Close Button"));
+ notebook_menu->AppendRadioItem(ID_NotebookCloseButton, _("Close Button at Right"));
+ notebook_menu->AppendRadioItem(ID_NotebookCloseButtonAll, _("Close Button on All Tabs"));
+ notebook_menu->AppendRadioItem(ID_NotebookCloseButtonActive, _("Close Button on Active Tab"));
+ notebook_menu->AppendSeparator();
+ notebook_menu->AppendCheckItem(ID_NotebookAllowTabMove, _("Allow Tab Move"));
+ notebook_menu->AppendCheckItem(ID_NotebookAllowTabExternalMove, _("Allow External Tab Move"));
+ notebook_menu->AppendCheckItem(ID_NotebookAllowTabSplit, _("Allow Notebook Split"));
+ notebook_menu->AppendCheckItem(ID_NotebookScrollButtons, _("Scroll Buttons Visible"));
+ notebook_menu->AppendCheckItem(ID_NotebookWindowList, _("Window List Button Visible"));
+ notebook_menu->AppendCheckItem(ID_NotebookTabFixedWidth, _("Fixed-width Tabs"));
+
m_perspectives_menu = new wxMenu;
m_perspectives_menu->Append(ID_CreatePerspective, _("Create Perspective"));
m_perspectives_menu->Append(ID_CopyPerspectiveCode, _("Copy Perspective Data To Clipboard"));
@@ -655,6 +722,7 @@ MyFrame::MyFrame(wxWindow* parent,
mb->Append(view_menu, _("View"));
mb->Append(m_perspectives_menu, _("Perspectives"));
mb->Append(options_menu, _("Options"));
+ mb->Append(notebook_menu, _("Notebook"));
mb->Append(help_menu, _("Help"));
SetMenuBar(mb);
@@ -664,7 +732,7 @@ MyFrame::MyFrame(wxWindow* parent,
// min size for the frame itself isn't completely done.
- // see the end up wxFrameManager::Update() for the test
+ // see the end up wxAuiManager::Update() for the test
// code. For now, just hard code a frame minimum size
SetMinSize(wxSize(400,300));
@@ -728,6 +796,7 @@ MyFrame::MyFrame(wxWindow* parent,
tb4->AddTool(101, wxT("Item 6"), tb4_bmp1);
tb4->AddTool(101, wxT("Item 7"), tb4_bmp1);
tb4->AddTool(101, wxT("Item 8"), tb4_bmp1);
+ tb4->AddControl(new wxComboBox(tb4, -1));
tb4->Realize();
// create some toolbars
@@ -742,119 +811,122 @@ MyFrame::MyFrame(wxWindow* parent,
tb5->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_MISSING_IMAGE));
tb5->Realize();
-
// add a bunch of panes
- m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo().
Name(wxT("test1")).Caption(wxT("Pane Caption")).
Top());
- m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo().
Name(wxT("test2")).Caption(wxT("Client Size Reporter")).
- Bottom().Position(1));
+ Bottom().Position(1).
+ CloseButton(true).MaximizeButton(true));
- m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo().
Name(wxT("test3")).Caption(wxT("Client Size Reporter")).
- Bottom());
+ Bottom().
+ CloseButton(true).MaximizeButton(true));
- m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo().
Name(wxT("test4")).Caption(wxT("Pane Caption")).
Left());
- m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo().
Name(wxT("test5")).Caption(wxT("No Close Button")).
Right().CloseButton(false));
- m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo().
Name(wxT("test6")).Caption(wxT("Client Size Reporter")).
- Right().Row(1));
+ Right().Row(1).
+ CloseButton(true).MaximizeButton(true));
- m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo().
Name(wxT("test7")).Caption(wxT("Client Size Reporter")).
- Left().Layer(1));
+ Left().Layer(1).
+ CloseButton(true).MaximizeButton(true));
- m_mgr.AddPane(CreateTreeCtrl(), wxPaneInfo().
+ m_mgr.AddPane(CreateTreeCtrl(), wxAuiPaneInfo().
Name(wxT("test8")).Caption(wxT("Tree Pane")).
- Left().Layer(1).Position(1));
+ Left().Layer(1).Position(1).
+ CloseButton(true).MaximizeButton(true));
- m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo().
Name(wxT("test9")).Caption(wxT("Min Size 200x100")).
BestSize(wxSize(200,100)).MinSize(wxSize(200,100)).
- Bottom().Layer(1));
+ Bottom().Layer(1).
+ CloseButton(true).MaximizeButton(true));
wxWindow* wnd10 = CreateTextCtrl(wxT("This pane will prompt the user before hiding."));
- m_mgr.AddPane(wnd10, wxPaneInfo().
+ m_mgr.AddPane(wnd10, wxAuiPaneInfo().
Name(wxT("test10")).Caption(wxT("Text Pane with Hide Prompt")).
Bottom().Layer(1).Position(1));
- m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo().
Name(wxT("test11")).Caption(wxT("Fixed Pane")).
Bottom().Layer(1).Position(2).Fixed());
- m_mgr.AddPane(new SettingsPanel(this,this), wxPaneInfo().
+ m_mgr.AddPane(new SettingsPanel(this,this), wxAuiPaneInfo().
Name(wxT("settings")).Caption(wxT("Dock Manager Settings")).
Dockable(false).Float().Hide());
// create some center panes
- m_mgr.AddPane(CreateGrid(), wxPaneInfo().Name(wxT("grid_content")).
+ m_mgr.AddPane(CreateGrid(), wxAuiPaneInfo().Name(wxT("grid_content")).
CenterPane().Hide());
- m_mgr.AddPane(CreateTreeCtrl(), wxPaneInfo().Name(wxT("tree_content")).
+ m_mgr.AddPane(CreateTreeCtrl(), wxAuiPaneInfo().Name(wxT("tree_content")).
CenterPane().Hide());
- m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().Name(wxT("sizereport_content")).
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo().Name(wxT("sizereport_content")).
CenterPane().Hide());
- m_mgr.AddPane(CreateTextCtrl(), wxPaneInfo().Name(wxT("text_content")).
+ m_mgr.AddPane(CreateTextCtrl(), wxAuiPaneInfo().Name(wxT("text_content")).
CenterPane().Hide());
- m_mgr.AddPane(CreateHTMLCtrl(), wxPaneInfo().Name(wxT("html_content")).
- CenterPane());
+ m_mgr.AddPane(CreateHTMLCtrl(), wxAuiPaneInfo().Name(wxT("html_content")).
+ CenterPane().Hide());
- m_mgr.AddPane(CreateNotebook(), wxPaneInfo().Name(wxT("notebook_content")).
+ m_mgr.AddPane(CreateNotebook(), wxAuiPaneInfo().Name(wxT("notebook_content")).
CenterPane().PaneBorder(false));
// add the toolbars to the manager
-
- m_mgr.AddPane(tb1, wxPaneInfo().
+ m_mgr.AddPane(tb1, wxAuiPaneInfo().
Name(wxT("tb1")).Caption(wxT("Big Toolbar")).
ToolbarPane().Top().
LeftDockable(false).RightDockable(false));
- m_mgr.AddPane(tb2, wxPaneInfo().
+ m_mgr.AddPane(tb2, wxAuiPaneInfo().
Name(wxT("tb2")).Caption(wxT("Toolbar 2")).
ToolbarPane().Top().Row(1).
LeftDockable(false).RightDockable(false));
- m_mgr.AddPane(tb3, wxPaneInfo().
+ m_mgr.AddPane(tb3, wxAuiPaneInfo().
Name(wxT("tb3")).Caption(wxT("Toolbar 3")).
ToolbarPane().Top().Row(1).Position(1).
LeftDockable(false).RightDockable(false));
- m_mgr.AddPane(tb4, wxPaneInfo().
+ m_mgr.AddPane(tb4, wxAuiPaneInfo().
Name(wxT("tb4")).Caption(wxT("Sample Bookmark Toolbar")).
ToolbarPane().Top().Row(2).
LeftDockable(false).RightDockable(false));
- m_mgr.AddPane(tb5, wxPaneInfo().
+ m_mgr.AddPane(tb5, wxAuiPaneInfo().
Name(wxT("tb5")).Caption(wxT("Sample Vertical Toolbar")).
ToolbarPane().Left().
GripperTop().
TopDockable(false).BottomDockable(false));
m_mgr.AddPane(new wxButton(this, wxID_ANY, _("Test Button")),
- wxPaneInfo().Name(wxT("tb6")).
+ wxAuiPaneInfo().Name(wxT("tb6")).
ToolbarPane().Top().Row(2).Position(1).
LeftDockable(false).RightDockable(false));
-
// make some default perspectives
wxString perspective_all = m_mgr.SavePerspective();
int i, count;
- wxPaneInfoArray& all_panes = m_mgr.GetAllPanes();
+ wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes();
for (i = 0, count = all_panes.GetCount(); i < count; ++i)
if (!all_panes.Item(i).IsToolbar())
all_panes.Item(i).Hide();
@@ -868,7 +940,7 @@ MyFrame::MyFrame(wxWindow* parent,
m_perspectives.Add(perspective_default);
m_perspectives.Add(perspective_all);
- // "commit" all changes made to wxFrameManager
+ // "commit" all changes made to wxAuiManager
m_mgr.Update();
}
@@ -877,7 +949,7 @@ MyFrame::~MyFrame()
m_mgr.UnInit();
}
-wxDockArt* MyFrame::GetDockArt()
+wxAuiDockArt* MyFrame::GetDockArt()
{
return m_mgr.GetArtProvider();
}
@@ -900,7 +972,7 @@ void MyFrame::OnSize(wxSizeEvent& event)
void MyFrame::OnSettings(wxCommandEvent& WXUNUSED(event))
{
// show the settings pane, and float it
- wxPaneInfo& floating_pane = m_mgr.GetPane(wxT("settings")).Float().Show();
+ wxAuiPaneInfo& floating_pane = m_mgr.GetPane(wxT("settings")).Float().Show();
if (floating_pane.floating_pos == wxDefaultPosition)
floating_pane.FloatingPosition(GetStartPosition());
@@ -919,7 +991,7 @@ void MyFrame::OnGradient(wxCommandEvent& event)
case ID_HorizontalGradient: gradient = wxAUI_GRADIENT_HORIZONTAL; break;
}
- m_mgr.GetArtProvider()->SetMetric(wxAUI_ART_GRADIENT_TYPE, gradient);
+ m_mgr.GetArtProvider()->SetMetric(wxAUI_DOCKART_GRADIENT_TYPE, gradient);
m_mgr.Update();
}
@@ -971,6 +1043,85 @@ void MyFrame::OnManagerFlag(wxCommandEvent& event)
m_mgr.Update();
}
+
+void MyFrame::OnNotebookFlag(wxCommandEvent& event)
+{
+ int id = event.GetId();
+
+ if (id == ID_NotebookNoCloseButton ||
+ id == ID_NotebookCloseButton ||
+ id == ID_NotebookCloseButtonAll ||
+ id == ID_NotebookCloseButtonActive)
+ {
+ m_notebook_style &= ~(wxAUI_NB_CLOSE_BUTTON |
+ wxAUI_NB_CLOSE_ON_ACTIVE_TAB |
+ wxAUI_NB_CLOSE_ON_ALL_TABS);
+
+ switch (id)
+ {
+ case ID_NotebookNoCloseButton: break;
+ case ID_NotebookCloseButton: m_notebook_style |= wxAUI_NB_CLOSE_BUTTON; break;
+ case ID_NotebookCloseButtonAll: m_notebook_style |= wxAUI_NB_CLOSE_ON_ALL_TABS; break;
+ case ID_NotebookCloseButtonActive: m_notebook_style |= wxAUI_NB_CLOSE_ON_ACTIVE_TAB; break;
+ }
+ }
+
+ if (id == ID_NotebookAllowTabMove)
+ {
+ m_notebook_style ^= wxAUI_NB_TAB_MOVE;
+ }
+ if (id == ID_NotebookAllowTabExternalMove)
+ {
+ m_notebook_style ^= wxAUI_NB_TAB_EXTERNAL_MOVE;
+ }
+ else if (id == ID_NotebookAllowTabSplit)
+ {
+ m_notebook_style ^= wxAUI_NB_TAB_SPLIT;
+ }
+ else if (id == ID_NotebookWindowList)
+ {
+ m_notebook_style ^= wxAUI_NB_WINDOWLIST_BUTTON;
+ }
+ else if (id == ID_NotebookScrollButtons)
+ {
+ m_notebook_style ^= wxAUI_NB_SCROLL_BUTTONS;
+ }
+ else if (id == ID_NotebookTabFixedWidth)
+ {
+ m_notebook_style ^= wxAUI_NB_TAB_FIXED_WIDTH;
+ }
+
+
+ size_t i, count;
+ wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes();
+ for (i = 0, count = all_panes.GetCount(); i < count; ++i)
+ {
+ wxAuiPaneInfo& pane = all_panes.Item(i);
+ if (pane.window->IsKindOf(CLASSINFO(wxAuiNotebook)))
+ {
+ wxAuiNotebook* nb = (wxAuiNotebook*)pane.window;
+
+ if (id == ID_NotebookArtGloss)
+ {
+ nb->SetArtProvider(new wxAuiDefaultTabArt);
+ m_notebook_theme = 0;
+ }
+ else if (id == ID_NotebookArtSimple)
+ {
+ nb->SetArtProvider(new wxAuiSimpleTabArt);
+ m_notebook_theme = 1;
+ }
+
+
+ nb->SetWindowStyleFlag(m_notebook_style);
+ nb->Refresh();
+ }
+ }
+
+
+}
+
+
void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
{
unsigned int flags = m_mgr.GetFlags();
@@ -978,13 +1129,13 @@ void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
switch (event.GetId())
{
case ID_NoGradient:
- event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_NONE);
+ event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_DOCKART_GRADIENT_TYPE) == wxAUI_GRADIENT_NONE);
break;
case ID_VerticalGradient:
- event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_VERTICAL);
+ event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_DOCKART_GRADIENT_TYPE) == wxAUI_GRADIENT_VERTICAL);
break;
case ID_HorizontalGradient:
- event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_HORIZONTAL);
+ event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_DOCKART_GRADIENT_TYPE) == wxAUI_GRADIENT_HORIZONTAL);
break;
case ID_AllowFloating:
event.Check((flags & wxAUI_MGR_ALLOW_FLOATING) != 0);
@@ -1012,10 +1163,48 @@ void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
case ID_NoVenetianFade:
event.Check((flags & wxAUI_MGR_NO_VENETIAN_BLINDS_FADE) != 0);
break;
+
+ case ID_NotebookNoCloseButton:
+ event.Check((m_notebook_style & (wxAUI_NB_CLOSE_BUTTON|wxAUI_NB_CLOSE_ON_ALL_TABS|wxAUI_NB_CLOSE_ON_ACTIVE_TAB)) != 0);
+ break;
+ case ID_NotebookCloseButton:
+ event.Check((m_notebook_style & wxAUI_NB_CLOSE_BUTTON) != 0);
+ break;
+ case ID_NotebookCloseButtonAll:
+ event.Check((m_notebook_style & wxAUI_NB_CLOSE_ON_ALL_TABS) != 0);
+ break;
+ case ID_NotebookCloseButtonActive:
+ event.Check((m_notebook_style & wxAUI_NB_CLOSE_ON_ACTIVE_TAB) != 0);
+ break;
+ case ID_NotebookAllowTabSplit:
+ event.Check((m_notebook_style & wxAUI_NB_TAB_SPLIT) != 0);
+ break;
+ case ID_NotebookAllowTabMove:
+ event.Check((m_notebook_style & wxAUI_NB_TAB_MOVE) != 0);
+ break;
+ case ID_NotebookAllowTabExternalMove:
+ event.Check((m_notebook_style & wxAUI_NB_TAB_EXTERNAL_MOVE) != 0);
+ break;
+ case ID_NotebookScrollButtons:
+ event.Check((m_notebook_style & wxAUI_NB_SCROLL_BUTTONS) != 0);
+ break;
+ case ID_NotebookWindowList:
+ event.Check((m_notebook_style & wxAUI_NB_WINDOWLIST_BUTTON) != 0);
+ break;
+ case ID_NotebookTabFixedWidth:
+ event.Check((m_notebook_style & wxAUI_NB_TAB_FIXED_WIDTH) != 0);
+ break;
+ case ID_NotebookArtGloss:
+ event.Check(m_notebook_style == 0);
+ break;
+ case ID_NotebookArtSimple:
+ event.Check(m_notebook_style == 1);
+ break;
+
}
}
-void MyFrame::OnPaneClose(wxFrameManagerEvent& evt)
+void MyFrame::OnPaneClose(wxAuiManagerEvent& evt)
{
if (evt.pane->name == wxT("test10"))
{
@@ -1046,7 +1235,7 @@ void MyFrame::OnCreatePerspective(wxCommandEvent& WXUNUSED(event))
m_perspectives.Add(m_mgr.SavePerspective());
}
-void MyFrame::OnCopyPerspectiveCode(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnCopyPerspectiveCode(wxCommandEvent& WXUNUSED(evt))
{
wxString s = m_mgr.SavePerspective();
@@ -1059,11 +1248,31 @@ void MyFrame::OnCopyPerspectiveCode(wxCommandEvent& WXUNUSED(event))
#endif
}
-void MyFrame::OnRestorePerspective(wxCommandEvent& event)
+void MyFrame::OnRestorePerspective(wxCommandEvent& evt)
{
- m_mgr.LoadPerspective(m_perspectives.Item(event.GetId() - ID_FirstPerspective));
+ m_mgr.LoadPerspective(m_perspectives.Item(evt.GetId() - ID_FirstPerspective));
+}
+
+void MyFrame::OnNotebookPageClose(wxAuiNotebookEvent& evt)
+{
+ wxAuiNotebook* ctrl = (wxAuiNotebook*)evt.GetEventObject();
+ if (ctrl->GetPage(evt.GetSelection())->IsKindOf(CLASSINFO(wxHtmlWindow)))
+ {
+ int res = wxMessageBox(wxT("Are you sure you want to close/hide this notebook page?"),
+ wxT("wxAUI"),
+ wxYES_NO,
+ this);
+ if (res != wxYES)
+ evt.Veto();
+ }
}
+void MyFrame::OnAllowNotebookDnD(wxAuiNotebookEvent& evt)
+{
+ // for the purpose of this test application, explicitly
+ // allow all noteboko drag and drop events
+ evt.Allow();
+}
wxPoint MyFrame::GetStartPosition()
{
@@ -1075,8 +1284,8 @@ wxPoint MyFrame::GetStartPosition()
void MyFrame::OnCreateTree(wxCommandEvent& WXUNUSED(event))
{
- m_mgr.AddPane(CreateTreeCtrl(), wxPaneInfo().
- Name(wxT("Test")).Caption(wxT("Tree Control")).
+ m_mgr.AddPane(CreateTreeCtrl(), wxAuiPaneInfo().
+ Caption(wxT("Tree Control")).
Float().FloatingPosition(GetStartPosition()).
FloatingSize(wxSize(150,300)));
m_mgr.Update();
@@ -1084,8 +1293,8 @@ void MyFrame::OnCreateTree(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnCreateGrid(wxCommandEvent& WXUNUSED(event))
{
- m_mgr.AddPane(CreateGrid(), wxPaneInfo().
- Name(wxT("Test")).Caption(wxT("Grid")).
+ m_mgr.AddPane(CreateGrid(), wxAuiPaneInfo().
+ Caption(wxT("Grid")).
Float().FloatingPosition(GetStartPosition()).
FloatingSize(wxSize(300,200)));
m_mgr.Update();
@@ -1093,8 +1302,8 @@ void MyFrame::OnCreateGrid(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnCreateHTML(wxCommandEvent& WXUNUSED(event))
{
- m_mgr.AddPane(CreateHTMLCtrl(), wxPaneInfo().
- Name(wxT("Test")).Caption(wxT("HTML Control")).
+ m_mgr.AddPane(CreateHTMLCtrl(), wxAuiPaneInfo().
+ Caption(wxT("HTML Control")).
Float().FloatingPosition(GetStartPosition()).
FloatingSize(wxSize(300,200)));
m_mgr.Update();
@@ -1102,26 +1311,28 @@ void MyFrame::OnCreateHTML(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnCreateNotebook(wxCommandEvent& WXUNUSED(event))
{
- m_mgr.AddPane(CreateNotebook(), wxPaneInfo().
- Name(wxT("Test")).Caption(wxT("Notebook")).
+ m_mgr.AddPane(CreateNotebook(), wxAuiPaneInfo().
+ Caption(wxT("Notebook")).
Float().FloatingPosition(GetStartPosition()).
- FloatingSize(wxSize(300,200)));
+ //FloatingSize(300,200).
+ CloseButton(true).MaximizeButton(true));
m_mgr.Update();
}
void MyFrame::OnCreateText(wxCommandEvent& WXUNUSED(event))
{
- m_mgr.AddPane(CreateTextCtrl(), wxPaneInfo().
- Name(wxT("Test")).Caption(wxT("Text Control")).
+ m_mgr.AddPane(CreateTextCtrl(), wxAuiPaneInfo().
+ Caption(wxT("Text Control")).
Float().FloatingPosition(GetStartPosition()));
m_mgr.Update();
}
void MyFrame::OnCreateSizeReport(wxCommandEvent& WXUNUSED(event))
{
- m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
- Name(wxT("Test")).Caption(wxT("Client Size Reporter")).
- Float().FloatingPosition(GetStartPosition()));
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo().
+ Caption(wxT("Client Size Reporter")).
+ Float().FloatingPosition(GetStartPosition()).
+ CloseButton(true).MaximizeButton(true));
m_mgr.Update();
}
@@ -1177,16 +1388,17 @@ wxTreeCtrl* MyFrame::CreateTreeCtrl()
wxTreeCtrl* tree = new wxTreeCtrl(this, wxID_ANY,
wxPoint(0,0), wxSize(160,250),
wxTR_DEFAULT_STYLE | wxNO_BORDER);
-
- wxTreeItemId root = tree->AddRoot(wxT("wxAUI Project"));
- wxArrayTreeItemIds items;
-
-
+
wxImageList* imglist = new wxImageList(16, 16, true, 2);
imglist->Add(wxArtProvider::GetBitmap(wxART_FOLDER, wxART_OTHER, wxSize(16,16)));
imglist->Add(wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_OTHER, wxSize(16,16)));
tree->AssignImageList(imglist);
+ wxTreeItemId root = tree->AddRoot(wxT("wxAUI Project"), 0);
+ wxArrayTreeItemIds items;
+
+
+
items.Add(tree->AppendItem(root, wxT("Item 1"), 0));
items.Add(tree->AppendItem(root, wxT("Item 2"), 0));
items.Add(tree->AppendItem(root, wxT("Item 3"), 0));
@@ -1231,13 +1443,19 @@ wxHtmlWindow* MyFrame::CreateHTMLCtrl(wxWindow* parent)
return ctrl;
}
-wxAuiMultiNotebook* MyFrame::CreateNotebook()
+wxAuiNotebook* MyFrame::CreateNotebook()
{
- wxAuiMultiNotebook* ctrl = new wxAuiMultiNotebook( this, wxID_ANY,
- wxDefaultPosition, wxSize(400,300),
- wxAUI_NB_DEFAULT_STYLE | wxNO_BORDER );
+ // create the notebook off-window to avoid flicker
+ wxSize client_size = GetClientSize();
+
+ wxAuiNotebook* ctrl = new wxAuiNotebook(this, wxID_ANY,
+ wxPoint(client_size.x, client_size.y),
+ wxSize(430,200),
+ m_notebook_style);
+
+ wxBitmap page_bmp = wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_OTHER, wxSize(16,16));
- ctrl->AddPage(CreateHTMLCtrl(ctrl), wxT("Welcome"));
+ ctrl->AddPage(CreateHTMLCtrl(ctrl), wxT("Welcome to wxAUI") , false, page_bmp);
wxPanel *panel = new wxPanel( ctrl, wxID_ANY );
wxFlexGridSizer *flex = new wxFlexGridSizer( 2 );
@@ -1253,10 +1471,11 @@ wxAuiMultiNotebook* MyFrame::CreateNotebook()
wxSP_ARROW_KEYS, 5, 50, 5 ), 0, wxALL|wxALIGN_CENTRE, 5 );
flex->Add( 5,5 ); flex->Add( 5,5 );
panel->SetSizer( flex );
- ctrl->AddPage( panel, wxT("wxPanel") );
+ ctrl->AddPage( panel, wxT("wxPanel"), false, page_bmp );
+
ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some text"),
- wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 1") );
+ wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 1"), false, page_bmp );
ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"),
wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 2") );
@@ -1274,7 +1493,7 @@ wxAuiMultiNotebook* MyFrame::CreateNotebook()
wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 6") );
ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"),
- wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 7") );
+ wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 7 (longer title)") );
ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"),
wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 8") );
@@ -1300,6 +1519,17 @@ wxString MyFrame::GetIntroText()
"Customizable floating/docking behavior"
"Completely customizable look-and-feel"
"Optional transparent window effects (while dragging or docking)"
+ "Splittable notebook control"
+ ""
+ "What's new in 0.9.3?
"
+ "wxAUI 0.9.3, which is now bundled with wxWidgets, adds the following features:"
+ "
"
+ "- New wxAuiNotebook class, a dynamic splittable notebook control
"
+ "- New wxAuiMDI* classes, a tab-based MDI and drop-in replacement for classic MDI
"
+ "- Maximize/Restore buttons implemented
"
+ "- Better hinting with wxGTK
"
+ "- Class rename. 'wxAui' is now the standard class prefix for all wxAUI classes
"
+ "- Lots of bug fixes
"
"
"
"What's new in 0.9.2?
"
"The following features/fixes have been added since the last version of wxAUI:
"