Always link with expat in monolithic build.

[wxWidgets.git] / samples / aui / auidemo.cpp

diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp
index 44e127782dfd21a12d70541d6522488763d5a875..08d5d136d981e8bd6d6b0ddd2b05628743d06c37 100644 (file)
--- a/samples/aui/auidemo.cpp
+++ b/samples/aui/auidemo.cpp
@@ -16,8 +16,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/wx.h"
-
+#include "wx/app.h"

 #include "wx/grid.h"
 #include "wx/treectrl.h"
 #include "wx/spinctrl.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/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"
 
 #include "wx/aui/aui.h"
 #include "../sample.xpm"


@@ -56,23 +62,50 @@ class MyFrame : public wxFrame
         ID_CreateGrid,
         ID_CreateText,
         ID_CreateHTML,
         ID_CreateGrid,
         ID_CreateText,
         ID_CreateHTML,

+        ID_CreateNotebook,

         ID_CreateSizeReport,
         ID_GridContent,
         ID_TextContent,
         ID_TreeContent,
         ID_HTMLContent,
         ID_CreateSizeReport,
         ID_GridContent,
         ID_TextContent,
         ID_TreeContent,
         ID_HTMLContent,

+        ID_NotebookContent,

         ID_SizeReportContent,
         ID_CreatePerspective,
         ID_CopyPerspectiveCode,
         ID_AllowFloating,
         ID_AllowActivePane,
         ID_TransparentHint,
         ID_SizeReportContent,
         ID_CreatePerspective,
         ID_CopyPerspectiveCode,
         ID_AllowFloating,
         ID_AllowActivePane,
         ID_TransparentHint,

-        ID_TransparentHintFade,
+        ID_VenetianBlindsHint,
+        ID_RectangleHint,
+        ID_NoHint,
+        ID_HintFade,
+        ID_NoVenetianFade,

         ID_TransparentDrag,
         ID_NoGradient,
         ID_VerticalGradient,
         ID_HorizontalGradient,
         ID_TransparentDrag,
         ID_NoGradient,
         ID_VerticalGradient,
         ID_HorizontalGradient,

+        ID_LiveUpdate,
+        ID_AllowToolbarResizing,

         ID_Settings,
         ID_Settings,

+        ID_CustomizeToolbar,
+        ID_DropDownToolbarItem,
+        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_NotebookAlignTop,
+        ID_NotebookAlignBottom,
+
+        ID_SampleItem,
+

         ID_FirstPerspective = ID_CreatePerspective+1000
     };
 
         ID_FirstPerspective = ID_CreatePerspective+1000
     };
 


@@ -86,7 +119,7 @@ public:
 
     ~MyFrame();
 
 
     ~MyFrame();
 

-    wxDockArt* GetDockArt();
+    wxAuiDockArt* GetDockArt();

     void DoUpdate();
 
 private:
     void DoUpdate();
 
 private:


@@ -95,7 +128,8 @@ private:
     wxTreeCtrl* CreateTreeCtrl();
     wxSizeReportCtrl* CreateSizeReportCtrl(int width = 80, int height = 80);
     wxPoint GetStartPosition();
     wxTreeCtrl* CreateTreeCtrl();
     wxSizeReportCtrl* CreateSizeReportCtrl(int width = 80, int height = 80);
     wxPoint GetStartPosition();

-    wxHtmlWindow* CreateHTMLCtrl();
+    wxHtmlWindow* CreateHTMLCtrl(wxWindow* parent = NULL);
+    wxAuiNotebook* CreateNotebook();

 
     wxString GetIntroText();
 
 
     wxString GetIntroText();
 


@@ -107,33 +141,43 @@ private:
     void OnCreateTree(wxCommandEvent& evt);
     void OnCreateGrid(wxCommandEvent& evt);
     void OnCreateHTML(wxCommandEvent& evt);
     void OnCreateTree(wxCommandEvent& evt);
     void OnCreateGrid(wxCommandEvent& evt);
     void OnCreateHTML(wxCommandEvent& evt);

+    void OnCreateNotebook(wxCommandEvent& evt);

     void OnCreateText(wxCommandEvent& evt);
     void OnCreateSizeReport(wxCommandEvent& evt);
     void OnChangeContentPane(wxCommandEvent& evt);
     void OnCreateText(wxCommandEvent& evt);
     void OnCreateSizeReport(wxCommandEvent& evt);
     void OnChangeContentPane(wxCommandEvent& evt);

+    void OnDropDownToolbarItem(wxAuiToolBarEvent& evt);

     void OnCreatePerspective(wxCommandEvent& evt);
     void OnCopyPerspectiveCode(wxCommandEvent& evt);
     void OnRestorePerspective(wxCommandEvent& evt);
     void OnSettings(wxCommandEvent& evt);
     void OnCreatePerspective(wxCommandEvent& evt);
     void OnCopyPerspectiveCode(wxCommandEvent& evt);
     void OnRestorePerspective(wxCommandEvent& evt);
     void OnSettings(wxCommandEvent& evt);

+    void OnCustomizeToolbar(wxCommandEvent& evt);
+    void OnAllowNotebookDnD(wxAuiNotebookEvent& evt);
+    void OnNotebookPageClose(wxAuiNotebookEvent& evt);
+    void OnNotebookPageClosed(wxAuiNotebookEvent& evt);

     void OnExit(wxCommandEvent& evt);
     void OnAbout(wxCommandEvent& evt);
     void OnExit(wxCommandEvent& evt);
     void OnAbout(wxCommandEvent& evt);

+    void OnTabAlignment(wxCommandEvent &evt);

 
     void OnGradient(wxCommandEvent& evt);
 
     void OnGradient(wxCommandEvent& evt);

+    void OnToolbarResizing(wxCommandEvent& evt);

     void OnManagerFlag(wxCommandEvent& evt);
     void OnManagerFlag(wxCommandEvent& evt);

+    void OnNotebookFlag(wxCommandEvent& evt);

     void OnUpdateUI(wxUpdateUIEvent& evt);
 
     void OnUpdateUI(wxUpdateUIEvent& evt);
 

-    void OnPaneClose(wxFrameManagerEvent& evt);
-    
+    void OnPaneClose(wxAuiManagerEvent& evt);
+

 private:
 
 private:
 

-    wxFrameManager m_mgr;
+    wxAuiManager m_mgr;

     wxArrayString m_perspectives;
     wxMenu* m_perspectives_menu;
     wxArrayString m_perspectives;
     wxMenu* m_perspectives_menu;

+    long m_notebook_style;
+    long m_notebook_theme;

 
     DECLARE_EVENT_TABLE()
 };
 
 
 
     DECLARE_EVENT_TABLE()
 };
 
 

-

 // -- wxSizeReportCtrl --
 // (a utility control that always reports it's client size)
 
 // -- wxSizeReportCtrl --
 // (a utility control that always reports it's client size)
 


@@ -144,7 +188,7 @@ public:
     wxSizeReportCtrl(wxWindow* parent, wxWindowID id = wxID_ANY,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
     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;
                      : wxControl(parent, id, pos, size, wxNO_BORDER)
     {
         m_mgr = mgr;


@@ -174,7 +218,7 @@ private:
 
         if (m_mgr)
         {
 
         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);
 
             s.Printf(wxT("Layer: %d"), pi.dock_layer);
             dc.GetTextExtent(s, &w, &h);


@@ -205,7 +249,7 @@ private:
     }
 private:
 
     }
 private:
 

-    wxFrameManager* m_mgr;
+    wxAuiManager* m_mgr;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -217,10 +261,6 @@ BEGIN_EVENT_TABLE(wxSizeReportCtrl, wxControl)
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

-
-
-
-

 class SettingsPanel : public wxPanel
 {
     enum
 class SettingsPanel : public wxPanel
 {
     enum


@@ -243,14 +283,15 @@ class SettingsPanel : public wxPanel
 public:
 
     SettingsPanel(wxWindow* parent, MyFrame* frame)
 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);
     {
         //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);
         s1->Add(1, 1, 1, wxEXPAND);
         s1->Add(new wxStaticText(this, wxID_ANY, wxT("Pane Border Size:")));
         s1->Add(m_border_size);


@@ -259,7 +300,7 @@ public:
         //vert->Add(s1, 0, wxEXPAND | wxLEFT | wxBOTTOM, 5);
 
         wxBoxSizer* s2 = new wxBoxSizer(wxHORIZONTAL);
         //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);
         s2->Add(1, 1, 1, wxEXPAND);
         s2->Add(new wxStaticText(this, wxID_ANY, wxT("Sash Size:")));
         s2->Add(m_sash_size);


@@ -268,7 +309,7 @@ public:
         //vert->Add(s2, 0, wxEXPAND | wxLEFT | wxBOTTOM, 5);
 
         wxBoxSizer* s3 = new wxBoxSizer(wxHORIZONTAL);
         //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);
         s3->Add(1, 1, 1, wxEXPAND);
         s3->Add(new wxStaticText(this, wxID_ANY, wxT("Caption Size:")));
         s3->Add(m_caption_size);


@@ -376,10 +417,9 @@ public:
         SetSizer(cont_sizer);
         GetSizer()->SetSizeHints(this);
 
         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();
     }
 
         UpdateColors();
     }


@@ -403,54 +443,54 @@ private:
 
     void UpdateColors()
     {
 
     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));
 
         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));
 
         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));
 
         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));
 
         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));
 
         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));
 
         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));
 
         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));
 
         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));
 
         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_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)
     {
                                          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)
     {
                                          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();
     }
                                          event.GetPosition());
         m_frame->DoUpdate();
     }


@@ -465,16 +505,16 @@ private:
         int var = 0;
         switch (event.GetId())
         {
         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;
         }
 
             default: return;
         }
 


@@ -520,26 +560,21 @@ BEGIN_EVENT_TABLE(SettingsPanel, wxPanel)
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

-
-
-
-
-

 bool MyApp::OnInit()
 {
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

     wxFrame* frame = new MyFrame(NULL,
                                  wxID_ANY,
     wxFrame* frame = new MyFrame(NULL,
                                  wxID_ANY,

-                                 wxT("wxAUI 0.9.2 Test Application"),
+                                 wxT("wxAUI Sample Application"),

                                  wxDefaultPosition,
                                  wxSize(800, 600));
                                  wxDefaultPosition,
                                  wxSize(800, 600));

-    SetTopWindow(frame);

     frame->Show();
 
     return true;
 }
 
     frame->Show();
 
     return true;
 }
 

-
-

 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_ERASE_BACKGROUND(MyFrame::OnEraseBackground)
     EVT_SIZE(MyFrame::OnSize)
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_ERASE_BACKGROUND(MyFrame::OnEraseBackground)
     EVT_SIZE(MyFrame::OnSize)


@@ -548,38 +583,80 @@ 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_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)
     EVT_MENU(ID_TransparentHint, MyFrame::OnManagerFlag)
     EVT_MENU(MyFrame::ID_CreatePerspective, MyFrame::OnCreatePerspective)
     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_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_TransparentDrag, MyFrame::OnManagerFlag)

+    EVT_MENU(ID_LiveUpdate, MyFrame::OnManagerFlag)

     EVT_MENU(ID_AllowActivePane, 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_NotebookAlignTop,     MyFrame::OnTabAlignment)
+    EVT_MENU(ID_NotebookAlignBottom,  MyFrame::OnTabAlignment)

     EVT_MENU(ID_NoGradient, MyFrame::OnGradient)
     EVT_MENU(ID_VerticalGradient, MyFrame::OnGradient)
     EVT_MENU(ID_HorizontalGradient, MyFrame::OnGradient)
     EVT_MENU(ID_NoGradient, MyFrame::OnGradient)
     EVT_MENU(ID_VerticalGradient, MyFrame::OnGradient)
     EVT_MENU(ID_HorizontalGradient, MyFrame::OnGradient)

+    EVT_MENU(ID_AllowToolbarResizing, MyFrame::OnToolbarResizing)

     EVT_MENU(ID_Settings, MyFrame::OnSettings)
     EVT_MENU(ID_Settings, MyFrame::OnSettings)

+    EVT_MENU(ID_CustomizeToolbar, MyFrame::OnCustomizeToolbar)

     EVT_MENU(ID_GridContent, MyFrame::OnChangeContentPane)
     EVT_MENU(ID_TreeContent, MyFrame::OnChangeContentPane)
     EVT_MENU(ID_TextContent, MyFrame::OnChangeContentPane)
     EVT_MENU(ID_SizeReportContent, MyFrame::OnChangeContentPane)
     EVT_MENU(ID_HTMLContent, MyFrame::OnChangeContentPane)
     EVT_MENU(ID_GridContent, MyFrame::OnChangeContentPane)
     EVT_MENU(ID_TreeContent, MyFrame::OnChangeContentPane)
     EVT_MENU(ID_TextContent, MyFrame::OnChangeContentPane)
     EVT_MENU(ID_SizeReportContent, MyFrame::OnChangeContentPane)
     EVT_MENU(ID_HTMLContent, MyFrame::OnChangeContentPane)

+    EVT_MENU(ID_NotebookContent, MyFrame::OnChangeContentPane)

     EVT_MENU(wxID_EXIT, MyFrame::OnExit)
     EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
     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_AllowFloating, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_TransparentHint, MyFrame::OnUpdateUI)

-    EVT_UPDATE_UI(ID_TransparentHintFade, 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_TransparentDrag, MyFrame::OnUpdateUI)

+    EVT_UPDATE_UI(ID_LiveUpdate, MyFrame::OnUpdateUI)

     EVT_UPDATE_UI(ID_NoGradient, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_VerticalGradient, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_HorizontalGradient, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_NoGradient, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_VerticalGradient, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_HorizontalGradient, MyFrame::OnUpdateUI)

+    EVT_UPDATE_UI(ID_AllowToolbarResizing, MyFrame::OnUpdateUI)

     EVT_MENU_RANGE(MyFrame::ID_FirstPerspective, MyFrame::ID_FirstPerspective+1000,
                    MyFrame::OnRestorePerspective)
     EVT_MENU_RANGE(MyFrame::ID_FirstPerspective, MyFrame::ID_FirstPerspective+1000,
                    MyFrame::OnRestorePerspective)

-    EVT_AUI_PANECLOSE(MyFrame::OnPaneClose)
+    EVT_AUITOOLBAR_TOOL_DROPDOWN(ID_DropDownToolbarItem, MyFrame::OnDropDownToolbarItem)
+    EVT_AUI_PANE_CLOSE(MyFrame::OnPaneClose)
+    EVT_AUINOTEBOOK_ALLOW_DND(wxID_ANY, MyFrame::OnAllowNotebookDnD)
+    EVT_AUINOTEBOOK_PAGE_CLOSE(wxID_ANY, MyFrame::OnNotebookPageClose)
+    EVT_AUINOTEBOOK_PAGE_CLOSED(wxID_ANY, MyFrame::OnNotebookPageClosed)

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

-

 MyFrame::MyFrame(wxWindow* parent,
                  wxWindowID id,
                  const wxString& title,
 MyFrame::MyFrame(wxWindow* parent,
                  wxWindowID id,
                  const wxString& title,


@@ -588,44 +665,77 @@ MyFrame::MyFrame(wxWindow* parent,
                  long style)
         : wxFrame(parent, id, title, pos, size, style)
 {
                  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));
 
     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;
 
     wxMenu* file_menu = new wxMenu;
     // create menu
     wxMenuBar* mb = new wxMenuBar;
 
     wxMenu* file_menu = new wxMenu;

-    file_menu->Append(wxID_EXIT, _("Exit"));
+    file_menu->Append(wxID_EXIT);

 
     wxMenu* view_menu = new wxMenu;
     view_menu->Append(ID_CreateText, _("Create Text Control"));
     view_menu->Append(ID_CreateHTML, _("Create HTML Control"));
     view_menu->Append(ID_CreateTree, _("Create Tree"));
     view_menu->Append(ID_CreateGrid, _("Create Grid"));
 
     wxMenu* view_menu = new wxMenu;
     view_menu->Append(ID_CreateText, _("Create Text Control"));
     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_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 wxAuiNotebook control for the Content Pane"));

     view_menu->Append(ID_SizeReportContent, _("Use a Size Reporter for the Content Pane"));
 
     wxMenu* options_menu = new wxMenu;
     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_AllowFloating, _("Allow Floating"));

-    options_menu->AppendCheckItem(ID_TransparentHint, _("Transparent Hint"));
-    options_menu->AppendCheckItem(ID_TransparentHintFade, _("Transparent 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->AppendCheckItem(ID_TransparentDrag, _("Transparent Drag"));
     options_menu->AppendCheckItem(ID_AllowActivePane, _("Allow Active Pane"));

+    options_menu->AppendCheckItem(ID_LiveUpdate, _("Live Resize Update"));

     options_menu->AppendSeparator();
     options_menu->AppendRadioItem(ID_NoGradient, _("No Caption Gradient"));
     options_menu->AppendRadioItem(ID_VerticalGradient, _("Vertical Caption Gradient"));
     options_menu->AppendRadioItem(ID_HorizontalGradient, _("Horizontal Caption Gradient"));
     options_menu->AppendSeparator();
     options_menu->AppendSeparator();
     options_menu->AppendRadioItem(ID_NoGradient, _("No Caption Gradient"));
     options_menu->AppendRadioItem(ID_VerticalGradient, _("Vertical Caption Gradient"));
     options_menu->AppendRadioItem(ID_HorizontalGradient, _("Horizontal Caption Gradient"));
     options_menu->AppendSeparator();

+    options_menu->AppendCheckItem(ID_AllowToolbarResizing, _("Allow Toolbar Resizing"));
+    options_menu->AppendSeparator();

     options_menu->Append(ID_Settings, _("Settings Pane"));
 
     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->AppendRadioItem(ID_NotebookAlignTop, _("Tab Top Alignment"));
+    notebook_menu->AppendRadioItem(ID_NotebookAlignBottom, _("Tab Bottom Alignment"));
+    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"));
     m_perspectives_menu = new wxMenu;
     m_perspectives_menu->Append(ID_CreatePerspective, _("Create Perspective"));
     m_perspectives_menu->Append(ID_CopyPerspectiveCode, _("Copy Perspective Data To Clipboard"));


@@ -634,13 +744,14 @@ MyFrame::MyFrame(wxWindow* parent,
     m_perspectives_menu->Append(ID_FirstPerspective+1, _("All Panes"));
 
     wxMenu* help_menu = new wxMenu;
     m_perspectives_menu->Append(ID_FirstPerspective+1, _("All Panes"));
 
     wxMenu* help_menu = new wxMenu;

-    help_menu->Append(wxID_ABOUT, _("About..."));
+    help_menu->Append(wxID_ABOUT);

 
 

-    mb->Append(file_menu, _("File"));
-    mb->Append(view_menu, _("View"));
-    mb->Append(m_perspectives_menu, _("Perspectives"));
-    mb->Append(options_menu, _("Options"));
-    mb->Append(help_menu, _("Help"));
+    mb->Append(file_menu, _("&File"));
+    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);
 
 
     SetMenuBar(mb);
 


@@ -649,196 +760,239 @@ MyFrame::MyFrame(wxWindow* parent,
 
 
     // min size for the frame itself isn't completely done.
 
 
     // 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));
 
     // code. For now, just hard code a frame minimum size
     SetMinSize(wxSize(400,300));
 

+
+
+    // prepare a few custom overflow elements for the toolbars' overflow buttons
+
+    wxAuiToolBarItemArray prepend_items;
+    wxAuiToolBarItemArray append_items;
+    wxAuiToolBarItem item;
+    item.SetKind(wxITEM_SEPARATOR);
+    append_items.Add(item);
+    item.SetKind(wxITEM_NORMAL);
+    item.SetId(ID_CustomizeToolbar);
+    item.SetLabel(_("Customize..."));
+    append_items.Add(item);
+
+

     // create some toolbars
     // create some toolbars

-    wxToolBar* tb1 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                                   wxTB_FLAT | wxTB_NODIVIDER);
+    wxAuiToolBar* tb1 = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                                         wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW);

     tb1->SetToolBitmapSize(wxSize(48,48));
     tb1->SetToolBitmapSize(wxSize(48,48));

-    tb1->AddTool(101, wxT("Test"), wxArtProvider::GetBitmap(wxART_ERROR));
+    tb1->AddTool(ID_SampleItem+1, wxT("Test"), wxArtProvider::GetBitmap(wxART_ERROR));

     tb1->AddSeparator();
     tb1->AddSeparator();

-    tb1->AddTool(102, wxT("Test"), wxArtProvider::GetBitmap(wxART_QUESTION));
-    tb1->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_INFORMATION));
-    tb1->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_WARNING));
-    tb1->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_MISSING_IMAGE));
+    tb1->AddTool(ID_SampleItem+2, wxT("Test"), wxArtProvider::GetBitmap(wxART_QUESTION));
+    tb1->AddTool(ID_SampleItem+3, wxT("Test"), wxArtProvider::GetBitmap(wxART_INFORMATION));
+    tb1->AddTool(ID_SampleItem+4, wxT("Test"), wxArtProvider::GetBitmap(wxART_WARNING));
+    tb1->AddTool(ID_SampleItem+5, wxT("Test"), wxArtProvider::GetBitmap(wxART_MISSING_IMAGE));
+    tb1->SetCustomOverflowItems(prepend_items, append_items);

     tb1->Realize();
 
 
     tb1->Realize();
 
 

-
-    wxToolBar* tb2 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                                   wxTB_FLAT | wxTB_NODIVIDER);
+    wxAuiToolBar* tb2 = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                                         wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW | wxAUI_TB_HORIZONTAL);

     tb2->SetToolBitmapSize(wxSize(16,16));
 
     wxBitmap tb2_bmp1 = wxArtProvider::GetBitmap(wxART_QUESTION, wxART_OTHER, wxSize(16,16));
     tb2->SetToolBitmapSize(wxSize(16,16));
 
     wxBitmap tb2_bmp1 = wxArtProvider::GetBitmap(wxART_QUESTION, wxART_OTHER, wxSize(16,16));

-    tb2->AddTool(101, wxT("Test"), tb2_bmp1);
-    tb2->AddTool(101, wxT("Test"), tb2_bmp1);
-    tb2->AddTool(101, wxT("Test"), tb2_bmp1);
-    tb2->AddTool(101, wxT("Test"), tb2_bmp1);
+    tb2->AddTool(ID_SampleItem+6, wxT("Disabled"), tb2_bmp1);
+    tb2->AddTool(ID_SampleItem+7, wxT("Test"), tb2_bmp1);
+    tb2->AddTool(ID_SampleItem+8, wxT("Test"), tb2_bmp1);
+    tb2->AddTool(ID_SampleItem+9, wxT("Test"), tb2_bmp1);

     tb2->AddSeparator();
     tb2->AddSeparator();

-    tb2->AddTool(101, wxT("Test"), tb2_bmp1);
-    tb2->AddTool(101, wxT("Test"), tb2_bmp1);
+    tb2->AddTool(ID_SampleItem+10, wxT("Test"), tb2_bmp1);
+    tb2->AddTool(ID_SampleItem+11, wxT("Test"), tb2_bmp1);

     tb2->AddSeparator();
     tb2->AddSeparator();

-    tb2->AddTool(101, wxT("Test"), tb2_bmp1);
-    tb2->AddTool(101, wxT("Test"), tb2_bmp1);
-    tb2->AddTool(101, wxT("Test"), tb2_bmp1);
-    tb2->AddTool(101, wxT("Test"), tb2_bmp1);
+    tb2->AddTool(ID_SampleItem+12, wxT("Test"), tb2_bmp1);
+    tb2->AddTool(ID_SampleItem+13, wxT("Test"), tb2_bmp1);
+    tb2->AddTool(ID_SampleItem+14, wxT("Test"), tb2_bmp1);
+    tb2->AddTool(ID_SampleItem+15, wxT("Test"), tb2_bmp1);
+    tb2->SetCustomOverflowItems(prepend_items, append_items);
+    tb2->EnableTool(ID_SampleItem+6, false);

     tb2->Realize();
 
 
     tb2->Realize();
 
 

-    wxToolBar* tb3 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                                   wxTB_FLAT | wxTB_NODIVIDER);
+    wxAuiToolBar* tb3 = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                                         wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW);

     tb3->SetToolBitmapSize(wxSize(16,16));
     wxBitmap tb3_bmp1 = wxArtProvider::GetBitmap(wxART_FOLDER, wxART_OTHER, wxSize(16,16));
     tb3->SetToolBitmapSize(wxSize(16,16));
     wxBitmap tb3_bmp1 = wxArtProvider::GetBitmap(wxART_FOLDER, wxART_OTHER, wxSize(16,16));

-    tb3->AddTool(101, wxT("Test"), tb3_bmp1);
-    tb3->AddTool(101, wxT("Test"), tb3_bmp1);
-    tb3->AddTool(101, wxT("Test"), tb3_bmp1);
-    tb3->AddTool(101, wxT("Test"), tb3_bmp1);
+    tb3->AddTool(ID_SampleItem+16, wxT("Check 1"), tb3_bmp1, wxT("Check 1"), wxITEM_CHECK);
+    tb3->AddTool(ID_SampleItem+17, wxT("Check 2"), tb3_bmp1, wxT("Check 2"), wxITEM_CHECK);
+    tb3->AddTool(ID_SampleItem+18, wxT("Check 3"), tb3_bmp1, wxT("Check 3"), wxITEM_CHECK);
+    tb3->AddTool(ID_SampleItem+19, wxT("Check 4"), tb3_bmp1, wxT("Check 4"), wxITEM_CHECK);

     tb3->AddSeparator();
     tb3->AddSeparator();

-    tb3->AddTool(101, wxT("Test"), tb3_bmp1);
-    tb3->AddTool(101, wxT("Test"), tb3_bmp1);
+    tb3->AddTool(ID_SampleItem+20, wxT("Radio 1"), tb3_bmp1, wxT("Radio 1"), wxITEM_RADIO);
+    tb3->AddTool(ID_SampleItem+21, wxT("Radio 2"), tb3_bmp1, wxT("Radio 2"), wxITEM_RADIO);
+    tb3->AddTool(ID_SampleItem+22, wxT("Radio 3"), tb3_bmp1, wxT("Radio 3"), wxITEM_RADIO);
+    tb3->AddSeparator();
+    tb3->AddTool(ID_SampleItem+23, wxT("Radio 1 (Group 2)"), tb3_bmp1, wxT("Radio 1 (Group 2)"), wxITEM_RADIO);
+    tb3->AddTool(ID_SampleItem+24, wxT("Radio 2 (Group 2)"), tb3_bmp1, wxT("Radio 2 (Group 2)"), wxITEM_RADIO);
+    tb3->AddTool(ID_SampleItem+25, wxT("Radio 3 (Group 2)"), tb3_bmp1, wxT("Radio 3 (Group 2)"), wxITEM_RADIO);
+    tb3->SetCustomOverflowItems(prepend_items, append_items);

     tb3->Realize();
 
 
     tb3->Realize();
 
 

-
-    wxToolBar* tb4 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                                   wxTB_FLAT | wxTB_NODIVIDER | wxTB_HORZ_TEXT);
+    wxAuiToolBar* tb4 = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                                         wxAUI_TB_DEFAULT_STYLE |
+                                         wxAUI_TB_OVERFLOW |
+                                         wxAUI_TB_TEXT |
+                                         wxAUI_TB_HORZ_TEXT);

     tb4->SetToolBitmapSize(wxSize(16,16));
     wxBitmap tb4_bmp1 = wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_OTHER, wxSize(16,16));
     tb4->SetToolBitmapSize(wxSize(16,16));
     wxBitmap tb4_bmp1 = wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_OTHER, wxSize(16,16));

-    tb4->AddTool(101, wxT("Item 1"), tb4_bmp1);
-    tb4->AddTool(101, wxT("Item 2"), tb4_bmp1);
-    tb4->AddTool(101, wxT("Item 3"), tb4_bmp1);
-    tb4->AddTool(101, wxT("Item 4"), tb4_bmp1);
+    tb4->AddTool(ID_DropDownToolbarItem, wxT("Item 1"), tb4_bmp1);
+    tb4->AddTool(ID_SampleItem+23, wxT("Item 2"), tb4_bmp1);
+    tb4->AddTool(ID_SampleItem+24, wxT("Item 3"), tb4_bmp1);
+    tb4->AddTool(ID_SampleItem+25, wxT("Item 4"), tb4_bmp1);

     tb4->AddSeparator();
     tb4->AddSeparator();

-    tb4->AddTool(101, wxT("Item 5"), tb4_bmp1);
-    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->AddTool(ID_SampleItem+26, wxT("Item 5"), tb4_bmp1);
+    tb4->AddTool(ID_SampleItem+27, wxT("Item 6"), tb4_bmp1);
+    tb4->AddTool(ID_SampleItem+28, wxT("Item 7"), tb4_bmp1);
+    tb4->AddTool(ID_SampleItem+29, wxT("Item 8"), tb4_bmp1);
+    tb4->SetToolDropDown(ID_DropDownToolbarItem, true);
+    tb4->SetCustomOverflowItems(prepend_items, append_items);
+    wxChoice* choice = new wxChoice(tb4, ID_SampleItem+35);
+    choice->AppendString(wxT("One choice"));
+    choice->AppendString(wxT("Another choice"));
+    tb4->AddControl(choice);

     tb4->Realize();
 
     tb4->Realize();
 

-    // create some toolbars
-    wxToolBar* tb5 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                                   wxTB_FLAT | wxTB_NODIVIDER | wxTB_VERTICAL);
+
+    wxAuiToolBar* tb5 = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                                         wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW | wxAUI_TB_VERTICAL);

     tb5->SetToolBitmapSize(wxSize(48,48));
     tb5->SetToolBitmapSize(wxSize(48,48));

-    tb5->AddTool(101, wxT("Test"), wxArtProvider::GetBitmap(wxART_ERROR));
+    tb5->AddTool(ID_SampleItem+30, wxT("Test"), wxArtProvider::GetBitmap(wxART_ERROR));

     tb5->AddSeparator();
     tb5->AddSeparator();

-    tb5->AddTool(102, wxT("Test"), wxArtProvider::GetBitmap(wxART_QUESTION));
-    tb5->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_INFORMATION));
-    tb5->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_WARNING));
-    tb5->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_MISSING_IMAGE));
+    tb5->AddTool(ID_SampleItem+31, wxT("Test"), wxArtProvider::GetBitmap(wxART_QUESTION));
+    tb5->AddTool(ID_SampleItem+32, wxT("Test"), wxArtProvider::GetBitmap(wxART_INFORMATION));
+    tb5->AddTool(ID_SampleItem+33, wxT("Test"), wxArtProvider::GetBitmap(wxART_WARNING));
+    tb5->AddTool(ID_SampleItem+34, wxT("Test"), wxArtProvider::GetBitmap(wxART_MISSING_IMAGE));
+    tb5->SetCustomOverflowItems(prepend_items, append_items);

     tb5->Realize();
 
     tb5->Realize();
 

-

     // add a bunch of panes
     // add a bunch of panes

-    m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+    m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo().

                   Name(wxT("test1")).Caption(wxT("Pane Caption")).
                   Top());
 
                   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")).
                   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")).
                   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());
 
                   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));
 
                   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")).
                   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")).
                   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")).
                   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)).
                   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."));
 
     wxWindow* wnd10 = CreateTextCtrl(wxT("This pane will prompt the user before hiding."));

-    m_mgr.AddPane(wnd10, wxPaneInfo().
+
+    // Give this pane an icon, too, just for testing.
+    int iconSize = m_mgr.GetArtProvider()->GetMetric(wxAUI_DOCKART_CAPTION_SIZE);
+
+    // Make it even to use 16 pixel icons with default 17 caption height.
+    iconSize &= ~1;
+
+    m_mgr.AddPane(wnd10, wxAuiPaneInfo().

                   Name(wxT("test10")).Caption(wxT("Text Pane with Hide Prompt")).
                   Name(wxT("test10")).Caption(wxT("Text Pane with Hide Prompt")).

-                  Bottom().Layer(1).Position(1));
+                  Bottom().Layer(1).Position(1).
+                  Icon(wxArtProvider::GetBitmap(wxART_WARNING,
+                                                wxART_OTHER,
+                                                wxSize(iconSize, iconSize))));

 
 

-    m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+    m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo().

                   Name(wxT("test11")).Caption(wxT("Fixed Pane")).
                   Bottom().Layer(1).Position(2).Fixed());
 
 
                   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
 
                   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());
 
                   CenterPane().Hide());
 

-    m_mgr.AddPane(CreateTreeCtrl(), wxPaneInfo().Name(wxT("tree_content")).
+    m_mgr.AddPane(CreateTreeCtrl(), wxAuiPaneInfo().Name(wxT("tree_content")).

                   CenterPane().Hide());
 
                   CenterPane().Hide());
 

-    m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().Name(wxT("sizereport_content")).
+    m_mgr.AddPane(CreateSizeReportCtrl(), wxAuiPaneInfo().Name(wxT("sizereport_content")).

                   CenterPane().Hide());
 
                   CenterPane().Hide());
 

-    m_mgr.AddPane(CreateTextCtrl(), wxPaneInfo().Name(wxT("text_content")).
+    m_mgr.AddPane(CreateTextCtrl(), wxAuiPaneInfo().Name(wxT("text_content")).

                   CenterPane().Hide());
 
                   CenterPane().Hide());
 

-    m_mgr.AddPane(CreateHTMLCtrl(), wxPaneInfo().Name(wxT("html_content")).
-                  CenterPane());
+    m_mgr.AddPane(CreateHTMLCtrl(), wxAuiPaneInfo().Name(wxT("html_content")).
+                  CenterPane().Hide());

 
 

-    // add the toolbars to the manager
+    m_mgr.AddPane(CreateNotebook(), wxAuiPaneInfo().Name(wxT("notebook_content")).
+                  CenterPane().PaneBorder(false));

 
 

-    m_mgr.AddPane(tb1, wxPaneInfo().
+    // add the toolbars to the manager
+    m_mgr.AddPane(tb1, wxAuiPaneInfo().

                   Name(wxT("tb1")).Caption(wxT("Big Toolbar")).
                   Name(wxT("tb1")).Caption(wxT("Big Toolbar")).

-                  ToolbarPane().Top().
-                  LeftDockable(false).RightDockable(false));
+                  ToolbarPane().Top());

 
 

-    m_mgr.AddPane(tb2, wxPaneInfo().
-                  Name(wxT("tb2")).Caption(wxT("Toolbar 2")).
-                  ToolbarPane().Top().Row(1).
-                  LeftDockable(false).RightDockable(false));
+    m_mgr.AddPane(tb2, wxAuiPaneInfo().
+                  Name(wxT("tb2")).Caption(wxT("Toolbar 2 (Horizontal)")).
+                  ToolbarPane().Top().Row(1));

 
 

-    m_mgr.AddPane(tb3, wxPaneInfo().
+    m_mgr.AddPane(tb3, wxAuiPaneInfo().

                   Name(wxT("tb3")).Caption(wxT("Toolbar 3")).
                   Name(wxT("tb3")).Caption(wxT("Toolbar 3")).

-                  ToolbarPane().Top().Row(1).Position(1).
-                  LeftDockable(false).RightDockable(false));
+                  ToolbarPane().Top().Row(1).Position(1));

 
 

-    m_mgr.AddPane(tb4, wxPaneInfo().
+    m_mgr.AddPane(tb4, wxAuiPaneInfo().

                   Name(wxT("tb4")).Caption(wxT("Sample Bookmark Toolbar")).
                   Name(wxT("tb4")).Caption(wxT("Sample Bookmark Toolbar")).

-                  ToolbarPane().Top().Row(2).
-                  LeftDockable(false).RightDockable(false));
+                  ToolbarPane().Top().Row(2));

 
 

-    m_mgr.AddPane(tb5, wxPaneInfo().
+    m_mgr.AddPane(tb5, wxAuiPaneInfo().

                   Name(wxT("tb5")).Caption(wxT("Sample Vertical Toolbar")).
                   ToolbarPane().Left().
                   Name(wxT("tb5")).Caption(wxT("Sample Vertical Toolbar")).
                   ToolbarPane().Left().

-                  GripperTop().
-                  TopDockable(false).BottomDockable(false));
+                  GripperTop());

 
     m_mgr.AddPane(new wxButton(this, wxID_ANY, _("Test Button")),
 
     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));
 
                   ToolbarPane().Top().Row(2).Position(1).
                   LeftDockable(false).RightDockable(false));
 

-

     // make some default perspectives
 
     wxString perspective_all = m_mgr.SavePerspective();
 
     int i, count;
     // 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();
     for (i = 0, count = all_panes.GetCount(); i < count; ++i)
         if (!all_panes.Item(i).IsToolbar())
             all_panes.Item(i).Hide();


@@ -846,13 +1000,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("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);
 
     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();
 }
 
     m_mgr.Update();
 }
 


@@ -861,7 +1015,7 @@ MyFrame::~MyFrame()
     m_mgr.UnInit();
 }
 
     m_mgr.UnInit();
 }
 

-wxDockArt* MyFrame::GetDockArt()
+wxAuiDockArt* MyFrame::GetDockArt()

 {
     return m_mgr.GetArtProvider();
 }
 {
     return m_mgr.GetArtProvider();
 }


@@ -871,7 +1025,6 @@ void MyFrame::DoUpdate()
     m_mgr.Update();
 }
 
     m_mgr.Update();
 }
 

-

 void MyFrame::OnEraseBackground(wxEraseEvent& event)
 {
     event.Skip();
 void MyFrame::OnEraseBackground(wxEraseEvent& event)
 {
     event.Skip();


@@ -882,10 +1035,10 @@ void MyFrame::OnSize(wxSizeEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

-void MyFrame::OnSettings(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnSettings(wxCommandEvent& WXUNUSED(evt))

 {
     // show the settings pane, and float it
 {
     // 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());
 
     if (floating_pane.floating_pos == wxDefaultPosition)
         floating_pane.FloatingPosition(GetStartPosition());


@@ -893,6 +1046,10 @@ void MyFrame::OnSettings(wxCommandEvent& WXUNUSED(event))
     m_mgr.Update();
 }
 
     m_mgr.Update();
 }
 

+void MyFrame::OnCustomizeToolbar(wxCommandEvent& WXUNUSED(evt))
+{
+    wxMessageBox(_("Customize Toolbar clicked"));
+}

 
 void MyFrame::OnGradient(wxCommandEvent& event)
 {
 
 void MyFrame::OnGradient(wxCommandEvent& event)
 {


@@ -905,7 +1062,23 @@ void MyFrame::OnGradient(wxCommandEvent& event)
         case ID_HorizontalGradient: gradient = wxAUI_GRADIENT_HORIZONTAL; break;
     }
 
         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();
+}
+
+void MyFrame::OnToolbarResizing(wxCommandEvent& WXUNUSED(evt))
+{
+    wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes();
+    const size_t count = all_panes.GetCount();
+    for (size_t i = 0; i < count; ++i)
+    {
+        wxAuiToolBar* toolbar = wxDynamicCast(all_panes[i].window, wxAuiToolBar);
+        if (toolbar)
+        {
+            all_panes[i].Resizable(!all_panes[i].IsResizable());
+        }
+    }
+

     m_mgr.Update();
 }
 
     m_mgr.Update();
 }
 


@@ -916,25 +1089,127 @@ void MyFrame::OnManagerFlag(wxCommandEvent& event)
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXGTK__)
     if (event.GetId() == ID_TransparentDrag ||
         event.GetId() == ID_TransparentHint ||
 #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
 
     {
         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_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_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_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;
+        case ID_LiveUpdate: flag = wxAUI_MGR_LIVE_RESIZE; break;
+    }
+
+    if (flag)
+    {
+        m_mgr.SetFlags(m_mgr.GetFlags() ^ flag);

     }
     }

-    m_mgr.SetFlags(m_mgr.GetFlags() ^ flag);
+

     m_mgr.Update();
 }
 
     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();
 void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
 {
     unsigned int flags = m_mgr.GetFlags();


@@ -942,30 +1217,100 @@ void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
     switch (event.GetId())
     {
         case ID_NoGradient:
     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_DOCKART_GRADIENT_TYPE) == wxAUI_GRADIENT_NONE);

             break;
         case ID_VerticalGradient:
             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_DOCKART_GRADIENT_TYPE) == wxAUI_GRADIENT_VERTICAL);

             break;
         case ID_HorizontalGradient:
             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_DOCKART_GRADIENT_TYPE) == wxAUI_GRADIENT_HORIZONTAL);

             break;
             break;

+        case ID_AllowToolbarResizing:
+        {
+            wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes();
+            const size_t count = all_panes.GetCount();
+            for (size_t i = 0; i < count; ++i)
+            {
+                wxAuiToolBar* toolbar = wxDynamicCast(all_panes[i].window, wxAuiToolBar);
+                if (toolbar)
+                {
+                    event.Check(all_panes[i].IsResizable());
+                    break;
+                }
+            }
+            break;
+        }

         case ID_AllowFloating:
         case ID_AllowFloating:

-            event.Check(flags & wxAUI_MGR_ALLOW_FLOATING ? true : false);
+            event.Check((flags & wxAUI_MGR_ALLOW_FLOATING) != 0);

             break;
         case ID_TransparentDrag:
             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:
             break;
         case ID_TransparentHint:

-            event.Check(flags & wxAUI_MGR_TRANSPARENT_HINT ? true : false);
+            event.Check((flags & wxAUI_MGR_TRANSPARENT_HINT) != 0);
+            break;
+        case ID_LiveUpdate:
+            event.Check((flags & wxAUI_MGR_LIVE_RESIZE) != 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_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;
             break;

-        case ID_TransparentHintFade:
-            event.Check(flags & wxAUI_MGR_TRANSPARENT_HINT_FADE ? true : false);
+        case ID_NotebookScrollButtons:
+            event.Check((m_notebook_style & wxAUI_NB_SCROLL_BUTTONS) != 0);

             break;
             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"))
     {
 {
     if (evt.pane->name == wxT("test10"))
     {


@@ -978,14 +1323,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"));
 
 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;
 
     if (dlg.ShowModal() != wxID_OK)
         return;
 


@@ -998,7 +1341,7 @@ void MyFrame::OnCreatePerspective(wxCommandEvent& WXUNUSED(event))
     m_perspectives.Add(m_mgr.SavePerspective());
 }
 
     m_perspectives.Add(m_mgr.SavePerspective());
 }
 

-void MyFrame::OnCopyPerspectiveCode(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnCopyPerspectiveCode(wxCommandEvent& WXUNUSED(evt))

 {
     wxString s = m_mgr.SavePerspective();
 
 {
     wxString s = m_mgr.SavePerspective();
 


@@ -1011,11 +1354,44 @@ void MyFrame::OnCopyPerspectiveCode(wxCommandEvent& WXUNUSED(event))
 #endif
 }
 
 #endif
 }
 

-void MyFrame::OnRestorePerspective(wxCommandEvent& event)
+void MyFrame::OnRestorePerspective(wxCommandEvent& evt)
+{
+    m_mgr.LoadPerspective(m_perspectives.Item(evt.GetId() - ID_FirstPerspective));
+}
+
+void MyFrame::OnNotebookPageClose(wxAuiNotebookEvent& evt)

 {
 {

-    m_mgr.LoadPerspective(m_perspectives.Item(event.GetId() - ID_FirstPerspective));
+    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::OnNotebookPageClosed(wxAuiNotebookEvent& evt)
+{
+    wxAuiNotebook* ctrl = (wxAuiNotebook*)evt.GetEventObject();
+
+    // selection should always be a valid index
+    wxASSERT_MSG( ctrl->GetSelection() < (int)ctrl->GetPageCount(),
+                  wxString::Format("Invalid selection %d, only %d pages left",
+                                   ctrl->GetSelection(),
+                                   (int)ctrl->GetPageCount()) );
+
+    evt.Skip();

 }
 
 }
 

+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()
 {
 
 wxPoint MyFrame::GetStartPosition()
 {


@@ -1027,8 +1403,8 @@ wxPoint MyFrame::GetStartPosition()
 
 void MyFrame::OnCreateTree(wxCommandEvent& WXUNUSED(event))
 {
 
 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();
                   Float().FloatingPosition(GetStartPosition()).
                   FloatingSize(wxSize(150,300)));
     m_mgr.Update();


@@ -1036,8 +1412,8 @@ void MyFrame::OnCreateTree(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnCreateGrid(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();
                   Float().FloatingPosition(GetStartPosition()).
                   FloatingSize(wxSize(300,200)));
     m_mgr.Update();


@@ -1045,39 +1421,119 @@ void MyFrame::OnCreateGrid(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnCreateHTML(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().
+                  Caption(wxT("HTML Control")).

                   Float().FloatingPosition(GetStartPosition()).
                   FloatingSize(wxSize(300,200)));
     m_mgr.Update();
 }
 
                   Float().FloatingPosition(GetStartPosition()).
                   FloatingSize(wxSize(300,200)));
     m_mgr.Update();
 }
 

+void MyFrame::OnCreateNotebook(wxCommandEvent& WXUNUSED(event))
+{
+    m_mgr.AddPane(CreateNotebook(), wxAuiPaneInfo().
+                  Caption(wxT("Notebook")).
+                  Float().FloatingPosition(GetStartPosition()).
+                  //FloatingSize(300,200).
+                  CloseButton(true).MaximizeButton(true));
+    m_mgr.Update();
+}
+

 void MyFrame::OnCreateText(wxCommandEvent& WXUNUSED(event))
 {
 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))
 {
                   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();
 }
 
     m_mgr.Update();
 }
 

-void MyFrame::OnChangeContentPane(wxCommandEvent& event)
+void MyFrame::OnChangeContentPane(wxCommandEvent& evt)

 {
 {

-    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("grid_content")).Show(evt.GetId() == ID_GridContent);
+    m_mgr.GetPane(wxT("text_content")).Show(evt.GetId() == ID_TextContent);
+    m_mgr.GetPane(wxT("tree_content")).Show(evt.GetId() == ID_TreeContent);
+    m_mgr.GetPane(wxT("sizereport_content")).Show(evt.GetId() == ID_SizeReportContent);
+    m_mgr.GetPane(wxT("html_content")).Show(evt.GetId() == ID_HTMLContent);
+    m_mgr.GetPane(wxT("notebook_content")).Show(evt.GetId() == ID_NotebookContent);

     m_mgr.Update();
 }
 
     m_mgr.Update();
 }
 

+void MyFrame::OnDropDownToolbarItem(wxAuiToolBarEvent& evt)
+{
+    if (evt.IsDropDownClicked())
+    {
+        wxAuiToolBar* tb = static_cast<wxAuiToolBar*>(evt.GetEventObject());
+
+        tb->SetToolSticky(evt.GetId(), true);
+
+        // create the popup menu
+        wxMenu menuPopup;
+
+        wxBitmap bmp = wxArtProvider::GetBitmap(wxART_QUESTION, wxART_OTHER, wxSize(16,16));
+
+        wxMenuItem* m1 =  new wxMenuItem(&menuPopup, 10001, _("Drop Down Item 1"));
+        m1->SetBitmap(bmp);
+        menuPopup.Append(m1);
+
+        wxMenuItem* m2 =  new wxMenuItem(&menuPopup, 10002, _("Drop Down Item 2"));
+        m2->SetBitmap(bmp);
+        menuPopup.Append(m2);
+
+        wxMenuItem* m3 =  new wxMenuItem(&menuPopup, 10003, _("Drop Down Item 3"));
+        m3->SetBitmap(bmp);
+        menuPopup.Append(m3);
+
+        wxMenuItem* m4 =  new wxMenuItem(&menuPopup, 10004, _("Drop Down Item 4"));
+        m4->SetBitmap(bmp);
+        menuPopup.Append(m4);
+
+        // line up our menu with the button
+        wxRect rect = tb->GetToolRect(evt.GetId());
+        wxPoint pt = tb->ClientToScreen(rect.GetBottomLeft());
+        pt = ScreenToClient(pt);
+
+
+        PopupMenu(&menuPopup, pt);
+
+
+        // make sure the button is "un-stuck"
+        tb->SetToolSticky(evt.GetId(), false);
+    }
+}
+
+
+void MyFrame::OnTabAlignment(wxCommandEvent &evt)
+{
+    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;
+
+            long style = nb->GetWindowStyleFlag();
+            style &= ~(wxAUI_NB_TOP | wxAUI_NB_BOTTOM);
+            if (evt.GetId() == ID_NotebookAlignTop)
+                style |= wxAUI_NB_TOP;
+            else if (evt.GetId() == ID_NotebookAlignBottom)
+                style |= wxAUI_NB_BOTTOM;
+            nb->SetWindowStyleFlag(style);
+
+            nb->Refresh();
+        }
+    }
+}
+

 void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 {
     Close(true);
 void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 {
     Close(true);


@@ -1093,9 +1549,9 @@ wxTextCtrl* MyFrame::CreateTextCtrl(const wxString& ctrl_text)
     static int n = 0;
 
     wxString text;
     static int n = 0;
 
     wxString text;

-    if (ctrl_text.Length() > 0)
+    if ( !ctrl_text.empty() )

         text = ctrl_text;
         text = ctrl_text;

-         else
+    else

         text.Printf(wxT("This is text box %d"), ++n);
 
     return new wxTextCtrl(this,wxID_ANY, text,
         text.Printf(wxT("This is text box %d"), ++n);
 
     return new wxTextCtrl(this,wxID_ANY, text,


@@ -1120,15 +1576,16 @@ wxTreeCtrl* MyFrame::CreateTreeCtrl()
                                       wxPoint(0,0), wxSize(160,250),
                                       wxTR_DEFAULT_STYLE | wxNO_BORDER);
 
                                       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);
 
     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));
     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));


@@ -1161,34 +1618,114 @@ wxSizeReportCtrl* MyFrame::CreateSizeReportCtrl(int width, int height)
     return ctrl;
 }
 
     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;
 }
 
                                    wxDefaultPosition,
                                    wxSize(400,300));
     ctrl->SetPage(GetIntroText());
     return ctrl;
 }
 

+wxAuiNotebook* MyFrame::CreateNotebook()
+{
+   // 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);
+   ctrl->Freeze();
+
+   wxBitmap page_bmp = wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_OTHER, wxSize(16,16));
+
+   ctrl->AddPage(CreateHTMLCtrl(ctrl), wxT("Welcome to wxAUI") , false, page_bmp);
+
+   wxPanel *panel = new wxPanel( ctrl, wxID_ANY );
+   wxFlexGridSizer *flex = new wxFlexGridSizer( 4, 2, 0, 0 );
+   flex->AddGrowableRow( 0 );
+   flex->AddGrowableRow( 3 );
+   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)),
+                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),
+                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"), false, page_bmp );
+
+
+   ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some text"),
+                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") );
+
+   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|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 (longer title)") );
+
+   ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"),
+                wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl 8") );
+
+   ctrl->Thaw();
+   return ctrl;
+}

 
 wxString MyFrame::GetIntroText()
 {
     const char* text =
         "<html><body>"
 
 wxString MyFrame::GetIntroText()
 {
     const char* text =
         "<html><body>"

-        "<h3>Welcome to wxAUI 0.9.2</h3>"
+        "<h3>Welcome to wxAUI</h3>"

         "<br/><b>Overview</b><br/>"
         "<p>wxAUI is an Advanced User Interface library for the wxWidgets toolkit "
         "that allows developers to create high-quality, cross-platform user "
         "interfaces quickly and easily.</p>"
         "<p><b>Features</b></p>"
         "<br/><b>Overview</b><br/>"
         "<p>wxAUI is an Advanced User Interface library for the wxWidgets toolkit "
         "that allows developers to create high-quality, cross-platform user "
         "interfaces quickly and easily.</p>"
         "<p><b>Features</b></p>"

-        "<p>With wxAUI version 0.9.2, developers can create application frameworks with:</p>"
+        "<p>With wxAUI, developers can create application frameworks with:</p>"

         "<ul>"
         "<li>Native, dockable floating frames</li>"
         "<li>Perspective saving and loading</li>"
         "<li>Native toolbars incorporating real-time, &quot;spring-loaded&quot; dragging</li>"
         "<ul>"
         "<li>Native, dockable floating frames</li>"
         "<li>Perspective saving and loading</li>"
         "<li>Native toolbars incorporating real-time, &quot;spring-loaded&quot; dragging</li>"

-        "<li>Customizable floating/docking behavior</li>"
+        "<li>Customizable floating/docking behaviour</li>"

         "<li>Completely customizable look-and-feel</li>"
         "<li>Optional transparent window effects (while dragging or docking)</li>"
         "<li>Completely customizable look-and-feel</li>"
         "<li>Optional transparent window effects (while dragging or docking)</li>"

+        "<li>Splittable notebook control</li>"
+        "</ul>"
+        "<p><b>What's new in 0.9.4?</b></p>"
+        "<p>wxAUI 0.9.4, which is bundled with wxWidgets, adds the following features:"
+        "<ul>"
+        "<li>New wxAuiToolBar class, a toolbar control which integrates more "
+        "cleanly with wxAuiFrameManager.</li>"
+        "<li>Lots of bug fixes</li>"
+        "</ul>"
+        "<p><b>What's new in 0.9.3?</b></p>"
+        "<p>wxAUI 0.9.3, which is now bundled with wxWidgets, adds the following features:"
+        "<ul>"
+        "<li>New wxAuiNotebook class, a dynamic splittable notebook control</li>"
+        "<li>New wxAuiMDI* classes, a tab-based MDI and drop-in replacement for classic MDI</li>"
+        "<li>Maximize/Restore buttons implemented</li>"
+        "<li>Better hinting with wxGTK</li>"
+        "<li>Class rename.  'wxAui' is now the standard class prefix for all wxAUI classes</li>"
+        "<li>Lots of bug fixes</li>"

         "</ul>"
         "<p><b>What's new in 0.9.2?</b></p>"
         "<p>The following features/fixes have been added since the last version of wxAUI:</p>"
         "</ul>"
         "<p><b>What's new in 0.9.2?</b></p>"
         "<p>The following features/fixes have been added since the last version of wxAUI:</p>"