X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70476471b7d927784540d64890b9bedb56ff6fb7..a6c82d64cea683018dfab0f65c1e26ec07eab0c3:/samples/aui/auidemo.cpp

diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp
index 62ccc0c621..d036cf2e20 100644
--- a/samples/aui/auidemo.cpp
+++ b/samples/aui/auidemo.cpp
@@ -16,8 +16,7 @@
     #pragma hdrstop
 #endif
 
-#include "wx/wx.h"
-
+#include "wx/app.h"
 #include "wx/grid.h"
 #include "wx/treectrl.h"
 #include "wx/spinctrl.h"
@@ -28,6 +27,13 @@
 #include "wx/wxhtml.h"
 #include "wx/imaglist.h"
 #include "wx/dataobj.h"
+#include "wx/dcclient.h"
+#include "wx/bmpbuttn.h"
+#include "wx/menu.h"
+#include "wx/toolbar.h"
+#include "wx/statusbr.h"
+#include "wx/msgdlg.h"
+#include "wx/textdlg.h"
 
 #include "wx/aui/aui.h"
 #include "../sample.xpm"
@@ -68,14 +74,22 @@ class MyFrame : public wxFrame
         ID_AllowFloating,
         ID_AllowActivePane,
         ID_TransparentHint,
-        ID_TransparentHintFade,
-        ID_DisableVenetian,
-        ID_DisableVenetianFade,
+        ID_VenetianBlindsHint,
+        ID_RectangleHint,
+        ID_NoHint,
+        ID_HintFade,
+        ID_NoVenetianFade,
         ID_TransparentDrag,
         ID_NoGradient,
         ID_VerticalGradient,
         ID_HorizontalGradient,
         ID_Settings,
+        ID_NotebookNoCloseButton,
+        ID_NotebookCloseButton,
+        ID_NotebookCloseButtonAll,
+        ID_NotebookCloseButtonActive,
+        ID_NotebookAllowTabMove,
+        ID_NotebookAllowTabSplit,
         ID_FirstPerspective = ID_CreatePerspective+1000
     };
 
@@ -89,7 +103,7 @@ public:
 
     ~MyFrame();
 
-    wxDockArt* GetDockArt();
+    wxAuiDockArt* GetDockArt();
     void DoUpdate();
 
 private:
@@ -98,8 +112,8 @@ private:
     wxTreeCtrl* CreateTreeCtrl();
     wxSizeReportCtrl* CreateSizeReportCtrl(int width = 80, int height = 80);
     wxPoint GetStartPosition();
-    wxHtmlWindow* CreateHTMLCtrl();
-    wxAuiMultiNotebook* CreateNotebook();
+    wxHtmlWindow* CreateHTMLCtrl(wxWindow* parent = NULL);
+    wxAuiNotebook* CreateNotebook();
 
     wxString GetIntroText();
 
@@ -124,21 +138,22 @@ private:
 
     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;
 
     DECLARE_EVENT_TABLE()
 };
 
 
-
 // -- wxSizeReportCtrl --
 // (a utility control that always reports it's client size)
 
@@ -149,7 +164,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;
@@ -179,7 +194,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);
@@ -210,7 +225,7 @@ private:
     }
 private:
 
-    wxFrameManager* m_mgr;
+    wxAuiManager* m_mgr;
 
     DECLARE_EVENT_TABLE()
 };
@@ -222,10 +237,6 @@ BEGIN_EVENT_TABLE(wxSizeReportCtrl, wxControl)
 END_EVENT_TABLE()
 
 
-
-
-
-
 class SettingsPanel : public wxPanel
 {
     enum
@@ -525,11 +536,6 @@ BEGIN_EVENT_TABLE(SettingsPanel, wxPanel)
 END_EVENT_TABLE()
 
 
-
-
-
-
-
 bool MyApp::OnInit()
 {
     wxFrame* frame = new MyFrame(NULL,
@@ -543,8 +549,6 @@ bool MyApp::OnInit()
     return true;
 }
 
-
-
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_ERASE_BACKGROUND(MyFrame::OnEraseBackground)
     EVT_SIZE(MyFrame::OnSize)
@@ -557,11 +561,19 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(MyFrame::ID_CopyPerspectiveCode, MyFrame::OnCopyPerspectiveCode)
     EVT_MENU(ID_AllowFloating, MyFrame::OnManagerFlag)
     EVT_MENU(ID_TransparentHint, MyFrame::OnManagerFlag)
-    EVT_MENU(ID_TransparentHintFade, MyFrame::OnManagerFlag)
-    EVT_MENU(ID_DisableVenetian, MyFrame::OnManagerFlag)
-    EVT_MENU(ID_DisableVenetianFade, MyFrame::OnManagerFlag)
+    EVT_MENU(ID_VenetianBlindsHint, MyFrame::OnManagerFlag)
+    EVT_MENU(ID_RectangleHint, MyFrame::OnManagerFlag)
+    EVT_MENU(ID_NoHint, MyFrame::OnManagerFlag)
+    EVT_MENU(ID_HintFade, MyFrame::OnManagerFlag)
+    EVT_MENU(ID_NoVenetianFade, MyFrame::OnManagerFlag)
     EVT_MENU(ID_TransparentDrag, MyFrame::OnManagerFlag)
     EVT_MENU(ID_AllowActivePane, MyFrame::OnManagerFlag)
+    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_NotebookAllowTabSplit, MyFrame::OnNotebookFlag)
     EVT_MENU(ID_NoGradient, MyFrame::OnGradient)
     EVT_MENU(ID_VerticalGradient, MyFrame::OnGradient)
     EVT_MENU(ID_HorizontalGradient, MyFrame::OnGradient)
@@ -574,11 +586,19 @@ 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_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_NotebookAllowTabSplit, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_AllowFloating, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_TransparentHint, MyFrame::OnUpdateUI)
-    EVT_UPDATE_UI(ID_TransparentHintFade, MyFrame::OnUpdateUI)
-    EVT_UPDATE_UI(ID_DisableVenetian, MyFrame::OnUpdateUI)
-    EVT_UPDATE_UI(ID_DisableVenetianFade, MyFrame::OnUpdateUI)
+    EVT_UPDATE_UI(ID_VenetianBlindsHint, MyFrame::OnUpdateUI)
+    EVT_UPDATE_UI(ID_RectangleHint, MyFrame::OnUpdateUI)
+    EVT_UPDATE_UI(ID_NoHint, MyFrame::OnUpdateUI)
+    EVT_UPDATE_UI(ID_HintFade, MyFrame::OnUpdateUI)
+    EVT_UPDATE_UI(ID_NoVenetianFade, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_TransparentDrag, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_NoGradient, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_VerticalGradient, MyFrame::OnUpdateUI)
@@ -589,7 +609,6 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()
 
 
-
 MyFrame::MyFrame(wxWindow* parent,
                  wxWindowID id,
                  const wxString& title,
@@ -598,12 +617,15 @@ 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 | wxNO_BORDER;
+
     // create menu
     wxMenuBar* mb = new wxMenuBar;
 
@@ -625,11 +647,14 @@ MyFrame::MyFrame(wxWindow* parent,
     view_menu->Append(ID_SizeReportContent, _("Use a Size Reporter for the Content Pane"));
 
     wxMenu* options_menu = new wxMenu;
+    options_menu->AppendRadioItem(ID_TransparentHint, _("Transparent Hint"));
+    options_menu->AppendRadioItem(ID_VenetianBlindsHint, _("Venetian Blinds Hint"));
+    options_menu->AppendRadioItem(ID_RectangleHint, _("Rectangle Hint"));
+    options_menu->AppendRadioItem(ID_NoHint, _("No Hint"));
+    options_menu->AppendSeparator();
+    options_menu->AppendCheckItem(ID_HintFade, _("Hint Fade-in"));
     options_menu->AppendCheckItem(ID_AllowFloating, _("Allow Floating"));
-    options_menu->AppendCheckItem(ID_TransparentHint, _("Transparent Hint"));
-    options_menu->AppendCheckItem(ID_TransparentHintFade, _("Transparent Hint Fade-in"));
-    options_menu->AppendCheckItem(ID_DisableVenetian, _("Disable Venetian Blinds Hint"));
-    options_menu->AppendCheckItem(ID_DisableVenetianFade, _("Disable Venetian Blinds Hint Fade-in"));
+    options_menu->AppendCheckItem(ID_NoVenetianFade, _("Disable Venetian Blinds Hint Fade-in"));
     options_menu->AppendCheckItem(ID_TransparentDrag, _("Transparent Drag"));
     options_menu->AppendCheckItem(ID_AllowActivePane, _("Allow Active Pane"));
     options_menu->AppendSeparator();
@@ -639,6 +664,15 @@ MyFrame::MyFrame(wxWindow* parent,
     options_menu->AppendSeparator();
     options_menu->Append(ID_Settings, _("Settings Pane"));
 
+    wxMenu* notebook_menu = new wxMenu;
+    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_NotebookAllowTabSplit, _("Allow Notebook Split"));
+
     m_perspectives_menu = new wxMenu;
     m_perspectives_menu->Append(ID_CreatePerspective, _("Create Perspective"));
     m_perspectives_menu->Append(ID_CopyPerspectiveCode, _("Copy Perspective Data To Clipboard"));
@@ -653,6 +687,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);
@@ -662,7 +697,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));
 
@@ -679,7 +714,6 @@ MyFrame::MyFrame(wxWindow* parent,
     tb1->Realize();
 
 
-
     wxToolBar* tb2 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
                                    wxTB_FLAT | wxTB_NODIVIDER);
     tb2->SetToolBitmapSize(wxSize(16,16));
@@ -714,7 +748,6 @@ MyFrame::MyFrame(wxWindow* parent,
     tb3->Realize();
 
 
-
     wxToolBar* tb4 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
                                    wxTB_FLAT | wxTB_NODIVIDER | wxTB_HORZ_TEXT);
     tb4->SetToolBitmapSize(wxSize(16,16));
@@ -742,119 +775,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).
+                  PinButton(true).CloseButton(true).MaximizeButton(true));
 
-    m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+    m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo().
                   Name(wxT("test3")).Caption(wxT("Client Size Reporter")).
-                  Bottom());
+                  Bottom().
+                  PinButton(true).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).
+                  PinButton(true).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).
+                  PinButton(true).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")).
+    m_mgr.AddPane(CreateHTMLCtrl(), wxAuiPaneInfo().Name(wxT("html_content")).
                   CenterPane());
 
-    m_mgr.AddPane(CreateNotebook(), wxPaneInfo().Name(wxT("notebook_content")).
-                  CenterPane());
+    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();
@@ -862,13 +898,13 @@ MyFrame::MyFrame(wxWindow* parent,
     m_mgr.GetPane(wxT("tb6")).Hide();
     m_mgr.GetPane(wxT("test8")).Show().Left().Layer(0).Row(0).Position(0);
     m_mgr.GetPane(wxT("test10")).Show().Bottom().Layer(0).Row(0).Position(0);
-    m_mgr.GetPane(wxT("html_content")).Show();
+    m_mgr.GetPane(wxT("notebook_content")).Show();
     wxString perspective_default = m_mgr.SavePerspective();
 
     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 +913,7 @@ MyFrame::~MyFrame()
     m_mgr.UnInit();
 }
 
-wxDockArt* MyFrame::GetDockArt()
+wxAuiDockArt* MyFrame::GetDockArt()
 {
     return m_mgr.GetArtProvider();
 }
@@ -887,7 +923,6 @@ void MyFrame::DoUpdate()
     m_mgr.Update();
 }
 
-
 void MyFrame::OnEraseBackground(wxEraseEvent& event)
 {
     event.Skip();
@@ -901,7 +936,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());
@@ -909,7 +944,6 @@ void MyFrame::OnSettings(wxCommandEvent& WXUNUSED(event))
     m_mgr.Update();
 }
 
-
 void MyFrame::OnGradient(wxCommandEvent& event)
 {
     int gradient = 0;
@@ -932,27 +966,99 @@ void MyFrame::OnManagerFlag(wxCommandEvent& event)
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXGTK__)
     if (event.GetId() == ID_TransparentDrag ||
         event.GetId() == ID_TransparentHint ||
-        event.GetId() == ID_TransparentHintFade)
+        event.GetId() == ID_HintFade)
     {
         wxMessageBox(wxT("This option is presently only available on wxGTK, wxMSW and wxMac"));
         return;
     }
 #endif
 
-    switch (event.GetId())
+    int id = event.GetId();
+
+    if (id == ID_TransparentHint ||
+        id == ID_VenetianBlindsHint ||
+        id == ID_RectangleHint ||
+        id == ID_NoHint)
+    {
+        unsigned int flags = m_mgr.GetFlags();
+        flags &= ~wxAUI_MGR_TRANSPARENT_HINT;
+        flags &= ~wxAUI_MGR_VENETIAN_BLINDS_HINT;
+        flags &= ~wxAUI_MGR_RECTANGLE_HINT;
+        m_mgr.SetFlags(flags);
+    }
+
+    switch (id)
     {
         case ID_AllowFloating: flag = wxAUI_MGR_ALLOW_FLOATING; break;
         case ID_TransparentDrag: flag = wxAUI_MGR_TRANSPARENT_DRAG; break;
-        case ID_TransparentHint: flag = wxAUI_MGR_TRANSPARENT_HINT; break;
-        case ID_TransparentHintFade: flag = wxAUI_MGR_TRANSPARENT_HINT_FADE; break;
-        case ID_DisableVenetian: flag = wxAUI_MGR_DISABLE_VENETIAN_BLINDS; break;
-        case ID_DisableVenetianFade: flag = wxAUI_MGR_DISABLE_VENETIAN_BLINDS_FADE; break;
+        case ID_HintFade: flag = wxAUI_MGR_HINT_FADE; break;
+        case ID_NoVenetianFade: flag = wxAUI_MGR_NO_VENETIAN_BLINDS_FADE; break;
         case ID_AllowActivePane: flag = wxAUI_MGR_ALLOW_ACTIVE_PANE; break;
+        case ID_TransparentHint: flag = wxAUI_MGR_TRANSPARENT_HINT; break;
+        case ID_VenetianBlindsHint: flag = wxAUI_MGR_VENETIAN_BLINDS_HINT; break;
+        case ID_RectangleHint: flag = wxAUI_MGR_RECTANGLE_HINT; break;
     }
-    m_mgr.SetFlags(m_mgr.GetFlags() ^ flag);
+    
+    if (flag)
+    {
+        m_mgr.SetFlags(m_mgr.GetFlags() ^ flag);
+    }
+    
     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_NotebookAllowTabSplit)
+    {
+        m_notebook_style ^= wxAUI_NB_TAB_SPLIT;
+    }
+        
+        
+        
+    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)))
+        {
+            pane.window->SetWindowStyleFlag(m_notebook_style);
+            pane.window->Refresh();
+        }
+    }
+
+
+}
+
+
 void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
 {
     unsigned int flags = m_mgr.GetFlags();
@@ -960,36 +1066,63 @@ void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
     switch (event.GetId())
     {
         case ID_NoGradient:
-            event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_NONE ? true : false);
+            event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_NONE);
             break;
         case ID_VerticalGradient:
-            event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_VERTICAL ? true : false);
+            event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_VERTICAL);
             break;
         case ID_HorizontalGradient:
-            event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_HORIZONTAL ? true : false);
+            event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_HORIZONTAL);
             break;
         case ID_AllowFloating:
-            event.Check(flags & wxAUI_MGR_ALLOW_FLOATING ? true : false);
+            event.Check((flags & wxAUI_MGR_ALLOW_FLOATING) != 0);
             break;
         case ID_TransparentDrag:
-            event.Check(flags & wxAUI_MGR_TRANSPARENT_DRAG ? true : false);
+            event.Check((flags & wxAUI_MGR_TRANSPARENT_DRAG) != 0);
             break;
         case ID_TransparentHint:
-            event.Check(flags & wxAUI_MGR_TRANSPARENT_HINT ? true : false);
+            event.Check((flags & wxAUI_MGR_TRANSPARENT_HINT) != 0);
+            break;
+        case ID_VenetianBlindsHint:
+            event.Check((flags & wxAUI_MGR_VENETIAN_BLINDS_HINT) != 0);
+            break;
+        case ID_RectangleHint:
+            event.Check((flags & wxAUI_MGR_RECTANGLE_HINT) != 0);
+            break;
+        case ID_NoHint:
+            event.Check(((wxAUI_MGR_TRANSPARENT_HINT |
+                          wxAUI_MGR_VENETIAN_BLINDS_HINT |
+                          wxAUI_MGR_RECTANGLE_HINT) & flags) == 0);
+            break;        
+        case ID_HintFade:
+            event.Check((flags & wxAUI_MGR_HINT_FADE) != 0);
+            break;
+        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_TransparentHintFade:
-            event.Check(flags & wxAUI_MGR_TRANSPARENT_HINT_FADE ? true : false);
+        case ID_NotebookCloseButtonAll:
+            event.Check((m_notebook_style & wxAUI_NB_CLOSE_ON_ALL_TABS) != 0);
             break;
-        case ID_DisableVenetian:
-            event.Check(flags & wxAUI_MGR_DISABLE_VENETIAN_BLINDS ? true : false);
+        case ID_NotebookCloseButtonActive:
+            event.Check((m_notebook_style & wxAUI_NB_CLOSE_ON_ACTIVE_TAB) != 0);
             break;
-        case ID_DisableVenetianFade:
-            event.Check(flags & wxAUI_MGR_DISABLE_VENETIAN_BLINDS_FADE ? true : false);
+        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;
     }
 }
 
-void MyFrame::OnPaneClose(wxFrameManagerEvent& evt)
+void MyFrame::OnPaneClose(wxAuiManagerEvent& evt)
 {
     if (evt.pane->name == wxT("test10"))
     {
@@ -1002,14 +1135,12 @@ void MyFrame::OnPaneClose(wxFrameManagerEvent& evt)
     }
 }
 
-
-
 void MyFrame::OnCreatePerspective(wxCommandEvent& WXUNUSED(event))
 {
     wxTextEntryDialog dlg(this, wxT("Enter a name for the new perspective:"),
                           wxT("wxAUI Test"));
 
-    dlg.SetValue(wxString::Format(wxT("Perspective %d"), m_perspectives.GetCount()+1));
+    dlg.SetValue(wxString::Format(wxT("Perspective %u"), unsigned(m_perspectives.GetCount() + 1)));
     if (dlg.ShowModal() != wxID_OK)
         return;
 
@@ -1051,7 +1182,7 @@ wxPoint MyFrame::GetStartPosition()
 
 void MyFrame::OnCreateTree(wxCommandEvent& WXUNUSED(event))
 {
-    m_mgr.AddPane(CreateTreeCtrl(), wxPaneInfo().
+    m_mgr.AddPane(CreateTreeCtrl(), wxAuiPaneInfo().
                   Name(wxT("Test")).Caption(wxT("Tree Control")).
                   Float().FloatingPosition(GetStartPosition()).
                   FloatingSize(wxSize(150,300)));
@@ -1060,7 +1191,7 @@ void MyFrame::OnCreateTree(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnCreateGrid(wxCommandEvent& WXUNUSED(event))
 {
-    m_mgr.AddPane(CreateGrid(), wxPaneInfo().
+    m_mgr.AddPane(CreateGrid(), wxAuiPaneInfo().
                   Name(wxT("Test")).Caption(wxT("Grid")).
                   Float().FloatingPosition(GetStartPosition()).
                   FloatingSize(wxSize(300,200)));
@@ -1069,8 +1200,8 @@ void MyFrame::OnCreateGrid(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnCreateHTML(wxCommandEvent& WXUNUSED(event))
 {
-    m_mgr.AddPane(CreateHTMLCtrl(), wxPaneInfo().
-                  Name(wxT("Test")).Caption(wxT("Grid")).
+    m_mgr.AddPane(CreateHTMLCtrl(), wxAuiPaneInfo().
+                  Name(wxT("Test")).Caption(wxT("HTML Control")).
                   Float().FloatingPosition(GetStartPosition()).
                   FloatingSize(wxSize(300,200)));
     m_mgr.Update();
@@ -1078,7 +1209,7 @@ void MyFrame::OnCreateHTML(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnCreateNotebook(wxCommandEvent& WXUNUSED(event))
 {
-    m_mgr.AddPane(CreateNotebook(), wxPaneInfo().
+    m_mgr.AddPane(CreateNotebook(), wxAuiPaneInfo().
                   Name(wxT("Test")).Caption(wxT("Notebook")).
                   Float().FloatingPosition(GetStartPosition()).
                   FloatingSize(wxSize(300,200)));
@@ -1087,7 +1218,7 @@ void MyFrame::OnCreateNotebook(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnCreateText(wxCommandEvent& WXUNUSED(event))
 {
-    m_mgr.AddPane(CreateTextCtrl(), wxPaneInfo().
+    m_mgr.AddPane(CreateTextCtrl(), wxAuiPaneInfo().
                   Name(wxT("Test")).Caption(wxT("Text Control")).
                   Float().FloatingPosition(GetStartPosition()));
     m_mgr.Update();
@@ -1095,20 +1226,21 @@ void MyFrame::OnCreateText(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnCreateSizeReport(wxCommandEvent& WXUNUSED(event))
 {
-    m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+    m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo().
                   Name(wxT("Test")).Caption(wxT("Client Size Reporter")).
-                  Float().FloatingPosition(GetStartPosition()));
+                  Float().FloatingPosition(GetStartPosition()).
+                  PinButton(true).CloseButton(true).MaximizeButton(true));
     m_mgr.Update();
 }
 
 void MyFrame::OnChangeContentPane(wxCommandEvent& event)
 {
-    m_mgr.GetPane(wxT("grid_content")).Show(event.GetId() == ID_GridContent ? true:false);
-    m_mgr.GetPane(wxT("text_content")).Show(event.GetId() == ID_TextContent ? true:false);
-    m_mgr.GetPane(wxT("tree_content")).Show(event.GetId() == ID_TreeContent ? true:false);
-    m_mgr.GetPane(wxT("sizereport_content")).Show(event.GetId() == ID_SizeReportContent ? true:false);
-    m_mgr.GetPane(wxT("html_content")).Show(event.GetId() == ID_HTMLContent ? true:false);
-    m_mgr.GetPane(wxT("notebook_content")).Show(event.GetId() == ID_NotebookContent ? true:false);
+    m_mgr.GetPane(wxT("grid_content")).Show(event.GetId() == ID_GridContent);
+    m_mgr.GetPane(wxT("text_content")).Show(event.GetId() == ID_TextContent);
+    m_mgr.GetPane(wxT("tree_content")).Show(event.GetId() == ID_TreeContent);
+    m_mgr.GetPane(wxT("sizereport_content")).Show(event.GetId() == ID_SizeReportContent);
+    m_mgr.GetPane(wxT("html_content")).Show(event.GetId() == ID_HTMLContent);
+    m_mgr.GetPane(wxT("notebook_content")).Show(event.GetId() == ID_NotebookContent);
     m_mgr.Update();
 }
 
@@ -1129,7 +1261,7 @@ wxTextCtrl* MyFrame::CreateTextCtrl(const wxString& ctrl_text)
     wxString text;
     if (ctrl_text.Length() > 0)
         text = ctrl_text;
-         else
+    else
         text.Printf(wxT("This is text box %d"), ++n);
 
     return new wxTextCtrl(this,wxID_ANY, text,
@@ -1195,19 +1327,25 @@ wxSizeReportCtrl* MyFrame::CreateSizeReportCtrl(int width, int height)
     return ctrl;
 }
 
-wxHtmlWindow* MyFrame::CreateHTMLCtrl()
+wxHtmlWindow* MyFrame::CreateHTMLCtrl(wxWindow* parent)
 {
-    wxHtmlWindow* ctrl = new wxHtmlWindow(this, wxID_ANY,
+    if (!parent)
+        parent = this;
+        
+    wxHtmlWindow* ctrl = new wxHtmlWindow(parent, wxID_ANY,
                                    wxDefaultPosition,
                                    wxSize(400,300));
     ctrl->SetPage(GetIntroText());
     return ctrl;
 }
 
-wxAuiMultiNotebook* MyFrame::CreateNotebook()
+wxAuiNotebook* MyFrame::CreateNotebook()
 {
-   wxAuiMultiNotebook* ctrl = new wxAuiMultiNotebook( this, wxID_ANY,
-                                    wxDefaultPosition, wxSize(400,300) );
+   wxAuiNotebook* ctrl = new wxAuiNotebook( this, wxID_ANY,
+                                    wxDefaultPosition, wxSize(400,300),
+                                    m_notebook_style );
+                                    
+   ctrl->AddPage(CreateHTMLCtrl(ctrl), wxT("Welcome"));
                                     
    wxPanel *panel = new wxPanel( ctrl, wxID_ANY );
    wxFlexGridSizer *flex = new wxFlexGridSizer( 2 );
@@ -1216,7 +1354,7 @@ wxAuiMultiNotebook* MyFrame::CreateNotebook()
    flex->AddGrowableCol( 1 );
    flex->Add( 5,5 );   flex->Add( 5,5 );
    flex->Add( new wxStaticText( panel, -1, wxT("wxTextCtrl:") ), 0, wxALL|wxALIGN_CENTRE, 5 );
-   flex->Add( new wxTextCtrl( panel, -1, wxT(""), wxDefaultPosition, wxSize(100,-1) ), 
+   flex->Add( new wxTextCtrl( panel, -1, wxT(""), wxDefaultPosition, wxSize(100,-1)), 
                 1, wxALL|wxALIGN_CENTRE, 5 );
    flex->Add( new wxStaticText( panel, -1, wxT("wxSpinCtrl:") ), 0, wxALL|wxALIGN_CENTRE, 5 );
    flex->Add( new wxSpinCtrl( panel, -1, wxT("5"), wxDefaultPosition, wxSize(100,-1), 
@@ -1226,11 +1364,31 @@ wxAuiMultiNotebook* MyFrame::CreateNotebook()
    ctrl->AddPage( panel, wxT("wxPanel") );
    
    ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some text"),
-                wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE) , wxT("wxTextCtrl I") );
+                wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 1") );
+                
+   ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"),
+                wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 2") );
+                
+   ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"),
+                wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 3") );
                 
    ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"),
-                wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE) , wxT("wxTextCtrl II") );
+                wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 4") );
+                
+   ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"),
+                wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 5") );
+   
+   ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"),
+                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") );
    
+   ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"),
+                wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 8") );
+
+
+
    return ctrl;
 }