Changes needed for scanning the aui header files with SWIG for

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

diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp
index 73916eff412766887b3a6573a788451a4ebb9683..47a6a43ba19d297bbaa7689464bb4b6b271a2ba6 100644 (file)
--- a/samples/aui/auidemo.cpp
+++ b/samples/aui/auidemo.cpp
@@ -4,7 +4,7 @@
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-10-03
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-10-03

-// RCS-ID:      
+// RCS-ID:      $Id$

 // Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////


@@ -13,15 +13,11 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-  #include "wx/wx.h"
-  #include "wx/log.h"
+    #pragma hdrstop

 #endif
 
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.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"


@@ -30,6 +26,8 @@
 #include "wx/image.h"
 #include "wx/colordlg.h"
 #include "wx/wxhtml.h"
 #include "wx/image.h"
 #include "wx/colordlg.h"
 #include "wx/wxhtml.h"

+#include "wx/imaglist.h"
+#include "wx/dataobj.h"

 
 #include "wx/aui/aui.h"
 #include "../sample.xpm"
 
 #include "wx/aui/aui.h"
 #include "../sample.xpm"


@@ -92,7 +90,7 @@ public:
     void DoUpdate();
 
 private:
     void DoUpdate();
 
 private:

-    wxTextCtrl* CreateTextCtrl();
+    wxTextCtrl* CreateTextCtrl(const wxString& text = wxEmptyString);

     wxGrid* CreateGrid();
     wxTreeCtrl* CreateTreeCtrl();
     wxSizeReportCtrl* CreateSizeReportCtrl(int width = 80, int height = 80);
     wxGrid* CreateGrid();
     wxTreeCtrl* CreateTreeCtrl();
     wxSizeReportCtrl* CreateSizeReportCtrl(int width = 80, int height = 80);


@@ -103,33 +101,35 @@ private:
 
 private:
 
 
 private:
 

-    void OnEraseBackground(wxEraseEvent& event);
-    void OnSize(wxSizeEvent& event);
-
-    void OnCreateTree(wxCommandEvent& event);
-    void OnCreateGrid(wxCommandEvent& event);
-    void OnCreateHTML(wxCommandEvent& event);
-    void OnCreateText(wxCommandEvent& event);
-    void OnCreateSizeReport(wxCommandEvent& event);
-    void OnChangeContentPane(wxCommandEvent& event);
-    void OnCreatePerspective(wxCommandEvent& event);
-    void OnCopyPerspectiveCode(wxCommandEvent& event);
-    void OnRestorePerspective(wxCommandEvent& event);
-    void OnSettings(wxCommandEvent& event);
-    void OnExit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-    
-    void OnGradient(wxCommandEvent& event);
-    void OnManagerFlag(wxCommandEvent& event);
-    void OnUpdateUI(wxUpdateUIEvent& event);
+    void OnEraseBackground(wxEraseEvent& evt);
+    void OnSize(wxSizeEvent& evt);
+
+    void OnCreateTree(wxCommandEvent& evt);
+    void OnCreateGrid(wxCommandEvent& evt);
+    void OnCreateHTML(wxCommandEvent& evt);
+    void OnCreateText(wxCommandEvent& evt);
+    void OnCreateSizeReport(wxCommandEvent& evt);
+    void OnChangeContentPane(wxCommandEvent& evt);
+    void OnCreatePerspective(wxCommandEvent& evt);
+    void OnCopyPerspectiveCode(wxCommandEvent& evt);
+    void OnRestorePerspective(wxCommandEvent& evt);
+    void OnSettings(wxCommandEvent& evt);
+    void OnExit(wxCommandEvent& evt);
+    void OnAbout(wxCommandEvent& evt);
+
+    void OnGradient(wxCommandEvent& evt);
+    void OnManagerFlag(wxCommandEvent& evt);
+    void OnUpdateUI(wxUpdateUIEvent& evt);
+
+    void OnPaneClose(wxFrameManagerEvent& evt);

     
 private:
 
     wxFrameManager m_mgr;
     wxArrayString m_perspectives;
     wxMenu* m_perspectives_menu;
     
 private:
 
     wxFrameManager m_mgr;
     wxArrayString m_perspectives;
     wxMenu* m_perspectives_menu;

-    
-    DECLARE_EVENT_TABLE();
+
+    DECLARE_EVENT_TABLE()

 };
 
 
 };
 
 


@@ -141,7 +141,7 @@ class wxSizeReportCtrl : public wxControl
 {
 public:
 
 {
 public:
 

-    wxSizeReportCtrl(wxWindow* parent, wxWindowID id = -1,
+    wxSizeReportCtrl(wxWindow* parent, wxWindowID id = wxID_ANY,

                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      wxFrameManager* mgr = NULL)
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      wxFrameManager* mgr = NULL)


@@ -152,7 +152,7 @@ public:
 
 private:
 
 
 private:
 

-    void OnPaint(wxPaintEvent& evt)
+    void OnPaint(wxPaintEvent& WXUNUSED(evt))

     {
         wxPaintDC dc(this);
         wxSize size = GetClientSize();
     {
         wxPaintDC dc(this);
         wxSize size = GetClientSize();


@@ -171,43 +171,43 @@ private:
         dc.DrawLine(0, 0, size.x, size.y);
         dc.DrawLine(0, size.y, size.x, 0);
         dc.DrawText(s, (size.x-w)/2, ((size.y-(height*5))/2));
         dc.DrawLine(0, 0, size.x, size.y);
         dc.DrawLine(0, size.y, size.x, 0);
         dc.DrawText(s, (size.x-w)/2, ((size.y-(height*5))/2));

-        
+

         if (m_mgr)
         {
             wxPaneInfo pi = m_mgr->GetPane(this);
         if (m_mgr)
         {
             wxPaneInfo pi = m_mgr->GetPane(this);

-            
+

             s.Printf(wxT("Layer: %d"), pi.dock_layer);
             dc.GetTextExtent(s, &w, &h);
             dc.DrawText(s, (size.x-w)/2, ((size.y-(height*5))/2)+(height*1));
             s.Printf(wxT("Layer: %d"), pi.dock_layer);
             dc.GetTextExtent(s, &w, &h);
             dc.DrawText(s, (size.x-w)/2, ((size.y-(height*5))/2)+(height*1));

-           
+

             s.Printf(wxT("Dock: %d Row: %d"), pi.dock_direction, pi.dock_row);
             dc.GetTextExtent(s, &w, &h);
             dc.DrawText(s, (size.x-w)/2, ((size.y-(height*5))/2)+(height*2));
             s.Printf(wxT("Dock: %d Row: %d"), pi.dock_direction, pi.dock_row);
             dc.GetTextExtent(s, &w, &h);
             dc.DrawText(s, (size.x-w)/2, ((size.y-(height*5))/2)+(height*2));

-            
+

             s.Printf(wxT("Position: %d"), pi.dock_pos);
             dc.GetTextExtent(s, &w, &h);
             dc.DrawText(s, (size.x-w)/2, ((size.y-(height*5))/2)+(height*3));
             s.Printf(wxT("Position: %d"), pi.dock_pos);
             dc.GetTextExtent(s, &w, &h);
             dc.DrawText(s, (size.x-w)/2, ((size.y-(height*5))/2)+(height*3));

-            
+

             s.Printf(wxT("Proportion: %d"), pi.dock_proportion);
             dc.GetTextExtent(s, &w, &h);
             dc.DrawText(s, (size.x-w)/2, ((size.y-(height*5))/2)+(height*4));
         }
     }
 
             s.Printf(wxT("Proportion: %d"), pi.dock_proportion);
             dc.GetTextExtent(s, &w, &h);
             dc.DrawText(s, (size.x-w)/2, ((size.y-(height*5))/2)+(height*4));
         }
     }
 

-    void OnEraseBackground(wxEraseEvent& evt)
+    void OnEraseBackground(wxEraseEvent& WXUNUSED(evt))

     {
         // intentionally empty
     }
 
     {
         // intentionally empty
     }
 

-    void OnSize(wxSizeEvent& evt)
+    void OnSize(wxSizeEvent& WXUNUSED(evt))

     {
         Refresh();
     }
 private:
 
     wxFrameManager* m_mgr;
     {
         Refresh();
     }
 private:
 
     wxFrameManager* m_mgr;

-    
-    DECLARE_EVENT_TABLE();
+
+    DECLARE_EVENT_TABLE()

 };
 
 BEGIN_EVENT_TABLE(wxSizeReportCtrl, wxControl)
 };
 
 BEGIN_EVENT_TABLE(wxSizeReportCtrl, wxControl)


@@ -243,7 +243,7 @@ class SettingsPanel : public wxPanel
 public:
 
     SettingsPanel(wxWindow* parent, MyFrame* frame)
 public:
 
     SettingsPanel(wxWindow* parent, MyFrame* frame)

-            : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
+            : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize)

     {
         //wxBoxSizer* vert = new wxBoxSizer(wxVERTICAL);
 
     {
         //wxBoxSizer* vert = new wxBoxSizer(wxVERTICAL);
 


@@ -252,7 +252,7 @@ public:
         wxBoxSizer* s1 = new wxBoxSizer(wxHORIZONTAL);
         m_border_size = new wxSpinCtrl(this, ID_PaneBorderSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
         s1->Add(1, 1, 1, wxEXPAND);
         wxBoxSizer* s1 = new wxBoxSizer(wxHORIZONTAL);
         m_border_size = new wxSpinCtrl(this, ID_PaneBorderSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
         s1->Add(1, 1, 1, wxEXPAND);

-        s1->Add(new wxStaticText(this, -1, wxT("Pane Border Size:")));
+        s1->Add(new wxStaticText(this, wxID_ANY, wxT("Pane Border Size:")));

         s1->Add(m_border_size);
         s1->Add(1, 1, 1, wxEXPAND);
         s1->SetItemMinSize((size_t)1, 180, 20);
         s1->Add(m_border_size);
         s1->Add(1, 1, 1, wxEXPAND);
         s1->SetItemMinSize((size_t)1, 180, 20);


@@ -261,7 +261,7 @@ public:
         wxBoxSizer* s2 = new wxBoxSizer(wxHORIZONTAL);
         m_sash_size = new wxSpinCtrl(this, ID_SashSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
         s2->Add(1, 1, 1, wxEXPAND);
         wxBoxSizer* s2 = new wxBoxSizer(wxHORIZONTAL);
         m_sash_size = new wxSpinCtrl(this, ID_SashSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
         s2->Add(1, 1, 1, wxEXPAND);

-        s2->Add(new wxStaticText(this, -1, wxT("Sash Size:")));
+        s2->Add(new wxStaticText(this, wxID_ANY, wxT("Sash Size:")));

         s2->Add(m_sash_size);
         s2->Add(1, 1, 1, wxEXPAND);
         s2->SetItemMinSize((size_t)1, 180, 20);
         s2->Add(m_sash_size);
         s2->Add(1, 1, 1, wxEXPAND);
         s2->SetItemMinSize((size_t)1, 180, 20);


@@ -270,7 +270,7 @@ public:
         wxBoxSizer* s3 = new wxBoxSizer(wxHORIZONTAL);
         m_caption_size = new wxSpinCtrl(this, ID_CaptionSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
         s3->Add(1, 1, 1, wxEXPAND);
         wxBoxSizer* s3 = new wxBoxSizer(wxHORIZONTAL);
         m_caption_size = new wxSpinCtrl(this, ID_CaptionSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
         s3->Add(1, 1, 1, wxEXPAND);

-        s3->Add(new wxStaticText(this, -1, wxT("Caption Size:")));
+        s3->Add(new wxStaticText(this, wxID_ANY, wxT("Caption Size:")));

         s3->Add(m_caption_size);
         s3->Add(1, 1, 1, wxEXPAND);
         s3->SetItemMinSize((size_t)1, 180, 20);
         s3->Add(m_caption_size);
         s3->Add(1, 1, 1, wxEXPAND);
         s3->SetItemMinSize((size_t)1, 180, 20);


@@ -284,7 +284,7 @@ public:
         wxBoxSizer* s4 = new wxBoxSizer(wxHORIZONTAL);
         m_background_color = new wxBitmapButton(this, ID_BackgroundColor, b, wxDefaultPosition, wxSize(50,25));
         s4->Add(1, 1, 1, wxEXPAND);
         wxBoxSizer* s4 = new wxBoxSizer(wxHORIZONTAL);
         m_background_color = new wxBitmapButton(this, ID_BackgroundColor, b, wxDefaultPosition, wxSize(50,25));
         s4->Add(1, 1, 1, wxEXPAND);

-        s4->Add(new wxStaticText(this, -1, wxT("Background Color:")));
+        s4->Add(new wxStaticText(this, wxID_ANY, wxT("Background Color:")));

         s4->Add(m_background_color);
         s4->Add(1, 1, 1, wxEXPAND);
         s4->SetItemMinSize((size_t)1, 180, 20);
         s4->Add(m_background_color);
         s4->Add(1, 1, 1, wxEXPAND);
         s4->SetItemMinSize((size_t)1, 180, 20);


@@ -292,7 +292,7 @@ public:
         wxBoxSizer* s5 = new wxBoxSizer(wxHORIZONTAL);
         m_sash_color = new wxBitmapButton(this, ID_SashColor, b, wxDefaultPosition, wxSize(50,25));
         s5->Add(1, 1, 1, wxEXPAND);
         wxBoxSizer* s5 = new wxBoxSizer(wxHORIZONTAL);
         m_sash_color = new wxBitmapButton(this, ID_SashColor, b, wxDefaultPosition, wxSize(50,25));
         s5->Add(1, 1, 1, wxEXPAND);

-        s5->Add(new wxStaticText(this, -1, wxT("Sash Color:")));
+        s5->Add(new wxStaticText(this, wxID_ANY, wxT("Sash Color:")));

         s5->Add(m_sash_color);
         s5->Add(1, 1, 1, wxEXPAND);
         s5->SetItemMinSize((size_t)1, 180, 20);
         s5->Add(m_sash_color);
         s5->Add(1, 1, 1, wxEXPAND);
         s5->SetItemMinSize((size_t)1, 180, 20);


@@ -300,7 +300,7 @@ public:
         wxBoxSizer* s6 = new wxBoxSizer(wxHORIZONTAL);
         m_inactive_caption_color = new wxBitmapButton(this, ID_InactiveCaptionColor, b, wxDefaultPosition, wxSize(50,25));
         s6->Add(1, 1, 1, wxEXPAND);
         wxBoxSizer* s6 = new wxBoxSizer(wxHORIZONTAL);
         m_inactive_caption_color = new wxBitmapButton(this, ID_InactiveCaptionColor, b, wxDefaultPosition, wxSize(50,25));
         s6->Add(1, 1, 1, wxEXPAND);

-        s6->Add(new wxStaticText(this, -1, wxT("Normal Caption:")));
+        s6->Add(new wxStaticText(this, wxID_ANY, wxT("Normal Caption:")));

         s6->Add(m_inactive_caption_color);
         s6->Add(1, 1, 1, wxEXPAND);
         s6->SetItemMinSize((size_t)1, 180, 20);
         s6->Add(m_inactive_caption_color);
         s6->Add(1, 1, 1, wxEXPAND);
         s6->SetItemMinSize((size_t)1, 180, 20);


@@ -308,7 +308,7 @@ public:
         wxBoxSizer* s7 = new wxBoxSizer(wxHORIZONTAL);
         m_inactive_caption_gradient_color = new wxBitmapButton(this, ID_InactiveCaptionGradientColor, b, wxDefaultPosition, wxSize(50,25));
         s7->Add(1, 1, 1, wxEXPAND);
         wxBoxSizer* s7 = new wxBoxSizer(wxHORIZONTAL);
         m_inactive_caption_gradient_color = new wxBitmapButton(this, ID_InactiveCaptionGradientColor, b, wxDefaultPosition, wxSize(50,25));
         s7->Add(1, 1, 1, wxEXPAND);

-        s7->Add(new wxStaticText(this, -1, wxT("Normal Caption Gradient:")));
+        s7->Add(new wxStaticText(this, wxID_ANY, wxT("Normal Caption Gradient:")));

         s7->Add(m_inactive_caption_gradient_color);
         s7->Add(1, 1, 1, wxEXPAND);
         s7->SetItemMinSize((size_t)1, 180, 20);
         s7->Add(m_inactive_caption_gradient_color);
         s7->Add(1, 1, 1, wxEXPAND);
         s7->SetItemMinSize((size_t)1, 180, 20);


@@ -316,7 +316,7 @@ public:
         wxBoxSizer* s8 = new wxBoxSizer(wxHORIZONTAL);
         m_inactive_caption_text_color = new wxBitmapButton(this, ID_InactiveCaptionTextColor, b, wxDefaultPosition, wxSize(50,25));
         s8->Add(1, 1, 1, wxEXPAND);
         wxBoxSizer* s8 = new wxBoxSizer(wxHORIZONTAL);
         m_inactive_caption_text_color = new wxBitmapButton(this, ID_InactiveCaptionTextColor, b, wxDefaultPosition, wxSize(50,25));
         s8->Add(1, 1, 1, wxEXPAND);

-        s8->Add(new wxStaticText(this, -1, wxT("Normal Caption Text:")));
+        s8->Add(new wxStaticText(this, wxID_ANY, wxT("Normal Caption Text:")));

         s8->Add(m_inactive_caption_text_color);
         s8->Add(1, 1, 1, wxEXPAND);
         s8->SetItemMinSize((size_t)1, 180, 20);
         s8->Add(m_inactive_caption_text_color);
         s8->Add(1, 1, 1, wxEXPAND);
         s8->SetItemMinSize((size_t)1, 180, 20);


@@ -324,7 +324,7 @@ public:
         wxBoxSizer* s9 = new wxBoxSizer(wxHORIZONTAL);
         m_active_caption_color = new wxBitmapButton(this, ID_ActiveCaptionColor, b, wxDefaultPosition, wxSize(50,25));
         s9->Add(1, 1, 1, wxEXPAND);
         wxBoxSizer* s9 = new wxBoxSizer(wxHORIZONTAL);
         m_active_caption_color = new wxBitmapButton(this, ID_ActiveCaptionColor, b, wxDefaultPosition, wxSize(50,25));
         s9->Add(1, 1, 1, wxEXPAND);

-        s9->Add(new wxStaticText(this, -1, wxT("Active Caption:")));
+        s9->Add(new wxStaticText(this, wxID_ANY, wxT("Active Caption:")));

         s9->Add(m_active_caption_color);
         s9->Add(1, 1, 1, wxEXPAND);
         s9->SetItemMinSize((size_t)1, 180, 20);
         s9->Add(m_active_caption_color);
         s9->Add(1, 1, 1, wxEXPAND);
         s9->SetItemMinSize((size_t)1, 180, 20);


@@ -332,7 +332,7 @@ public:
         wxBoxSizer* s10 = new wxBoxSizer(wxHORIZONTAL);
         m_active_caption_gradient_color = new wxBitmapButton(this, ID_ActiveCaptionGradientColor, b, wxDefaultPosition, wxSize(50,25));
         s10->Add(1, 1, 1, wxEXPAND);
         wxBoxSizer* s10 = new wxBoxSizer(wxHORIZONTAL);
         m_active_caption_gradient_color = new wxBitmapButton(this, ID_ActiveCaptionGradientColor, b, wxDefaultPosition, wxSize(50,25));
         s10->Add(1, 1, 1, wxEXPAND);

-        s10->Add(new wxStaticText(this, -1, wxT("Active Caption Gradient:")));
+        s10->Add(new wxStaticText(this, wxID_ANY, wxT("Active Caption Gradient:")));

         s10->Add(m_active_caption_gradient_color);
         s10->Add(1, 1, 1, wxEXPAND);
         s10->SetItemMinSize((size_t)1, 180, 20);
         s10->Add(m_active_caption_gradient_color);
         s10->Add(1, 1, 1, wxEXPAND);
         s10->SetItemMinSize((size_t)1, 180, 20);


@@ -340,7 +340,7 @@ public:
         wxBoxSizer* s11 = new wxBoxSizer(wxHORIZONTAL);
         m_active_caption_text_color = new wxBitmapButton(this, ID_ActiveCaptionTextColor, b, wxDefaultPosition, wxSize(50,25));
         s11->Add(1, 1, 1, wxEXPAND);
         wxBoxSizer* s11 = new wxBoxSizer(wxHORIZONTAL);
         m_active_caption_text_color = new wxBitmapButton(this, ID_ActiveCaptionTextColor, b, wxDefaultPosition, wxSize(50,25));
         s11->Add(1, 1, 1, wxEXPAND);

-        s11->Add(new wxStaticText(this, -1, wxT("Active Caption Text:")));
+        s11->Add(new wxStaticText(this, wxID_ANY, wxT("Active Caption Text:")));

         s11->Add(m_active_caption_text_color);
         s11->Add(1, 1, 1, wxEXPAND);
         s11->SetItemMinSize((size_t)1, 180, 20);
         s11->Add(m_active_caption_text_color);
         s11->Add(1, 1, 1, wxEXPAND);
         s11->SetItemMinSize((size_t)1, 180, 20);


@@ -348,7 +348,7 @@ public:
         wxBoxSizer* s12 = new wxBoxSizer(wxHORIZONTAL);
         m_border_color = new wxBitmapButton(this, ID_BorderColor, b, wxDefaultPosition, wxSize(50,25));
         s12->Add(1, 1, 1, wxEXPAND);
         wxBoxSizer* s12 = new wxBoxSizer(wxHORIZONTAL);
         m_border_color = new wxBitmapButton(this, ID_BorderColor, b, wxDefaultPosition, wxSize(50,25));
         s12->Add(1, 1, 1, wxEXPAND);

-        s12->Add(new wxStaticText(this, -1, wxT("Border Color:")));
+        s12->Add(new wxStaticText(this, wxID_ANY, wxT("Border Color:")));

         s12->Add(m_border_color);
         s12->Add(1, 1, 1, wxEXPAND);
         s12->SetItemMinSize((size_t)1, 180, 20);
         s12->Add(m_border_color);
         s12->Add(1, 1, 1, wxEXPAND);
         s12->SetItemMinSize((size_t)1, 180, 20);


@@ -356,11 +356,11 @@ public:
         wxBoxSizer* s13 = new wxBoxSizer(wxHORIZONTAL);
         m_gripper_color = new wxBitmapButton(this, ID_GripperColor, b, wxDefaultPosition, wxSize(50,25));
         s13->Add(1, 1, 1, wxEXPAND);
         wxBoxSizer* s13 = new wxBoxSizer(wxHORIZONTAL);
         m_gripper_color = new wxBitmapButton(this, ID_GripperColor, b, wxDefaultPosition, wxSize(50,25));
         s13->Add(1, 1, 1, wxEXPAND);

-        s13->Add(new wxStaticText(this, -1, wxT("Gripper Color:")));
+        s13->Add(new wxStaticText(this, wxID_ANY, wxT("Gripper Color:")));

         s13->Add(m_gripper_color);
         s13->Add(1, 1, 1, wxEXPAND);
         s13->SetItemMinSize((size_t)1, 180, 20);
         s13->Add(m_gripper_color);
         s13->Add(1, 1, 1, wxEXPAND);
         s13->SetItemMinSize((size_t)1, 180, 20);

-        
+

         wxGridSizer* grid_sizer = new wxGridSizer(2);
         grid_sizer->SetHGap(5);
         grid_sizer->Add(s1);  grid_sizer->Add(s4);
         wxGridSizer* grid_sizer = new wxGridSizer(2);
         grid_sizer->SetHGap(5);
         grid_sizer->Add(s1);  grid_sizer->Add(s4);


@@ -370,7 +370,7 @@ public:
         grid_sizer->Add(s6);  grid_sizer->Add(s9);
         grid_sizer->Add(s7);  grid_sizer->Add(s10);
         grid_sizer->Add(s8);  grid_sizer->Add(s11);
         grid_sizer->Add(s6);  grid_sizer->Add(s9);
         grid_sizer->Add(s7);  grid_sizer->Add(s10);
         grid_sizer->Add(s8);  grid_sizer->Add(s11);

-         
+

         wxBoxSizer* cont_sizer = new wxBoxSizer(wxVERTICAL);
         cont_sizer->Add(grid_sizer, 1, wxEXPAND | wxALL, 5);
         SetSizer(cont_sizer);
         wxBoxSizer* cont_sizer = new wxBoxSizer(wxVERTICAL);
         cont_sizer->Add(grid_sizer, 1, wxEXPAND | wxALL, 5);
         SetSizer(cont_sizer);


@@ -380,7 +380,7 @@ public:
         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_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));

-        
+

         UpdateColors();
     }
 
         UpdateColors();
     }
 


@@ -400,40 +400,40 @@ private:
             }
         return wxBitmap(image);
     }
             }
         return wxBitmap(image);
     }

-    
+

     void UpdateColors()
     {
         wxColour bk = m_frame->GetDockArt()->GetColor(wxAUI_ART_BACKGROUND_COLOUR);
         m_background_color->SetBitmapLabel(CreateColorBitmap(bk));
     void UpdateColors()
     {
         wxColour bk = m_frame->GetDockArt()->GetColor(wxAUI_ART_BACKGROUND_COLOUR);
         m_background_color->SetBitmapLabel(CreateColorBitmap(bk));

-        
+

         wxColour cap = m_frame->GetDockArt()->GetColor(wxAUI_ART_INACTIVE_CAPTION_COLOUR);
         m_inactive_caption_color->SetBitmapLabel(CreateColorBitmap(cap));
         wxColour cap = m_frame->GetDockArt()->GetColor(wxAUI_ART_INACTIVE_CAPTION_COLOUR);
         m_inactive_caption_color->SetBitmapLabel(CreateColorBitmap(cap));

-        
+

         wxColour capgrad = m_frame->GetDockArt()->GetColor(wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR);
         m_inactive_caption_gradient_color->SetBitmapLabel(CreateColorBitmap(capgrad));
         wxColour capgrad = m_frame->GetDockArt()->GetColor(wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR);
         m_inactive_caption_gradient_color->SetBitmapLabel(CreateColorBitmap(capgrad));

-        
+

         wxColour captxt = m_frame->GetDockArt()->GetColor(wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR);
         m_inactive_caption_text_color->SetBitmapLabel(CreateColorBitmap(captxt));
         wxColour captxt = m_frame->GetDockArt()->GetColor(wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR);
         m_inactive_caption_text_color->SetBitmapLabel(CreateColorBitmap(captxt));

-        
+

         wxColour acap = m_frame->GetDockArt()->GetColor(wxAUI_ART_ACTIVE_CAPTION_COLOUR);
         m_active_caption_color->SetBitmapLabel(CreateColorBitmap(acap));
         wxColour acap = m_frame->GetDockArt()->GetColor(wxAUI_ART_ACTIVE_CAPTION_COLOUR);
         m_active_caption_color->SetBitmapLabel(CreateColorBitmap(acap));

-        
+

         wxColour acapgrad = m_frame->GetDockArt()->GetColor(wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR);
         m_active_caption_gradient_color->SetBitmapLabel(CreateColorBitmap(acapgrad));
         wxColour acapgrad = m_frame->GetDockArt()->GetColor(wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR);
         m_active_caption_gradient_color->SetBitmapLabel(CreateColorBitmap(acapgrad));

-        
+

         wxColour acaptxt = m_frame->GetDockArt()->GetColor(wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR);
         m_active_caption_text_color->SetBitmapLabel(CreateColorBitmap(acaptxt));
 
         wxColour sash = m_frame->GetDockArt()->GetColor(wxAUI_ART_SASH_COLOUR);
         m_sash_color->SetBitmapLabel(CreateColorBitmap(sash));
         wxColour acaptxt = m_frame->GetDockArt()->GetColor(wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR);
         m_active_caption_text_color->SetBitmapLabel(CreateColorBitmap(acaptxt));
 
         wxColour sash = m_frame->GetDockArt()->GetColor(wxAUI_ART_SASH_COLOUR);
         m_sash_color->SetBitmapLabel(CreateColorBitmap(sash));

-        
+

         wxColour border = m_frame->GetDockArt()->GetColor(wxAUI_ART_BORDER_COLOUR);
         m_border_color->SetBitmapLabel(CreateColorBitmap(border));
         wxColour border = m_frame->GetDockArt()->GetColor(wxAUI_ART_BORDER_COLOUR);
         m_border_color->SetBitmapLabel(CreateColorBitmap(border));

-        
+

         wxColour gripper = m_frame->GetDockArt()->GetColor(wxAUI_ART_GRIPPER_COLOUR);
         m_gripper_color->SetBitmapLabel(CreateColorBitmap(gripper));
     }
         wxColour gripper = m_frame->GetDockArt()->GetColor(wxAUI_ART_GRIPPER_COLOUR);
         m_gripper_color->SetBitmapLabel(CreateColorBitmap(gripper));
     }

-    
+

     void OnPaneBorderSize(wxSpinEvent& event)
     {
         m_frame->GetDockArt()->SetMetric(wxAUI_ART_PANE_BORDER_SIZE,
     void OnPaneBorderSize(wxSpinEvent& event)
     {
         m_frame->GetDockArt()->SetMetric(wxAUI_ART_PANE_BORDER_SIZE,


@@ -461,7 +461,7 @@ private:
         dlg.SetTitle(_("Color Picker"));
         if (dlg.ShowModal() != wxID_OK)
             return;
         dlg.SetTitle(_("Color Picker"));
         if (dlg.ShowModal() != wxID_OK)
             return;

-        
+

         int var = 0;
         switch (event.GetId())
         {
         int var = 0;
         switch (event.GetId())
         {


@@ -477,12 +477,12 @@ private:
             case ID_GripperColor:                 var = wxAUI_ART_GRIPPER_COLOUR; break;
             default: return;
         }
             case ID_GripperColor:                 var = wxAUI_ART_GRIPPER_COLOUR; break;
             default: return;
         }

-        
+

         m_frame->GetDockArt()->SetColor(var, dlg.GetColourData().GetColour());
         m_frame->DoUpdate();
         UpdateColors();
     }
         m_frame->GetDockArt()->SetColor(var, dlg.GetColourData().GetColour());
         m_frame->DoUpdate();
         UpdateColors();
     }

-    
+

 private:
 
     MyFrame* m_frame;
 private:
 
     MyFrame* m_frame;


@@ -499,7 +499,7 @@ private:
     wxBitmapButton* m_background_color;
     wxBitmapButton* m_border_color;
     wxBitmapButton* m_gripper_color;
     wxBitmapButton* m_background_color;
     wxBitmapButton* m_border_color;
     wxBitmapButton* m_gripper_color;

-    
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -516,7 +516,7 @@ BEGIN_EVENT_TABLE(SettingsPanel, wxPanel)
     EVT_BUTTON(ID_ActiveCaptionGradientColor, SettingsPanel::OnSetColor)
     EVT_BUTTON(ID_ActiveCaptionTextColor, SettingsPanel::OnSetColor)
     EVT_BUTTON(ID_BorderColor, SettingsPanel::OnSetColor)
     EVT_BUTTON(ID_ActiveCaptionGradientColor, SettingsPanel::OnSetColor)
     EVT_BUTTON(ID_ActiveCaptionTextColor, SettingsPanel::OnSetColor)
     EVT_BUTTON(ID_BorderColor, SettingsPanel::OnSetColor)

-    EVT_BUTTON(ID_GripperColor, SettingsPanel::OnSetColor)    
+    EVT_BUTTON(ID_GripperColor, SettingsPanel::OnSetColor)

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 


@@ -575,6 +575,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_UPDATE_UI(ID_HorizontalGradient, MyFrame::OnUpdateUI)
     EVT_MENU_RANGE(MyFrame::ID_FirstPerspective, MyFrame::ID_FirstPerspective+1000,
                    MyFrame::OnRestorePerspective)
     EVT_UPDATE_UI(ID_HorizontalGradient, MyFrame::OnUpdateUI)
     EVT_MENU_RANGE(MyFrame::ID_FirstPerspective, MyFrame::ID_FirstPerspective+1000,
                    MyFrame::OnRestorePerspective)

+    EVT_AUI_PANECLOSE(MyFrame::OnPaneClose)

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 


@@ -588,8 +589,8 @@ MyFrame::MyFrame(wxWindow* parent,
         : wxFrame(parent, id, title, pos, size, style)
 {
     // tell wxFrameManager to manage this frame
         : wxFrame(parent, id, title, pos, size, style)
 {
     // tell wxFrameManager to manage this frame

-    m_mgr.SetFrame(this); 
-    
+    m_mgr.SetFrame(this);
+

     // set frame icon
     SetIcon(wxIcon(sample_xpm));
 
     // set frame icon
     SetIcon(wxIcon(sample_xpm));
 


@@ -610,8 +611,8 @@ MyFrame::MyFrame(wxWindow* parent,
     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_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_SizeReportContent, _("Use a Size Reporter for the Content Pane"));    
-       
+    view_menu->Append(ID_SizeReportContent, _("Use a Size Reporter for the Content Pane"));
+

     wxMenu* options_menu = new wxMenu;
     options_menu->AppendCheckItem(ID_AllowFloating, _("Allow Floating"));
     options_menu->AppendCheckItem(ID_TransparentHint, _("Transparent Hint"));
     wxMenu* options_menu = new wxMenu;
     options_menu->AppendCheckItem(ID_AllowFloating, _("Allow Floating"));
     options_menu->AppendCheckItem(ID_TransparentHint, _("Transparent Hint"));


@@ -624,7 +625,7 @@ MyFrame::MyFrame(wxWindow* parent,
     options_menu->AppendRadioItem(ID_HorizontalGradient, _("Horizontal Caption Gradient"));
     options_menu->AppendSeparator();
     options_menu->Append(ID_Settings, _("Settings Pane"));
     options_menu->AppendRadioItem(ID_HorizontalGradient, _("Horizontal Caption Gradient"));
     options_menu->AppendSeparator();
     options_menu->Append(ID_Settings, _("Settings Pane"));

-    
+

     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 +635,13 @@ MyFrame::MyFrame(wxWindow* parent,
 
     wxMenu* help_menu = new wxMenu;
     help_menu->Append(wxID_ABOUT, _("About..."));
 
     wxMenu* help_menu = new wxMenu;
     help_menu->Append(wxID_ABOUT, _("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(help_menu, _("Help"));

-    
+

     SetMenuBar(mb);
 
     CreateStatusBar();
     SetMenuBar(mb);
 
     CreateStatusBar();


@@ -653,7 +654,7 @@ MyFrame::MyFrame(wxWindow* parent,
     SetMinSize(wxSize(400,300));
 
     // create some toolbars
     SetMinSize(wxSize(400,300));
 
     // create some toolbars

-    wxToolBar* tb1 = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize,
+    wxToolBar* tb1 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,

                                    wxTB_FLAT | wxTB_NODIVIDER);
     tb1->SetToolBitmapSize(wxSize(48,48));
     tb1->AddTool(101, wxT("Test"), wxArtProvider::GetBitmap(wxART_ERROR));
                                    wxTB_FLAT | wxTB_NODIVIDER);
     tb1->SetToolBitmapSize(wxSize(48,48));
     tb1->AddTool(101, wxT("Test"), wxArtProvider::GetBitmap(wxART_ERROR));


@@ -666,7 +667,7 @@ MyFrame::MyFrame(wxWindow* parent,
 
 
 
 
 
 

-    wxToolBar* tb2 = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize,
+    wxToolBar* tb2 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,

                                    wxTB_FLAT | wxTB_NODIVIDER);
     tb2->SetToolBitmapSize(wxSize(16,16));
 
                                    wxTB_FLAT | wxTB_NODIVIDER);
     tb2->SetToolBitmapSize(wxSize(16,16));
 


@@ -685,8 +686,8 @@ MyFrame::MyFrame(wxWindow* parent,
     tb2->AddTool(101, wxT("Test"), tb2_bmp1);
     tb2->Realize();
 
     tb2->AddTool(101, wxT("Test"), tb2_bmp1);
     tb2->Realize();
 

-   
-    wxToolBar* tb3 = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize,
+
+    wxToolBar* tb3 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,

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


@@ -701,7 +702,7 @@ MyFrame::MyFrame(wxWindow* parent,
 
 
 
 
 
 

-    wxToolBar* tb4 = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize,
+    wxToolBar* tb4 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,

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


@@ -717,7 +718,7 @@ MyFrame::MyFrame(wxWindow* parent,
     tb4->Realize();
 
     // create some toolbars
     tb4->Realize();
 
     // create some toolbars

-    wxToolBar* tb5 = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize,
+    wxToolBar* tb5 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,

                                    wxTB_FLAT | wxTB_NODIVIDER | wxTB_VERTICAL);
     tb5->SetToolBitmapSize(wxSize(48,48));
     tb5->AddTool(101, wxT("Test"), wxArtProvider::GetBitmap(wxART_ERROR));
                                    wxTB_FLAT | wxTB_NODIVIDER | wxTB_VERTICAL);
     tb5->SetToolBitmapSize(wxSize(48,48));
     tb5->AddTool(101, wxT("Test"), wxArtProvider::GetBitmap(wxART_ERROR));


@@ -741,15 +742,15 @@ MyFrame::MyFrame(wxWindow* parent,
     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
                   Name(wxT("test3")).Caption(wxT("Client Size Reporter")).
                   Bottom());
     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
                   Name(wxT("test3")).Caption(wxT("Client Size Reporter")).
                   Bottom());

- 
+

     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
                   Name(wxT("test4")).Caption(wxT("Pane Caption")).
                   Left());
     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
                   Name(wxT("test4")).Caption(wxT("Pane Caption")).
                   Left());

-                  
+

     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
                   Name(wxT("test5")).Caption(wxT("Pane Caption")).
                   Right());
     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
                   Name(wxT("test5")).Caption(wxT("Pane Caption")).
                   Right());

-                  
+

     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
                   Name(wxT("test6")).Caption(wxT("Client Size Reporter")).
                   Right().Row(1));
     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
                   Name(wxT("test6")).Caption(wxT("Client Size Reporter")).
                   Right().Row(1));


@@ -757,7 +758,7 @@ MyFrame::MyFrame(wxWindow* parent,
     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
                   Name(wxT("test7")).Caption(wxT("Client Size Reporter")).
                   Left().Layer(1));
     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
                   Name(wxT("test7")).Caption(wxT("Client Size Reporter")).
                   Left().Layer(1));

-                  
+

     m_mgr.AddPane(CreateTreeCtrl(), wxPaneInfo().
                   Name(wxT("test8")).Caption(wxT("Tree Pane")).
                   Left().Layer(1).Position(1));
     m_mgr.AddPane(CreateTreeCtrl(), wxPaneInfo().
                   Name(wxT("test8")).Caption(wxT("Tree Pane")).
                   Left().Layer(1).Position(1));


@@ -767,15 +768,16 @@ MyFrame::MyFrame(wxWindow* parent,
                   BestSize(wxSize(200,100)).MinSize(wxSize(200,100)).
                   Bottom().Layer(1));
 
                   BestSize(wxSize(200,100)).MinSize(wxSize(200,100)).
                   Bottom().Layer(1));
 

-    m_mgr.AddPane(CreateTextCtrl(), wxPaneInfo().
-                  Name(wxT("test10")).Caption(wxT("Text Pane")).
+    wxWindow* wnd10 = CreateTextCtrl(wxT("This pane will prompt the user before hiding."));
+    m_mgr.AddPane(wnd10, wxPaneInfo().
+                  Name(wxT("test10")).Caption(wxT("Text Pane with Hide Prompt")).

                   Bottom().Layer(1).Position(1));
                   Bottom().Layer(1).Position(1));

-                                  
+

     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
                   Name(wxT("test11")).Caption(wxT("Fixed Pane")).
                   Bottom().Layer(1).Position(2).Fixed());
 
     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
                   Name(wxT("test11")).Caption(wxT("Fixed Pane")).
                   Bottom().Layer(1).Position(2).Fixed());
 

-                      
+

     m_mgr.AddPane(new SettingsPanel(this,this), wxPaneInfo().
                   Name(wxT("settings")).Caption(wxT("Dock Manager Settings")).
                   Dockable(false).Float().Hide());
     m_mgr.AddPane(new SettingsPanel(this,this), wxPaneInfo().
                   Name(wxT("settings")).Caption(wxT("Dock Manager Settings")).
                   Dockable(false).Float().Hide());


@@ -787,7 +789,7 @@ MyFrame::MyFrame(wxWindow* parent,
 
     m_mgr.AddPane(CreateTreeCtrl(), wxPaneInfo().Name(wxT("tree_content")).
                   CenterPane().Hide());
 
     m_mgr.AddPane(CreateTreeCtrl(), wxPaneInfo().Name(wxT("tree_content")).
                   CenterPane().Hide());

-                  
+

     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().Name(wxT("sizereport_content")).
                   CenterPane().Hide());
 
     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().Name(wxT("sizereport_content")).
                   CenterPane().Hide());
 


@@ -796,9 +798,9 @@ MyFrame::MyFrame(wxWindow* parent,
 
     m_mgr.AddPane(CreateHTMLCtrl(), wxPaneInfo().Name(wxT("html_content")).
                   CenterPane());
 
     m_mgr.AddPane(CreateHTMLCtrl(), wxPaneInfo().Name(wxT("html_content")).
                   CenterPane());

-                            
+

     // add the toolbars to the manager
     // add the toolbars to the manager

-                    
+

     m_mgr.AddPane(tb1, wxPaneInfo().
                   Name(wxT("tb1")).Caption(wxT("Big Toolbar")).
                   ToolbarPane().Top().
     m_mgr.AddPane(tb1, wxPaneInfo().
                   Name(wxT("tb1")).Caption(wxT("Big Toolbar")).
                   ToolbarPane().Top().


@@ -808,34 +810,33 @@ MyFrame::MyFrame(wxWindow* parent,
                   Name(wxT("tb2")).Caption(wxT("Toolbar 2")).
                   ToolbarPane().Top().Row(1).
                   LeftDockable(false).RightDockable(false));
                   Name(wxT("tb2")).Caption(wxT("Toolbar 2")).
                   ToolbarPane().Top().Row(1).
                   LeftDockable(false).RightDockable(false));

-                  
+

     m_mgr.AddPane(tb3, wxPaneInfo().
                   Name(wxT("tb3")).Caption(wxT("Toolbar 3")).
                   ToolbarPane().Top().Row(1).Position(1).
                   LeftDockable(false).RightDockable(false));
     m_mgr.AddPane(tb3, wxPaneInfo().
                   Name(wxT("tb3")).Caption(wxT("Toolbar 3")).
                   ToolbarPane().Top().Row(1).Position(1).
                   LeftDockable(false).RightDockable(false));

-                  
+

     m_mgr.AddPane(tb4, wxPaneInfo().
                   Name(wxT("tb4")).Caption(wxT("Sample Bookmark Toolbar")).
                   ToolbarPane().Top().Row(2).
                   LeftDockable(false).RightDockable(false));
     m_mgr.AddPane(tb4, wxPaneInfo().
                   Name(wxT("tb4")).Caption(wxT("Sample Bookmark Toolbar")).
                   ToolbarPane().Top().Row(2).
                   LeftDockable(false).RightDockable(false));

-                  
+

     m_mgr.AddPane(tb5, wxPaneInfo().
                   Name(wxT("tb4")).Caption(wxT("Sample Vertical Toolbar")).
                   ToolbarPane().Left().
                   GripperTop().
                   TopDockable(false).BottomDockable(false));
     m_mgr.AddPane(tb5, wxPaneInfo().
                   Name(wxT("tb4")).Caption(wxT("Sample Vertical Toolbar")).
                   ToolbarPane().Left().
                   GripperTop().
                   TopDockable(false).BottomDockable(false));

-                  
-    m_mgr.AddPane(new wxButton(this, -1, _("Test Button")),
+
+    m_mgr.AddPane(new wxButton(this, wxID_ANY, _("Test Button")),

                   wxPaneInfo().Name(wxT("tb5")).
                   ToolbarPane().Top().Row(2).Position(1).
                   LeftDockable(false).RightDockable(false));
 
 
                   wxPaneInfo().Name(wxT("tb5")).
                   ToolbarPane().Top().Row(2).Position(1).
                   LeftDockable(false).RightDockable(false));
 
 

-    

     // make some default perspectives
     // make some default perspectives

-    
+

     wxString perspective_all = m_mgr.SavePerspective();
     wxString perspective_all = m_mgr.SavePerspective();

-    
+

     int i, count;
     wxPaneInfoArray& all_panes = m_mgr.GetAllPanes();
     for (i = 0, count = all_panes.GetCount(); i < count; ++i)
     int i, count;
     wxPaneInfoArray& all_panes = m_mgr.GetAllPanes();
     for (i = 0, count = all_panes.GetCount(); i < count; ++i)


@@ -847,11 +848,11 @@ MyFrame::MyFrame(wxWindow* parent,
     m_mgr.GetPane(wxT("test10")).Show().Bottom().Layer(0).Row(0).Position(0);
     m_mgr.GetPane(wxT("html_content")).Show();
     wxString perspective_default = m_mgr.SavePerspective();
     m_mgr.GetPane(wxT("test10")).Show().Bottom().Layer(0).Row(0).Position(0);
     m_mgr.GetPane(wxT("html_content")).Show();
     wxString perspective_default = m_mgr.SavePerspective();

-    
+

     m_perspectives.Add(perspective_default);
     m_perspectives.Add(perspective_all);
 
     m_perspectives.Add(perspective_default);
     m_perspectives.Add(perspective_all);
 

-    // "commit" all changes made to wxFrameManager   
+    // "commit" all changes made to wxFrameManager

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


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

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

 {
     // show the settings pane, and float it
     wxPaneInfo& floating_pane = m_mgr.GetPane(wxT("settings")).Float().Show();
 {
     // show the settings pane, and float it
     wxPaneInfo& floating_pane = m_mgr.GetPane(wxT("settings")).Float().Show();


@@ -911,17 +912,17 @@ void MyFrame::OnGradient(wxCommandEvent& event)
 void MyFrame::OnManagerFlag(wxCommandEvent& event)
 {
     unsigned int flag = 0;
 void MyFrame::OnManagerFlag(wxCommandEvent& event)
 {
     unsigned int flag = 0;

-    
-    #ifndef __WXMSW__
+
+#if !defined(__WXMSW__) && !defined(__WXMAC__)

     if (event.GetId() == ID_TransparentDrag ||
         event.GetId() == ID_TransparentHint ||
         event.GetId() == ID_TransparentHintFade)
     {
     if (event.GetId() == ID_TransparentDrag ||
         event.GetId() == ID_TransparentHint ||
         event.GetId() == ID_TransparentHintFade)
     {

-        wxMessageBox(wxT("This option is presently only available on wxMSW"));
+        wxMessageBox(wxT("This option is presently only available on wxMSW and wxMac"));

         return;
     }
         return;
     }

-    #endif
-    
+#endif
+

     switch (event.GetId())
     {
         case ID_AllowFloating: flag = wxAUI_MGR_ALLOW_FLOATING; break;
     switch (event.GetId())
     {
         case ID_AllowFloating: flag = wxAUI_MGR_ALLOW_FLOATING; break;


@@ -937,7 +938,7 @@ void MyFrame::OnManagerFlag(wxCommandEvent& event)
 void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
 {
     unsigned int flags = m_mgr.GetFlags();
 void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
 {
     unsigned int flags = m_mgr.GetFlags();

-    
+

     switch (event.GetId())
     {
         case ID_NoGradient:
     switch (event.GetId())
     {
         case ID_NoGradient:


@@ -964,33 +965,50 @@ void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
     }
 }
 
     }
 }
 

-void MyFrame::OnCreatePerspective(wxCommandEvent& event)
+void MyFrame::OnPaneClose(wxFrameManagerEvent& evt)
+{
+    if (evt.pane->name == wxT("test10"))
+    {
+        int res = wxMessageBox(wxT("Are you sure you want to close/hide this pane?"),
+                               wxT("wxAUI"),
+                               wxYES_NO,
+                               this);
+        if (res != wxYES)
+            evt.Veto();
+    }
+}
+
+
+
+void MyFrame::OnCreatePerspective(wxCommandEvent& WXUNUSED(event))

 {
     wxTextEntryDialog dlg(this, wxT("Enter a name for the new perspective:"),
                           wxT("wxAUI Test"));
 {
     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));
     if (dlg.ShowModal() != wxID_OK)
         return;
     dlg.SetValue(wxString::Format(wxT("Perspective %d"), m_perspectives.GetCount()+1));
     if (dlg.ShowModal() != wxID_OK)
         return;

-    
+

     if (m_perspectives.GetCount() == 0)
     {
         m_perspectives_menu->AppendSeparator();
     }
     if (m_perspectives.GetCount() == 0)
     {
         m_perspectives_menu->AppendSeparator();
     }

-    
+

     m_perspectives_menu->Append(ID_FirstPerspective + m_perspectives.GetCount(), dlg.GetValue());
     m_perspectives.Add(m_mgr.SavePerspective());
 }
 
     m_perspectives_menu->Append(ID_FirstPerspective + m_perspectives.GetCount(), dlg.GetValue());
     m_perspectives.Add(m_mgr.SavePerspective());
 }
 

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

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

-    
+
+#if wxUSE_CLIPBOARD

     if (wxTheClipboard->Open())
     {
         wxTheClipboard->SetData(new wxTextDataObject(s));
         wxTheClipboard->Close();
     }
     if (wxTheClipboard->Open())
     {
         wxTheClipboard->SetData(new wxTextDataObject(s));
         wxTheClipboard->Close();
     }

+#endif

 }
 
 void MyFrame::OnRestorePerspective(wxCommandEvent& event)
 }
 
 void MyFrame::OnRestorePerspective(wxCommandEvent& event)


@@ -1007,7 +1025,7 @@ wxPoint MyFrame::GetStartPosition()
     return wxPoint(pt.x + x, pt.y + x);
 }
 
     return wxPoint(pt.x + x, pt.y + x);
 }
 

-void MyFrame::OnCreateTree(wxCommandEvent& event)
+void MyFrame::OnCreateTree(wxCommandEvent& WXUNUSED(event))

 {
     m_mgr.AddPane(CreateTreeCtrl(), wxPaneInfo().
                   Name(wxT("Test")).Caption(wxT("Tree Control")).
 {
     m_mgr.AddPane(CreateTreeCtrl(), wxPaneInfo().
                   Name(wxT("Test")).Caption(wxT("Tree Control")).


@@ -1016,7 +1034,7 @@ void MyFrame::OnCreateTree(wxCommandEvent& event)
     m_mgr.Update();
 }
 
     m_mgr.Update();
 }
 

-void MyFrame::OnCreateGrid(wxCommandEvent& event)
+void MyFrame::OnCreateGrid(wxCommandEvent& WXUNUSED(event))

 {
     m_mgr.AddPane(CreateGrid(), wxPaneInfo().
                   Name(wxT("Test")).Caption(wxT("Grid")).
 {
     m_mgr.AddPane(CreateGrid(), wxPaneInfo().
                   Name(wxT("Test")).Caption(wxT("Grid")).


@@ -1025,7 +1043,7 @@ void MyFrame::OnCreateGrid(wxCommandEvent& event)
     m_mgr.Update();
 }
 
     m_mgr.Update();
 }
 

-void MyFrame::OnCreateHTML(wxCommandEvent& event)
+void MyFrame::OnCreateHTML(wxCommandEvent& WXUNUSED(event))

 {
     m_mgr.AddPane(CreateHTMLCtrl(), wxPaneInfo().
                   Name(wxT("Test")).Caption(wxT("Grid")).
 {
     m_mgr.AddPane(CreateHTMLCtrl(), wxPaneInfo().
                   Name(wxT("Test")).Caption(wxT("Grid")).


@@ -1034,7 +1052,7 @@ void MyFrame::OnCreateHTML(wxCommandEvent& event)
     m_mgr.Update();
 }
 
     m_mgr.Update();
 }
 

-void MyFrame::OnCreateText(wxCommandEvent& event)
+void MyFrame::OnCreateText(wxCommandEvent& WXUNUSED(event))

 {
     m_mgr.AddPane(CreateTextCtrl(), wxPaneInfo().
                   Name(wxT("Test")).Caption(wxT("Text Control")).
 {
     m_mgr.AddPane(CreateTextCtrl(), wxPaneInfo().
                   Name(wxT("Test")).Caption(wxT("Text Control")).


@@ -1042,7 +1060,7 @@ void MyFrame::OnCreateText(wxCommandEvent& event)
     m_mgr.Update();
 }
 
     m_mgr.Update();
 }
 

-void MyFrame::OnCreateSizeReport(wxCommandEvent& event)
+void MyFrame::OnCreateSizeReport(wxCommandEvent& WXUNUSED(event))

 {
     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
                   Name(wxT("Test")).Caption(wxT("Client Size Reporter")).
 {
     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
                   Name(wxT("Test")).Caption(wxT("Client Size Reporter")).


@@ -1070,14 +1088,17 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
     wxMessageBox(_("wxAUI Demo\nAn advanced window management library for wxWidgets\n(c) Copyright 2005-2006, Kirix Corporation"), _("About wxAUI Demo"), wxOK, this);
 }
 
     wxMessageBox(_("wxAUI Demo\nAn advanced window management library for wxWidgets\n(c) Copyright 2005-2006, Kirix Corporation"), _("About wxAUI Demo"), wxOK, this);
 }
 

-wxTextCtrl* MyFrame::CreateTextCtrl()
+wxTextCtrl* MyFrame::CreateTextCtrl(const wxString& ctrl_text)

 {
 {

-    wxString text;

     static int n = 0;
 
     static int n = 0;
 

-    text.Printf(wxT("This is text box %d"), ++n);
+    wxString text;
+    if (ctrl_text.Length() > 0)
+        text = ctrl_text;
+         else
+        text.Printf(wxT("This is text box %d"), ++n);

 
 

-    return new wxTextCtrl(this,-1, text,
+    return new wxTextCtrl(this,wxID_ANY, text,

                           wxPoint(0,0), wxSize(150,90),
                           wxNO_BORDER | wxTE_MULTILINE);
 }
                           wxPoint(0,0), wxSize(150,90),
                           wxNO_BORDER | wxTE_MULTILINE);
 }


@@ -1085,7 +1106,7 @@ wxTextCtrl* MyFrame::CreateTextCtrl()
 
 wxGrid* MyFrame::CreateGrid()
 {
 
 wxGrid* MyFrame::CreateGrid()
 {

-    wxGrid* grid = new wxGrid(this, -1,
+    wxGrid* grid = new wxGrid(this, wxID_ANY,

                               wxPoint(0,0),
                               wxSize(150,250),
                               wxNO_BORDER | wxWANTS_CHARS);
                               wxPoint(0,0),
                               wxSize(150,250),
                               wxNO_BORDER | wxWANTS_CHARS);


@@ -1095,10 +1116,10 @@ wxGrid* MyFrame::CreateGrid()
 
 wxTreeCtrl* MyFrame::CreateTreeCtrl()
 {
 
 wxTreeCtrl* MyFrame::CreateTreeCtrl()
 {

-    wxTreeCtrl* tree = new wxTreeCtrl(this, -1,
+    wxTreeCtrl* tree = new wxTreeCtrl(this, wxID_ANY,

                                       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;
 
     wxTreeItemId root = tree->AddRoot(wxT("wxAUI Project"));
     wxArrayTreeItemIds items;
 


@@ -1114,7 +1135,7 @@ wxTreeCtrl* MyFrame::CreateTreeCtrl()
     items.Add(tree->AppendItem(root, wxT("Item 4"), 0));
     items.Add(tree->AppendItem(root, wxT("Item 5"), 0));
 
     items.Add(tree->AppendItem(root, wxT("Item 4"), 0));
     items.Add(tree->AppendItem(root, wxT("Item 5"), 0));
 

-    
+

     int i, count;
     for (i = 0, count = items.Count(); i < count; ++i)
     {
     int i, count;
     for (i = 0, count = items.Count(); i < count; ++i)
     {


@@ -1134,7 +1155,7 @@ wxTreeCtrl* MyFrame::CreateTreeCtrl()
 
 wxSizeReportCtrl* MyFrame::CreateSizeReportCtrl(int width, int height)
 {
 
 wxSizeReportCtrl* MyFrame::CreateSizeReportCtrl(int width, int height)
 {

-    wxSizeReportCtrl* ctrl = new wxSizeReportCtrl(this, -1,
+    wxSizeReportCtrl* ctrl = new wxSizeReportCtrl(this, wxID_ANY,

                                    wxDefaultPosition,
                                    wxSize(width, height), &m_mgr);
     return ctrl;
                                    wxDefaultPosition,
                                    wxSize(width, height), &m_mgr);
     return ctrl;


@@ -1142,7 +1163,7 @@ wxSizeReportCtrl* MyFrame::CreateSizeReportCtrl(int width, int height)
 
 wxHtmlWindow* MyFrame::CreateHTMLCtrl()
 {
 
 wxHtmlWindow* MyFrame::CreateHTMLCtrl()
 {

-    wxHtmlWindow* ctrl = new wxHtmlWindow(this, -1,
+    wxHtmlWindow* ctrl = new wxHtmlWindow(this, wxID_ANY,

                                    wxDefaultPosition,
                                    wxSize(400,300));
     ctrl->SetPage(GetIntroText());
                                    wxDefaultPosition,
                                    wxSize(400,300));
     ctrl->SetPage(GetIntroText());