don't leave gaps around hidden columns/rows in wxFlexGridSizer (closes bug 1659872...

[wxWidgets.git] / src / aui / framemanager.cpp

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 856892f2b3a17a3129fdf3d2081c50f83b34cfda..ea05d8bbd7adec74f0ecc33fd7fdcc0ac8366f38 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -45,18 +45,19 @@ WX_CHECK_BUILD_OPTIONS("wxAUI")
 #include "wx/arrimpl.cpp"
 WX_DECLARE_OBJARRAY(wxRect, wxAuiRectArray);
 WX_DEFINE_OBJARRAY(wxAuiRectArray)
 #include "wx/arrimpl.cpp"
 WX_DECLARE_OBJARRAY(wxRect, wxAuiRectArray);
 WX_DEFINE_OBJARRAY(wxAuiRectArray)

-WX_DEFINE_OBJARRAY(wxDockUIPartArray)
-WX_DEFINE_OBJARRAY(wxDockInfoArray)
-WX_DEFINE_OBJARRAY(wxPaneButtonArray)
-WX_DEFINE_OBJARRAY(wxPaneInfoArray)
-
-wxPaneInfo wxNullPaneInfo;
-wxDockInfo wxNullDockInfo;
-DEFINE_EVENT_TYPE(wxEVT_AUI_PANEBUTTON)
-DEFINE_EVENT_TYPE(wxEVT_AUI_PANECLOSE)
-DEFINE_EVENT_TYPE(wxEVT_AUI_PANEMAXIMIZE)
-DEFINE_EVENT_TYPE(wxEVT_AUI_PANERESTORE)
+WX_DEFINE_OBJARRAY(wxAuiDockUIPartArray)
+WX_DEFINE_OBJARRAY(wxAuiDockInfoArray)
+WX_DEFINE_OBJARRAY(wxAuiPaneButtonArray)
+WX_DEFINE_OBJARRAY(wxAuiPaneInfoArray)
+
+wxAuiPaneInfo wxAuiNullPaneInfo;
+wxAuiDockInfo wxAuiNullDockInfo;
+DEFINE_EVENT_TYPE(wxEVT_AUI_PANE_BUTTON)
+DEFINE_EVENT_TYPE(wxEVT_AUI_PANE_CLOSE)
+DEFINE_EVENT_TYPE(wxEVT_AUI_PANE_MAXIMIZE)
+DEFINE_EVENT_TYPE(wxEVT_AUI_PANE_RESTORE)

 DEFINE_EVENT_TYPE(wxEVT_AUI_RENDER)
 DEFINE_EVENT_TYPE(wxEVT_AUI_RENDER)

+DEFINE_EVENT_TYPE(wxEVT_AUI_FIND_MANAGER)

 
 #ifdef __WXMAC__
     // a few defines to avoid nameclashes
 
 #ifdef __WXMAC__
     // a few defines to avoid nameclashes


@@ -65,7 +66,13 @@ DEFINE_EVENT_TYPE(wxEVT_AUI_RENDER)
     #include "wx/mac/private.h"
 #endif
 
     #include "wx/mac/private.h"
 #endif
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrameManagerEvent, wxEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxAuiManagerEvent, wxEvent)
+IMPLEMENT_CLASS(wxAuiManager, wxEvtHandler)
+
+
+
+const int auiToolBarLayer = 10;
+

 
 class wxPseudoTransparentFrame : public wxFrame
 {
 
 class wxPseudoTransparentFrame : public wxFrame
 {


@@ -224,21 +231,21 @@ static void DrawResizeHint(wxDC& dc, const wxRect& rect)
 
 
 // CopyDocksAndPanes() - this utility function creates copies of
 
 
 // CopyDocksAndPanes() - this utility function creates copies of

-// the dock and pane info.  wxDockInfo's usually contain pointers
-// to wxPaneInfo classes, thus this function is necessary to reliably
+// the dock and pane info.  wxAuiDockInfo's usually contain pointers
+// to wxAuiPaneInfo classes, thus this function is necessary to reliably

 // reconstruct that relationship in the new dock info and pane info arrays
 
 // reconstruct that relationship in the new dock info and pane info arrays
 

-static void CopyDocksAndPanes(wxDockInfoArray& dest_docks,
-                              wxPaneInfoArray& dest_panes,
-                              const wxDockInfoArray& src_docks,
-                              const wxPaneInfoArray& src_panes)
+static void CopyDocksAndPanes(wxAuiDockInfoArray& dest_docks,
+                              wxAuiPaneInfoArray& dest_panes,
+                              const wxAuiDockInfoArray& src_docks,
+                              const wxAuiPaneInfoArray& src_panes)

 {
     dest_docks = src_docks;
     dest_panes = src_panes;
     int i, j, k, dock_count, pc1, pc2;
     for (i = 0, dock_count = dest_docks.GetCount(); i < dock_count; ++i)
     {
 {
     dest_docks = src_docks;
     dest_panes = src_panes;
     int i, j, k, dock_count, pc1, pc2;
     for (i = 0, dock_count = dest_docks.GetCount(); i < dock_count; ++i)
     {

-        wxDockInfo& dock = dest_docks.Item(i);
+        wxAuiDockInfo& dock = dest_docks.Item(i);

         for (j = 0, pc1 = dock.panes.GetCount(); j < pc1; ++j)
             for (k = 0, pc2 = src_panes.GetCount(); k < pc2; ++k)
                 if (dock.panes.Item(j) == &src_panes.Item(k))
         for (j = 0, pc1 = dock.panes.GetCount(); j < pc1; ++j)
             for (k = 0, pc2 = src_panes.GetCount(); k < pc2; ++k)
                 if (dock.panes.Item(j) == &src_panes.Item(k))


@@ -248,12 +255,13 @@ static void CopyDocksAndPanes(wxDockInfoArray& dest_docks,
 
 // GetMaxLayer() is an internal function which returns
 // the highest layer inside the specified dock
 
 // GetMaxLayer() is an internal function which returns
 // the highest layer inside the specified dock

-static int GetMaxLayer(const wxDockInfoArray& docks, int dock_direction)
+static int GetMaxLayer(const wxAuiDockInfoArray& docks,
+                       int dock_direction)

 {
     int i, dock_count, max_layer = 0;
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
     {
 {
     int i, dock_count, max_layer = 0;
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
     {

-        wxDockInfo& dock = docks.Item(i);
+        wxAuiDockInfo& dock = docks.Item(i);

         if (dock.dock_direction == dock_direction &&
             dock.dock_layer > max_layer && !dock.fixed)
                 max_layer = dock.dock_layer;
         if (dock.dock_direction == dock_direction &&
             dock.dock_layer > max_layer && !dock.fixed)
                 max_layer = dock.dock_layer;


@@ -264,12 +272,12 @@ static int GetMaxLayer(const wxDockInfoArray& docks, int dock_direction)
 
 // GetMaxRow() is an internal function which returns
 // the highest layer inside the specified dock
 
 // GetMaxRow() is an internal function which returns
 // the highest layer inside the specified dock

-static int GetMaxRow(const wxPaneInfoArray& panes, int direction, int layer)
+static int GetMaxRow(const wxAuiPaneInfoArray& panes, int direction, int layer)

 {
     int i, pane_count, max_row = 0;
     for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
     {
 {
     int i, pane_count, max_row = 0;
     for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
     {

-        wxPaneInfo& pane = panes.Item(i);
+        wxAuiPaneInfo& pane = panes.Item(i);

         if (pane.dock_direction == direction &&
             pane.dock_layer == layer &&
             pane.dock_row > max_row)
         if (pane.dock_direction == direction &&
             pane.dock_layer == layer &&
             pane.dock_row > max_row)


@@ -282,14 +290,14 @@ static int GetMaxRow(const wxPaneInfoArray& panes, int direction, int layer)
 
 // DoInsertDockLayer() is an internal function that inserts a new dock
 // layer by incrementing all existing dock layer values by one
 
 // DoInsertDockLayer() is an internal function that inserts a new dock
 // layer by incrementing all existing dock layer values by one

-static void DoInsertDockLayer(wxPaneInfoArray& panes,
+static void DoInsertDockLayer(wxAuiPaneInfoArray& panes,

                               int dock_direction,
                               int dock_layer)
 {
     int i, pane_count;
     for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
     {
                               int dock_direction,
                               int dock_layer)
 {
     int i, pane_count;
     for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
     {

-        wxPaneInfo& pane = panes.Item(i);
+        wxAuiPaneInfo& pane = panes.Item(i);

         if (!pane.IsFloating() &&
             pane.dock_direction == dock_direction &&
             pane.dock_layer >= dock_layer)
         if (!pane.IsFloating() &&
             pane.dock_direction == dock_direction &&
             pane.dock_layer >= dock_layer)


@@ -299,7 +307,7 @@ static void DoInsertDockLayer(wxPaneInfoArray& panes,
 
 // DoInsertDockLayer() is an internal function that inserts a new dock
 // row by incrementing all existing dock row values by one
 
 // DoInsertDockLayer() is an internal function that inserts a new dock
 // row by incrementing all existing dock row values by one

-static void DoInsertDockRow(wxPaneInfoArray& panes,
+static void DoInsertDockRow(wxAuiPaneInfoArray& panes,

                             int dock_direction,
                             int dock_layer,
                             int dock_row)
                             int dock_direction,
                             int dock_layer,
                             int dock_row)


@@ -307,7 +315,7 @@ static void DoInsertDockRow(wxPaneInfoArray& panes,
     int i, pane_count;
     for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
     {
     int i, pane_count;
     for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
     {

-        wxPaneInfo& pane = panes.Item(i);
+        wxAuiPaneInfo& pane = panes.Item(i);

         if (!pane.IsFloating() &&
             pane.dock_direction == dock_direction &&
             pane.dock_layer == dock_layer &&
         if (!pane.IsFloating() &&
             pane.dock_direction == dock_direction &&
             pane.dock_layer == dock_layer &&


@@ -318,7 +326,7 @@ static void DoInsertDockRow(wxPaneInfoArray& panes,
 
 // DoInsertDockLayer() is an internal function that inserts a space for
 // another dock pane by incrementing all existing dock row values by one
 
 // DoInsertDockLayer() is an internal function that inserts a space for
 // another dock pane by incrementing all existing dock row values by one

-static void DoInsertPane(wxPaneInfoArray& panes,
+static void DoInsertPane(wxAuiPaneInfoArray& panes,

                          int dock_direction,
                          int dock_layer,
                          int dock_row,
                          int dock_direction,
                          int dock_layer,
                          int dock_row,


@@ -327,7 +335,7 @@ static void DoInsertPane(wxPaneInfoArray& panes,
     int i, pane_count;
     for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
     {
     int i, pane_count;
     for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
     {

-        wxPaneInfo& pane = panes.Item(i);
+        wxAuiPaneInfo& pane = panes.Item(i);

         if (!pane.IsFloating() &&
             pane.dock_direction == dock_direction &&
             pane.dock_layer == dock_layer &&
         if (!pane.IsFloating() &&
             pane.dock_direction == dock_direction &&
             pane.dock_layer == dock_layer &&


@@ -340,11 +348,11 @@ static void DoInsertPane(wxPaneInfoArray& panes,
 // FindDocks() is an internal function that returns a list of docks which meet
 // the specified conditions in the parameters and returns a sorted array
 // (sorted by layer and then row)
 // FindDocks() is an internal function that returns a list of docks which meet
 // the specified conditions in the parameters and returns a sorted array
 // (sorted by layer and then row)

-static void FindDocks(wxDockInfoArray& docks,
+static void FindDocks(wxAuiDockInfoArray& docks,

                       int dock_direction,
                       int dock_layer,
                       int dock_row,
                       int dock_direction,
                       int dock_layer,
                       int dock_row,

-                      wxDockInfoPtrArray& arr)
+                      wxAuiDockInfoPtrArray& arr)

 {
     int begin_layer = dock_layer;
     int end_layer = dock_layer;
 {
     int begin_layer = dock_layer;
     int end_layer = dock_layer;


@@ -380,7 +388,7 @@ static void FindDocks(wxDockInfoArray& docks,
         for (row = begin_row; row <= end_row; ++row)
             for (i = 0; i < dock_count; ++i)
             {
         for (row = begin_row; row <= end_row; ++row)
             for (i = 0; i < dock_count; ++i)
             {

-                wxDockInfo& d = docks.Item(i);
+                wxAuiDockInfo& d = docks.Item(i);

                 if (dock_direction == -1 || dock_direction == d.dock_direction)
                 {
                     if (d.dock_layer == layer && d.dock_row == row)
                 if (dock_direction == -1 || dock_direction == d.dock_direction)
                 {
                     if (d.dock_layer == layer && d.dock_row == row)


@@ -390,13 +398,13 @@ static void FindDocks(wxDockInfoArray& docks,
 }
 
 // FindPaneInDock() looks up a specified window pointer inside a dock.
 }
 
 // FindPaneInDock() looks up a specified window pointer inside a dock.

-// If found, the corresponding wxPaneInfo pointer is returned, otherwise NULL.
-static wxPaneInfo* FindPaneInDock(const wxDockInfo& dock, wxWindow* window)
+// If found, the corresponding wxAuiPaneInfo pointer is returned, otherwise NULL.
+static wxAuiPaneInfo* FindPaneInDock(const wxAuiDockInfo& dock, wxWindow* window)

 {
     int i, count = dock.panes.GetCount();
     for (i = 0; i < count; ++i)
     {
 {
     int i, count = dock.panes.GetCount();
     for (i = 0; i < count; ++i)
     {

-        wxPaneInfo* p = dock.panes.Item(i);
+        wxAuiPaneInfo* p = dock.panes.Item(i);

         if (p->window == window)
             return p;
     }
         if (p->window == window)
             return p;
     }


@@ -405,17 +413,17 @@ static wxPaneInfo* FindPaneInDock(const wxDockInfo& dock, wxWindow* window)
 
 // RemovePaneFromDocks() removes a pane window from all docks
 // with a possible exception specified by parameter "ex_cept"
 
 // RemovePaneFromDocks() removes a pane window from all docks
 // with a possible exception specified by parameter "ex_cept"

-static void RemovePaneFromDocks(wxDockInfoArray& docks,
-                                wxPaneInfo& pane,
-                                wxDockInfo* ex_cept  = NULL  )
+static void RemovePaneFromDocks(wxAuiDockInfoArray& docks,
+                                wxAuiPaneInfo& pane,
+                                wxAuiDockInfo* ex_cept  = NULL  )

 {
     int i, dock_count;
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
     {
 {
     int i, dock_count;
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
     {

-        wxDockInfo& d = docks.Item(i);
+        wxAuiDockInfo& d = docks.Item(i);

         if (&d == ex_cept)
             continue;
         if (&d == ex_cept)
             continue;

-        wxPaneInfo* pi = FindPaneInDock(d, pane.window);
+        wxAuiPaneInfo* pi = FindPaneInDock(d, pane.window);

         if (pi)
             d.panes.Remove(pi);
     }
         if (pi)
             d.panes.Remove(pi);
     }


@@ -424,12 +432,12 @@ static void RemovePaneFromDocks(wxDockInfoArray& docks,
 // RenumberDockRows() takes a dock and assigns sequential numbers
 // to existing rows.  Basically it takes out the gaps; so if a
 // dock has rows with numbers 0,2,5, they will become 0,1,2
 // RenumberDockRows() takes a dock and assigns sequential numbers
 // to existing rows.  Basically it takes out the gaps; so if a
 // dock has rows with numbers 0,2,5, they will become 0,1,2

-static void RenumberDockRows(wxDockInfoPtrArray& docks)
+static void RenumberDockRows(wxAuiDockInfoPtrArray& docks)

 {
     int i, dock_count, j, pane_count;
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
     {
 {
     int i, dock_count, j, pane_count;
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
     {

-        wxDockInfo& dock = *docks.Item(i);
+        wxAuiDockInfo& dock = *docks.Item(i);

         dock.dock_row = i;
         for (j = 0, pane_count = dock.panes.GetCount(); j < pane_count; ++j)
             dock.panes.Item(j)->dock_row = i;
         dock.dock_row = i;
         for (j = 0, pane_count = dock.panes.GetCount(); j < pane_count; ++j)
             dock.panes.Item(j)->dock_row = i;


@@ -440,56 +448,60 @@ static void RenumberDockRows(wxDockInfoPtrArray& docks)
 // SetActivePane() sets the active pane, as well as cycles through
 // every other pane and makes sure that all others' active flags
 // are turned off
 // SetActivePane() sets the active pane, as well as cycles through
 // every other pane and makes sure that all others' active flags
 // are turned off

-static void SetActivePane(wxPaneInfoArray& panes, wxWindow* active_pane)
+static void SetActivePane(wxAuiPaneInfoArray& panes, wxWindow* active_pane)

 {
     int i, pane_count;
     for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
     {
 {
     int i, pane_count;
     for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
     {

-        wxPaneInfo& pane = panes.Item(i);
-        pane.state &= ~wxPaneInfo::optionActive;
+        wxAuiPaneInfo& pane = panes.Item(i);
+        pane.state &= ~wxAuiPaneInfo::optionActive;

         if (pane.window == active_pane)
         if (pane.window == active_pane)

-            pane.state |= wxPaneInfo::optionActive;
+            pane.state |= wxAuiPaneInfo::optionActive;

     }
 }
 
 
 // this function is used to sort panes by dock position
     }
 }
 
 
 // this function is used to sort panes by dock position

-static int PaneSortFunc(wxPaneInfo** p1, wxPaneInfo** p2)
+static int PaneSortFunc(wxAuiPaneInfo** p1, wxAuiPaneInfo** p2)

 {
     return ((*p1)->dock_pos < (*p2)->dock_pos) ? -1 : 1;
 }
 
 
 {
     return ((*p1)->dock_pos < (*p2)->dock_pos) ? -1 : 1;
 }
 
 

-// -- wxFrameManager class implementation --
+// -- wxAuiManager class implementation --

 
 
 
 

-BEGIN_EVENT_TABLE(wxFrameManager, wxEvtHandler)
-    EVT_AUI_PANEBUTTON(wxFrameManager::OnPaneButton)
-    EVT_AUI_RENDER(wxFrameManager::OnRender)
-    EVT_PAINT(wxFrameManager::OnPaint)
-    EVT_ERASE_BACKGROUND(wxFrameManager::OnEraseBackground)
-    EVT_SIZE(wxFrameManager::OnSize)
-    EVT_SET_CURSOR(wxFrameManager::OnSetCursor)
-    EVT_LEFT_DOWN(wxFrameManager::OnLeftDown)
-    EVT_LEFT_UP(wxFrameManager::OnLeftUp)
-    EVT_MOTION(wxFrameManager::OnMotion)
-    EVT_LEAVE_WINDOW(wxFrameManager::OnLeaveWindow)
-    EVT_CHILD_FOCUS(wxFrameManager::OnChildFocus)
-    EVT_TIMER(101, wxFrameManager::OnHintFadeTimer)
+BEGIN_EVENT_TABLE(wxAuiManager, wxEvtHandler)
+    EVT_AUI_PANE_BUTTON(wxAuiManager::OnPaneButton)
+    EVT_AUI_RENDER(wxAuiManager::OnRender)
+    EVT_PAINT(wxAuiManager::OnPaint)
+    EVT_ERASE_BACKGROUND(wxAuiManager::OnEraseBackground)
+    EVT_SIZE(wxAuiManager::OnSize)
+    EVT_SET_CURSOR(wxAuiManager::OnSetCursor)
+    EVT_LEFT_DOWN(wxAuiManager::OnLeftDown)
+    EVT_LEFT_UP(wxAuiManager::OnLeftUp)
+    EVT_MOTION(wxAuiManager::OnMotion)
+    EVT_LEAVE_WINDOW(wxAuiManager::OnLeaveWindow)
+    EVT_CHILD_FOCUS(wxAuiManager::OnChildFocus)
+    EVT_AUI_FIND_MANAGER(wxAuiManager::OnFindManager)
+    EVT_TIMER(101, wxAuiManager::OnHintFadeTimer)

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

-wxFrameManager::wxFrameManager(wxWindow* managed_wnd, unsigned int flags)
+wxAuiManager::wxAuiManager(wxWindow* managed_wnd, unsigned int flags)

 {
     m_action = actionNone;
     m_last_mouse_move = wxPoint();
     m_hover_button = NULL;
 {
     m_action = actionNone;
     m_last_mouse_move = wxPoint();
     m_hover_button = NULL;

-    m_art = new wxDefaultDockArt;
+    m_art = new wxAuiDefaultDockArt;

     m_hint_wnd = NULL;
     m_flags = flags;
     m_skipping = false;
     m_has_maximized = false;
     m_frame = NULL;
     m_hint_wnd = NULL;
     m_flags = flags;
     m_skipping = false;
     m_has_maximized = false;
     m_frame = NULL;

+    m_dock_constraint_x = 0.3;
+    m_dock_constraint_y = 0.3;
+    m_reserved = NULL;

     
     if (managed_wnd)
     {
     
     if (managed_wnd)
     {


@@ -497,54 +509,55 @@ wxFrameManager::wxFrameManager(wxWindow* managed_wnd, unsigned int flags)
     }
 }
 
     }
 }
 

-wxFrameManager::~wxFrameManager()
+wxAuiManager::~wxAuiManager()

 {
     delete m_art;
 }
 
 {
     delete m_art;
 }
 

-// Creates a floating frame for the windows
-wxFloatingPane * wxFrameManager::CreateFloatingFrame(wxWindow* parent, const wxPaneInfo& p)
+// creates a floating frame for the windows
+wxAuiFloatingFrame* wxAuiManager::CreateFloatingFrame(wxWindow* parent,
+                                                      const wxAuiPaneInfo& pane_info)

 {
 {

-    return new wxFloatingPane(parent, this, p);
+    return new wxAuiFloatingFrame(parent, this, pane_info);

 }
 
 }
 

-// GetPane() looks up a wxPaneInfo structure based
+// GetPane() looks up a wxAuiPaneInfo structure based

 // on the supplied window pointer.  Upon failure, GetPane()
 // on the supplied window pointer.  Upon failure, GetPane()

-// returns an empty wxPaneInfo, a condition which can be checked
-// by calling wxPaneInfo::IsOk().
+// returns an empty wxAuiPaneInfo, a condition which can be checked
+// by calling wxAuiPaneInfo::IsOk().

 //
 // The pane info's structure may then be modified.  Once a pane's
 //
 // The pane info's structure may then be modified.  Once a pane's

-// info is modified, wxFrameManager::Update() must be called to
+// info is modified, wxAuiManager::Update() must be called to

 // realize the changes in the UI.
 
 // realize the changes in the UI.
 

-wxPaneInfo& wxFrameManager::GetPane(wxWindow* window)
+wxAuiPaneInfo& wxAuiManager::GetPane(wxWindow* window)

 {
     int i, pane_count;
     for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
     {
 {
     int i, pane_count;
     for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
     {

-        wxPaneInfo& p = m_panes.Item(i);
+        wxAuiPaneInfo& p = m_panes.Item(i);

         if (p.window == window)
             return p;
     }
         if (p.window == window)
             return p;
     }

-    return wxNullPaneInfo;
+    return wxAuiNullPaneInfo;

 }
 
 // this version of GetPane() looks up a pane based on a
 // 'pane name', see above comment for more info
 }
 
 // this version of GetPane() looks up a pane based on a
 // 'pane name', see above comment for more info

-wxPaneInfo& wxFrameManager::GetPane(const wxString& name)
+wxAuiPaneInfo& wxAuiManager::GetPane(const wxString& name)

 {
     int i, pane_count;
     for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
     {
 {
     int i, pane_count;
     for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
     {

-        wxPaneInfo& p = m_panes.Item(i);
+        wxAuiPaneInfo& p = m_panes.Item(i);

         if (p.name == name)
             return p;
     }
         if (p.name == name)
             return p;
     }

-    return wxNullPaneInfo;
+    return wxAuiNullPaneInfo;

 }
 
 // GetAllPanes() returns a reference to all the pane info structures
 }
 
 // GetAllPanes() returns a reference to all the pane info structures

-wxPaneInfoArray& wxFrameManager::GetAllPanes()
+wxAuiPaneInfoArray& wxAuiManager::GetAllPanes()

 {
     return m_panes;
 }
 {
     return m_panes;
 }


@@ -552,27 +565,27 @@ wxPaneInfoArray& wxFrameManager::GetAllPanes()
 // HitTest() is an internal function which determines
 // which UI item the specified coordinates are over
 // (x,y) specify a position in client coordinates
 // HitTest() is an internal function which determines
 // which UI item the specified coordinates are over
 // (x,y) specify a position in client coordinates

-wxDockUIPart* wxFrameManager::HitTest(int x, int y)
+wxAuiDockUIPart* wxAuiManager::HitTest(int x, int y)

 {
 {

-    wxDockUIPart* result = NULL;
+    wxAuiDockUIPart* result = NULL;

 
     int i, part_count;
     for (i = 0, part_count = m_uiparts.GetCount(); i < part_count; ++i)
     {
 
     int i, part_count;
     for (i = 0, part_count = m_uiparts.GetCount(); i < part_count; ++i)
     {

-        wxDockUIPart* item = &m_uiparts.Item(i);
+        wxAuiDockUIPart* item = &m_uiparts.Item(i);

 
         // we are not interested in typeDock, because this space
         // isn't used to draw anything, just for measurements;
         // besides, the entire dock area is covered with other
         // rectangles, which we are interested in.
 
         // we are not interested in typeDock, because this space
         // isn't used to draw anything, just for measurements;
         // besides, the entire dock area is covered with other
         // rectangles, which we are interested in.

-        if (item->type == wxDockUIPart::typeDock)
+        if (item->type == wxAuiDockUIPart::typeDock)

             continue;
 
         // if we already have a hit on a more specific item, we are not
         // interested in a pane hit.  If, however, we don't already have
         // a hit, returning a pane hit is necessary for some operations
             continue;
 
         // if we already have a hit on a more specific item, we are not
         // interested in a pane hit.  If, however, we don't already have
         // a hit, returning a pane hit is necessary for some operations

-        if ((item->type == wxDockUIPart::typePane ||
-            item->type == wxDockUIPart::typePaneBorder) && result)
+        if ((item->type == wxAuiDockUIPart::typePane ||
+            item->type == wxAuiDockUIPart::typePaneBorder) && result)

             continue;
 
         // if the point is inside the rectangle, we have a hit
             continue;
 
         // if the point is inside the rectangle, we have a hit


@@ -585,8 +598,8 @@ wxDockUIPart* wxFrameManager::HitTest(int x, int y)
 
 
 // SetFlags() and GetFlags() allow the owner to set various
 
 
 // SetFlags() and GetFlags() allow the owner to set various

-// options which are global to wxFrameManager
-void wxFrameManager::SetFlags(unsigned int flags)
+// options which are global to wxAuiManager
+void wxAuiManager::SetFlags(unsigned int flags)

 {
     // find out if we have to call UpdateHintWindowConfig()
     bool update_hint_wnd = false;
 {
     // find out if we have to call UpdateHintWindowConfig()
     bool update_hint_wnd = false;


@@ -606,7 +619,7 @@ void wxFrameManager::SetFlags(unsigned int flags)
     }
 }
 
     }
 }
 

-unsigned int wxFrameManager::GetFlags() const
+unsigned int wxAuiManager::GetFlags() const

 {
     return m_flags;
 }
 {
     return m_flags;
 }


@@ -614,18 +627,35 @@ unsigned int wxFrameManager::GetFlags() const
 
 // don't use these anymore as they are deprecated
 // use Set/GetManagedFrame() instead
 
 // don't use these anymore as they are deprecated
 // use Set/GetManagedFrame() instead

-void wxFrameManager::SetFrame(wxFrame* frame)
+void wxAuiManager::SetFrame(wxFrame* frame)

 {
     SetManagedWindow((wxWindow*)frame);
 }
 
 {
     SetManagedWindow((wxWindow*)frame);
 }
 

-wxFrame* wxFrameManager::GetFrame() const
+wxFrame* wxAuiManager::GetFrame() const

 {
     return (wxFrame*)m_frame;
 }
 
 
 {
     return (wxFrame*)m_frame;
 }
 
 

-void wxFrameManager::UpdateHintWindowConfig()
+// this function will return the aui manager for a given
+// window.  The |window| parameter should be any child window
+// or grand-child window (and so on) of the frame/window
+// managed by wxAuiManager.  The |window| parameter does not
+// need to be managed by the manager itself.
+wxAuiManager* wxAuiManager::GetManager(wxWindow* window)
+{
+    wxAuiManagerEvent evt(wxEVT_AUI_FIND_MANAGER);
+    evt.SetManager(NULL);
+    evt.ResumePropagation(wxEVENT_PROPAGATE_MAX);
+    if (!window->ProcessEvent(evt))
+        return NULL;
+        
+    return evt.GetManager();
+}
+
+
+void wxAuiManager::UpdateHintWindowConfig()

 {
     // find out if the the system can do transparent frames
     bool can_do_transparent = false;
 {
     // find out if the the system can do transparent frames
     bool can_do_transparent = false;


@@ -636,9 +666,7 @@ void wxFrameManager::UpdateHintWindowConfig()
         if (w->IsKindOf(CLASSINFO(wxFrame)))
         {
             wxFrame* f = static_cast<wxFrame*>(w);
         if (w->IsKindOf(CLASSINFO(wxFrame)))
         {
             wxFrame* f = static_cast<wxFrame*>(w);

-            #if wxCHECK_VERSION(2,7,0)

             can_do_transparent = f->CanSetTransparent();
             can_do_transparent = f->CanSetTransparent();

-            #endif

             break;
         }
         
             break;
         }
         


@@ -711,7 +739,7 @@ void wxFrameManager::UpdateHintWindowConfig()
 // SetManagedWindow() is usually called once when the frame
 // manager class is being initialized.  "frame" specifies
 // the frame which should be managed by the frame mananger
 // SetManagedWindow() is usually called once when the frame
 // manager class is being initialized.  "frame" specifies
 // the frame which should be managed by the frame mananger

-void wxFrameManager::SetManagedWindow(wxWindow* wnd)
+void wxAuiManager::SetManagedWindow(wxWindow* wnd)

 {
     wxASSERT_MSG(wnd, wxT("specified window must be non-NULL"));
 
 {
     wxASSERT_MSG(wnd, wxT("specified window must be non-NULL"));
 


@@ -731,7 +759,7 @@ void wxFrameManager::SetManagedWindow(wxWindow* wnd)
         wxASSERT_MSG(client_window, wxT("Client window is NULL!"));
 
         AddPane(client_window,
         wxASSERT_MSG(client_window, wxT("Client window is NULL!"));
 
         AddPane(client_window,

-                wxPaneInfo().Name(wxT("mdiclient")).
+                wxAuiPaneInfo().Name(wxT("mdiclient")).

                 CenterPane().PaneBorder(false));
     }
 #endif
                 CenterPane().PaneBorder(false));
     }
 #endif


@@ -743,7 +771,7 @@ void wxFrameManager::SetManagedWindow(wxWindow* wnd)
 // UnInit() must be called, usually in the destructor
 // of the frame class.   If it is not called, usually this
 // will result in a crash upon program exit
 // UnInit() must be called, usually in the destructor
 // of the frame class.   If it is not called, usually this
 // will result in a crash upon program exit

-void wxFrameManager::UnInit()
+void wxAuiManager::UnInit()

 {
     if (m_frame)
     {
 {
     if (m_frame)
     {


@@ -752,17 +780,17 @@ void wxFrameManager::UnInit()
 }
 
 // GetManagedWindow() returns the window pointer being managed
 }
 
 // GetManagedWindow() returns the window pointer being managed

-wxWindow* wxFrameManager::GetManagedWindow() const
+wxWindow* wxAuiManager::GetManagedWindow() const

 {
     return m_frame;
 }
 
 {
     return m_frame;
 }
 

-wxDockArt* wxFrameManager::GetArtProvider() const
+wxAuiDockArt* wxAuiManager::GetArtProvider() const

 {
     return m_art;
 }
 
 {
     return m_art;
 }
 

-void wxFrameManager::ProcessMgrEvent(wxFrameManagerEvent& event)
+void wxAuiManager::ProcessMgrEvent(wxAuiManagerEvent& event)

 {
     // first, give the owner frame a chance to override
     if (m_frame)
 {
     // first, give the owner frame a chance to override
     if (m_frame)


@@ -774,12 +802,12 @@ void wxFrameManager::ProcessMgrEvent(wxFrameManagerEvent& event)
     ProcessEvent(event);
 }
 
     ProcessEvent(event);
 }
 

-// SetArtProvider() instructs wxFrameManager to use the
+// SetArtProvider() instructs wxAuiManager to use the

 // specified art provider for all drawing calls.  This allows
 // plugable look-and-feel features.  The pointer that is
 // specified art provider for all drawing calls.  This allows
 // plugable look-and-feel features.  The pointer that is

-// passed to this method subsequently belongs to wxFrameManager,
+// passed to this method subsequently belongs to wxAuiManager,

 // and is deleted in the frame manager destructor
 // and is deleted in the frame manager destructor

-void wxFrameManager::SetArtProvider(wxDockArt* art_provider)
+void wxAuiManager::SetArtProvider(wxAuiDockArt* art_provider)

 {
     // delete the last art provider, if any
     delete m_art;
 {
     // delete the last art provider, if any
     delete m_art;


@@ -789,25 +817,39 @@ void wxFrameManager::SetArtProvider(wxDockArt* art_provider)
 }
 
 
 }
 
 

-bool wxFrameManager::AddPane(wxWindow* window, const wxPaneInfo& pane_info)
+bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info)

 {
     // check if the pane has a valid window
     if (!window)
         return false;
 
 {
     // check if the pane has a valid window
     if (!window)
         return false;
 

-    // check if the pane already exists
+    // check if the window is already managed by us

     if (GetPane(pane_info.window).IsOk())
         return false;
 
     if (GetPane(pane_info.window).IsOk())
         return false;
 

+    // check if the pane name already exists, this could reveal a
+    // bug in the library user's application
+    bool already_exists = false;
+    if (!pane_info.name.empty() && GetPane(pane_info.name).IsOk())
+    {
+        wxFAIL_MSG(wxT("A pane with that name already exists in the manager!"));
+        already_exists = true;
+    }
+
+    // if the new pane is docked then we should undo maximize
+    if (pane_info.IsDocked())
+        RestoreMaximizedPane();
+

     m_panes.Add(pane_info);
 
     m_panes.Add(pane_info);
 

-    wxPaneInfo& pinfo = m_panes.Last();
+    wxAuiPaneInfo& pinfo = m_panes.Last();

 
     // set the pane window
     pinfo.window = window;
 
 
     // set the pane window
     pinfo.window = window;
 

+

     // if the pane's name identifier is blank, create a random string
     // if the pane's name identifier is blank, create a random string

-    if (pinfo.name.empty())
+    if (pinfo.name.empty() || already_exists)

     {
         pinfo.name.Printf(wxT("%08lx%08x%08x%08lx"),
              ((unsigned long)pinfo.window) & 0xffffffff,
     {
         pinfo.name.Printf(wxT("%08lx%08x%08x%08lx"),
              ((unsigned long)pinfo.window) & 0xffffffff,


@@ -826,14 +868,21 @@ bool wxFrameManager::AddPane(wxWindow* window, const wxPaneInfo& pane_info)
 
     if (pinfo.HasMaximizeButton())
     {
 
     if (pinfo.HasMaximizeButton())
     {

-        wxPaneButton button;
+        wxAuiPaneButton button;

         button.button_id = wxAUI_BUTTON_MAXIMIZE_RESTORE;
         pinfo.buttons.Add(button);
     }
         button.button_id = wxAUI_BUTTON_MAXIMIZE_RESTORE;
         pinfo.buttons.Add(button);
     }

-
+    
+    if (pinfo.HasPinButton())
+    {
+        wxAuiPaneButton button;
+        button.button_id = wxAUI_BUTTON_PIN;
+        pinfo.buttons.Add(button);
+    }
+    

     if (pinfo.HasCloseButton())
     {
     if (pinfo.HasCloseButton())
     {

-        wxPaneButton button;
+        wxAuiPaneButton button;

         button.button_id = wxAUI_BUTTON_CLOSE;
         pinfo.buttons.Add(button);
     }
         button.button_id = wxAUI_BUTTON_CLOSE;
         pinfo.buttons.Add(button);
     }


@@ -870,11 +919,11 @@ bool wxFrameManager::AddPane(wxWindow* window, const wxPaneInfo& pane_info)
     return true;
 }
 
     return true;
 }
 

-bool wxFrameManager::AddPane(wxWindow* window,
-                             int direction,
-                             const wxString& caption)
+bool wxAuiManager::AddPane(wxWindow* window,
+                           int direction,
+                           const wxString& caption)

 {
 {

-    wxPaneInfo pinfo;
+    wxAuiPaneInfo pinfo;

     pinfo.Caption(caption);
     switch (direction)
     {
     pinfo.Caption(caption);
     switch (direction)
     {


@@ -887,21 +936,21 @@ bool wxFrameManager::AddPane(wxWindow* window,
     return AddPane(window, pinfo);
 }
 
     return AddPane(window, pinfo);
 }
 

-bool wxFrameManager::AddPane(wxWindow* window,
-                             const wxPaneInfo& pane_info,
-                             const wxPoint& drop_pos)
+bool wxAuiManager::AddPane(wxWindow* window,
+                           const wxAuiPaneInfo& pane_info,
+                           const wxPoint& drop_pos)

 {
     if (!AddPane(window, pane_info))
         return false;
 
 {
     if (!AddPane(window, pane_info))
         return false;
 

-    wxPaneInfo& pane = GetPane(window);
+    wxAuiPaneInfo& pane = GetPane(window);

 
     DoDrop(m_docks, m_panes, pane, drop_pos, wxPoint(0,0));
 
     return true;
 }
 
 
     DoDrop(m_docks, m_panes, pane, drop_pos, wxPoint(0,0));
 
     return true;
 }
 

-bool wxFrameManager::InsertPane(wxWindow* window, const wxPaneInfo& pane_info,
+bool wxAuiManager::InsertPane(wxWindow* window, const wxAuiPaneInfo& pane_info,

                                 int insert_level)
 {
     // shift the panes around, depending on the insert level
                                 int insert_level)
 {
     // shift the panes around, depending on the insert level


@@ -929,7 +978,7 @@ bool wxFrameManager::InsertPane(wxWindow* window, const wxPaneInfo& pane_info,
 
     // if the window already exists, we are basically just moving/inserting the
     // existing window.  If it doesn't exist, we need to add it and insert it
 
     // if the window already exists, we are basically just moving/inserting the
     // existing window.  If it doesn't exist, we need to add it and insert it

-    wxPaneInfo& existing_pane = GetPane(window);
+    wxAuiPaneInfo& existing_pane = GetPane(window);

     if (!existing_pane.IsOk())
     {
         return AddPane(window, pane_info);
     if (!existing_pane.IsOk())
     {
         return AddPane(window, pane_info);


@@ -946,6 +995,9 @@ bool wxFrameManager::InsertPane(wxWindow* window, const wxPaneInfo& pane_info,
         }
          else
         {
         }
          else
         {

+            // if the new pane is docked then we should undo maximize
+            RestoreMaximizedPane();
+

             existing_pane.Direction(pane_info.dock_direction);
             existing_pane.Layer(pane_info.dock_layer);
             existing_pane.Row(pane_info.dock_row);
             existing_pane.Direction(pane_info.dock_direction);
             existing_pane.Layer(pane_info.dock_layer);
             existing_pane.Row(pane_info.dock_row);


@@ -959,12 +1011,12 @@ bool wxFrameManager::InsertPane(wxWindow* window, const wxPaneInfo& pane_info,
 
 // DetachPane() removes a pane from the frame manager.  This
 // method will not destroy the window that is removed.
 
 // DetachPane() removes a pane from the frame manager.  This
 // method will not destroy the window that is removed.

-bool wxFrameManager::DetachPane(wxWindow* window)
+bool wxAuiManager::DetachPane(wxWindow* window)

 {
     int i, count;
     for (i = 0, count = m_panes.GetCount(); i < count; ++i)
     {
 {
     int i, count;
     for (i = 0, count = m_panes.GetCount(); i < count; ++i)
     {

-        wxPaneInfo& p = m_panes.Item(i);
+        wxAuiPaneInfo& p = m_panes.Item(i);

         if (p.window == window)
         {
             if (p.frame)
         if (p.window == window)
         {
             if (p.frame)


@@ -979,9 +1031,11 @@ bool wxFrameManager::DetachPane(wxWindow* window)
                     p.frame->Show(false);
 
                 // reparent to m_frame and destroy the pane
                     p.frame->Show(false);
 
                 // reparent to m_frame and destroy the pane

-                if(m_action_window == p.frame) {
+                if (m_action_window == p.frame)
+                {

                     m_action_window = NULL;
                 }
                     m_action_window = NULL;
                 }

+                

                 p.window->Reparent(m_frame);
                 p.frame->SetSizer(NULL);
                 p.frame->Destroy();
                 p.window->Reparent(m_frame);
                 p.frame->SetSizer(NULL);
                 p.frame->Destroy();


@@ -995,7 +1049,7 @@ bool wxFrameManager::DetachPane(wxWindow* window)
             int pi, part_count;
             for (pi = 0, part_count = (int)m_uiparts.GetCount(); pi < part_count; ++pi)
             {
             int pi, part_count;
             for (pi = 0, part_count = (int)m_uiparts.GetCount(); pi < part_count; ++pi)
             {

-                wxDockUIPart& part = m_uiparts.Item(pi);
+                wxAuiDockUIPart& part = m_uiparts.Item(pi);

                 if (part.pane == &p)
                 {
                     m_uiparts.RemoveAt(pi);
                 if (part.pane == &p)
                 {
                     m_uiparts.RemoveAt(pi);


@@ -1014,35 +1068,40 @@ bool wxFrameManager::DetachPane(wxWindow* window)
 
 // ClosePane() destroys or hides the pane depending on its
 // flags
 
 // ClosePane() destroys or hides the pane depending on its
 // flags

-void wxFrameManager::ClosePane(wxPaneInfo& pane_info)
+void wxAuiManager::ClosePane(wxAuiPaneInfo& pane_info)

 {
     // if we were maximized, restore
 {
     // if we were maximized, restore

-    if(pane_info.IsMaximized()) {
+    if (pane_info.IsMaximized())
+    {

         RestorePane(pane_info);
     }
 
     // first, hide the window
         RestorePane(pane_info);
     }
 
     // first, hide the window

-    if (pane_info.window && pane_info.window->IsShown()) {
+    if (pane_info.window && pane_info.window->IsShown())
+    {

         pane_info.window->Show(false);
     }
 
     // make sure that we are the parent of this window
         pane_info.window->Show(false);
     }
 
     // make sure that we are the parent of this window

-    if(pane_info.window && pane_info.window->GetParent() != m_frame) {
+    if (pane_info.window && pane_info.window->GetParent() != m_frame)
+    {

         pane_info.window->Reparent(m_frame);
     }
 
     // if we have a frame, destroy it
         pane_info.window->Reparent(m_frame);
     }
 
     // if we have a frame, destroy it

-    if(pane_info.frame) {
+    if (pane_info.frame)
+    {

         pane_info.frame->Destroy();
         pane_info.frame = NULL;
     }
 
     // now we need to either destroy or hide the pane
         pane_info.frame->Destroy();
         pane_info.frame = NULL;
     }
 
     // now we need to either destroy or hide the pane

-    if(pane_info.IsDestroyOnClose()) 
+    if (pane_info.IsDestroyOnClose()) 

     {
         wxWindow * window = pane_info.window;
         DetachPane(window);
     {
         wxWindow * window = pane_info.window;
         DetachPane(window);

-        if(window) {
+        if (window)
+        {

             window->Destroy();
         }
     } 
             window->Destroy();
         }
     } 


@@ -1052,17 +1111,24 @@ void wxFrameManager::ClosePane(wxPaneInfo& pane_info)
     }
 }
 
     }
 }
 

-void wxFrameManager::MaximizePane(wxPaneInfo& pane_info)
+void wxAuiManager::MaximizePane(wxAuiPaneInfo& pane_info)

 {
     int i, pane_count;
 
     // un-maximize and hide all other panes
     for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
     {
 {
     int i, pane_count;
 
     // un-maximize and hide all other panes
     for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
     {

-        wxPaneInfo& p = m_panes.Item(i);
-        if(!p.IsToolbar()) {
+        wxAuiPaneInfo& p = m_panes.Item(i);
+        if (!p.IsToolbar())
+        {

             p.Restore();
             p.Restore();

-            p.SaveHidden();
+            
+            // save hidden state
+            p.SetFlag(wxAuiPaneInfo::savedHiddenState,
+                      p.HasFlag(wxAuiPaneInfo::optionHidden));
+
+            // hide the pane, because only the newly
+            // maximized pane should show

             p.Hide();
         }
     }
             p.Hide();
         }
     }


@@ -1073,21 +1139,24 @@ void wxFrameManager::MaximizePane(wxPaneInfo& pane_info)
     m_has_maximized = true;
 
     // last, show the window
     m_has_maximized = true;
 
     // last, show the window

-    if (pane_info.window && !pane_info.window->IsShown()) {
+    if (pane_info.window && !pane_info.window->IsShown())
+    {

         pane_info.window->Show(true);
     }
 }
 
         pane_info.window->Show(true);
     }
 }
 

-void wxFrameManager::RestorePane(wxPaneInfo& pane_info)
+void wxAuiManager::RestorePane(wxAuiPaneInfo& pane_info)

 {
     int i, pane_count;
 
     // restore all the panes
     for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
     {
 {
     int i, pane_count;
 
     // restore all the panes
     for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
     {

-        wxPaneInfo& p = m_panes.Item(i);
-        if(!p.IsToolbar()) {
-            p.RestoreHidden();
+        wxAuiPaneInfo& p = m_panes.Item(i);
+        if (!p.IsToolbar())
+        {
+            p.SetFlag(wxAuiPaneInfo::optionHidden,
+                      p.HasFlag(wxAuiPaneInfo::savedHiddenState));

         }
     }
 
         }
     }
 


@@ -1096,20 +1165,22 @@ void wxFrameManager::RestorePane(wxPaneInfo& pane_info)
     m_has_maximized = false;
 
     // last, show the window
     m_has_maximized = false;
 
     // last, show the window

-    if (pane_info.window && !pane_info.window->IsShown()) {
+    if (pane_info.window && !pane_info.window->IsShown())
+    {

         pane_info.window->Show(true);
     }
 }
 
         pane_info.window->Show(true);
     }
 }
 

-void wxFrameManager::RestoreMaximizedPane()
+void wxAuiManager::RestoreMaximizedPane()

 {
     int i, pane_count;
 
     // restore all the panes
     for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
     {
 {
     int i, pane_count;
 
     // restore all the panes
     for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
     {

-        wxPaneInfo& p = m_panes.Item(i);
-        if(p.IsMaximized()) {
+        wxAuiPaneInfo& p = m_panes.Item(i);
+        if (p.IsMaximized())
+        {

             RestorePane(p);
             break;
         }
             RestorePane(p);
             break;
         }


@@ -1134,7 +1205,7 @@ static wxString EscapeDelimiters(const wxString& s)
     return result;
 }
 
     return result;
 }
 

-wxString wxFrameManager::SavePaneInfo(wxPaneInfo& pane)
+wxString wxAuiManager::SavePaneInfo(wxAuiPaneInfo& pane)

 {
     wxString result = wxT("name=");
     result += EscapeDelimiters(pane.name);
 {
     wxString result = wxT("name=");
     result += EscapeDelimiters(pane.name);


@@ -1165,7 +1236,7 @@ wxString wxFrameManager::SavePaneInfo(wxPaneInfo& pane)
 }
 
 // Load a "pane" with the pane infor settings in pane_part
 }
 
 // Load a "pane" with the pane infor settings in pane_part

-void wxFrameManager::LoadPaneInfo(wxString pane_part, wxPaneInfo &pane)
+void wxAuiManager::LoadPaneInfo(wxString pane_part, wxAuiPaneInfo &pane)

 {
     // replace escaped characters so we can
     // split up the string easily
 {
     // replace escaped characters so we can
     // split up the string easily


@@ -1246,23 +1317,23 @@ void wxFrameManager::LoadPaneInfo(wxString pane_part, wxPaneInfo &pane)
 // all pane settings.  This save and load mechanism allows an
 // exact pane configuration to be saved and restored at a later time
 
 // all pane settings.  This save and load mechanism allows an
 // exact pane configuration to be saved and restored at a later time
 

-wxString wxFrameManager::SavePerspective()
+wxString wxAuiManager::SavePerspective()

 {
     wxString result;
     result.Alloc(500);
 {
     wxString result;
     result.Alloc(500);

-    result = wxT("layout1|");
+    result = wxT("layout2|");

 
     int pane_i, pane_count = m_panes.GetCount();
     for (pane_i = 0; pane_i < pane_count; ++pane_i)
     {
 
     int pane_i, pane_count = m_panes.GetCount();
     for (pane_i = 0; pane_i < pane_count; ++pane_i)
     {

-        wxPaneInfo& pane = m_panes.Item(pane_i);
+        wxAuiPaneInfo& pane = m_panes.Item(pane_i);

         result += SavePaneInfo(pane)+wxT("|");
     }
 
     int dock_i, dock_count = m_docks.GetCount();
     for (dock_i = 0; dock_i < dock_count; ++dock_i)
     {
         result += SavePaneInfo(pane)+wxT("|");
     }
 
     int dock_i, dock_count = m_docks.GetCount();
     for (dock_i = 0; dock_i < dock_count; ++dock_i)
     {

-        wxDockInfo& dock = m_docks.Item(dock_i);
+        wxAuiDockInfo& dock = m_docks.Item(dock_i);

 
         result += wxString::Format(wxT("dock_size(%d,%d,%d)=%d|"),
                                    dock.dock_direction, dock.dock_layer,
 
         result += wxString::Format(wxT("dock_size(%d,%d,%d)=%d|"),
                                    dock.dock_direction, dock.dock_layer,


@@ -1275,17 +1346,19 @@ wxString wxFrameManager::SavePerspective()
 // LoadPerspective() loads a layout which was saved with SavePerspective()
 // If the "update" flag parameter is true, the GUI will immediately be updated
 
 // LoadPerspective() loads a layout which was saved with SavePerspective()
 // If the "update" flag parameter is true, the GUI will immediately be updated
 

-bool wxFrameManager::LoadPerspective(const wxString& layout, bool update)
+bool wxAuiManager::LoadPerspective(const wxString& layout, bool update)

 {
     wxString input = layout;
     wxString part;
 
     // check layout string version
 {
     wxString input = layout;
     wxString part;
 
     // check layout string version

+    //    'layout1' = wxAUI 0.9.0 - wxAUI 0.9.2
+    //    'layout2' = wxAUI 0.9.2 (wxWidgets 2.8)

     part = input.BeforeFirst(wxT('|'));
     input = input.AfterFirst(wxT('|'));
     part.Trim(true);
     part.Trim(false);
     part = input.BeforeFirst(wxT('|'));
     input = input.AfterFirst(wxT('|'));
     part.Trim(true);
     part.Trim(false);

-    if (part != wxT("layout1"))
+    if (part != wxT("layout2"))

         return false;
 
     // mark all panes currently managed as docked and hidden
         return false;
 
     // mark all panes currently managed as docked and hidden


@@ -1303,7 +1376,7 @@ bool wxFrameManager::LoadPerspective(const wxString& layout, bool update)
 
     while (1)
     {
 
     while (1)
     {

-        wxPaneInfo pane;
+        wxAuiPaneInfo pane;

 
         wxString pane_part = input.BeforeFirst(wxT('|'));
         input = input.AfterFirst(wxT('|'));
 
         wxString pane_part = input.BeforeFirst(wxT('|'));
         input = input.AfterFirst(wxT('|'));


@@ -1327,7 +1400,7 @@ bool wxFrameManager::LoadPerspective(const wxString& layout, bool update)
             piece.AfterFirst(wxT(',')).ToLong(&row);
             value.ToLong(&size);
 
             piece.AfterFirst(wxT(',')).ToLong(&row);
             value.ToLong(&size);
 

-            wxDockInfo dock;
+            wxAuiDockInfo dock;

             dock.dock_direction = dir;
             dock.dock_layer = layer;
             dock.dock_row = row;
             dock.dock_direction = dir;
             dock.dock_layer = layer;
             dock.dock_row = row;


@@ -1343,7 +1416,7 @@ bool wxFrameManager::LoadPerspective(const wxString& layout, bool update)
 
         LoadPaneInfo(pane_part, pane);
 
 
         LoadPaneInfo(pane_part, pane);
 

-        wxPaneInfo& p = GetPane(pane.name);
+        wxAuiPaneInfo& p = GetPane(pane.name);

         if (!p.IsOk())
         {
             // the pane window couldn't be found
         if (!p.IsOk())
         {
             // the pane window couldn't be found


@@ -1361,13 +1434,13 @@ bool wxFrameManager::LoadPerspective(const wxString& layout, bool update)
     return true;
 }
 
     return true;
 }
 

-void wxFrameManager::GetPanePositionsAndSizes(wxDockInfo& dock,
-                                              wxArrayInt& positions,
-                                              wxArrayInt& sizes)
+void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock,
+                                            wxArrayInt& positions,
+                                            wxArrayInt& sizes)

 {
 {

-    int caption_size = m_art->GetMetric(wxAUI_ART_CAPTION_SIZE);
-    int pane_border_size = m_art->GetMetric(wxAUI_ART_PANE_BORDER_SIZE);
-    int gripper_size = m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE);
+    int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE);
+    int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE);
+    int gripper_size = m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE);

 
     positions.Empty();
     sizes.Empty();
 
     positions.Empty();
     sizes.Empty();


@@ -1378,9 +1451,9 @@ void wxFrameManager::GetPanePositionsAndSizes(wxDockInfo& dock,
     // find the pane marked as our action pane
     for (pane_i = 0; pane_i < pane_count; ++pane_i)
     {
     // find the pane marked as our action pane
     for (pane_i = 0; pane_i < pane_count; ++pane_i)
     {

-        wxPaneInfo& pane = *(dock.panes.Item(pane_i));
+        wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i));

 
 

-        if (pane.state & wxPaneInfo::actionPane)
+        if (pane.state & wxAuiPaneInfo::actionPane)

         {
             wxASSERT_MSG(action_pane==-1, wxT("Too many fixed action panes"));
             action_pane = pane_i;
         {
             wxASSERT_MSG(action_pane==-1, wxT("Too many fixed action panes"));
             action_pane = pane_i;


@@ -1392,7 +1465,7 @@ void wxFrameManager::GetPanePositionsAndSizes(wxDockInfo& dock,
     // on the dock's orientation) of each pane
     for (pane_i = 0; pane_i < pane_count; ++pane_i)
     {
     // on the dock's orientation) of each pane
     for (pane_i = 0; pane_i < pane_count; ++pane_i)
     {

-        wxPaneInfo& pane = *(dock.panes.Item(pane_i));
+        wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i));

         positions.Add(pane.dock_pos);
         int size = 0;
 
         positions.Add(pane.dock_pos);
         int size = 0;
 


@@ -1452,19 +1525,19 @@ void wxFrameManager::GetPanePositionsAndSizes(wxDockInfo& dock,
 }
 
 
 }
 
 

-void wxFrameManager::LayoutAddPane(wxSizer* cont,
-                                   wxDockInfo& dock,
-                                   wxPaneInfo& pane,
-                                   wxDockUIPartArray& uiparts,
-                                   bool spacer_only)
+void wxAuiManager::LayoutAddPane(wxSizer* cont,
+                                 wxAuiDockInfo& dock,
+                                 wxAuiPaneInfo& pane,
+                                 wxAuiDockUIPartArray& uiparts,
+                                 bool spacer_only)

 {
 {

-    wxDockUIPart part;
+    wxAuiDockUIPart part;

     wxSizerItem* sizer_item;
 
     wxSizerItem* sizer_item;
 

-    int caption_size = m_art->GetMetric(wxAUI_ART_CAPTION_SIZE);
-    int gripper_size = m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE);
-    int pane_border_size = m_art->GetMetric(wxAUI_ART_PANE_BORDER_SIZE);
-    int pane_button_size = m_art->GetMetric(wxAUI_ART_PANE_BUTTON_SIZE);
+    int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE);
+    int gripper_size = m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE);
+    int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE);
+    int pane_button_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BUTTON_SIZE);

 
     // find out the orientation of the item (orientation for panes
     // is the same as the dock's orientation)
 
     // find out the orientation of the item (orientation for panes
     // is the same as the dock's orientation)


@@ -1488,7 +1561,7 @@ void wxFrameManager::LayoutAddPane(wxSizer* cont,
         else
             sizer_item = horz_pane_sizer ->Add(gripper_size, 1, 0, wxEXPAND);
 
         else
             sizer_item = horz_pane_sizer ->Add(gripper_size, 1, 0, wxEXPAND);
 

-        part.type = wxDockUIPart::typeGripper;
+        part.type = wxAuiDockUIPart::typeGripper;

         part.dock = &dock;
         part.pane = &pane;
         part.button = NULL;
         part.dock = &dock;
         part.pane = &pane;
         part.button = NULL;


@@ -1505,7 +1578,7 @@ void wxFrameManager::LayoutAddPane(wxSizer* cont,
 
         sizer_item = caption_sizer->Add(1, caption_size, 1, wxEXPAND);
 
 
         sizer_item = caption_sizer->Add(1, caption_size, 1, wxEXPAND);
 

-        part.type = wxDockUIPart::typeCaption;
+        part.type = wxAuiDockUIPart::typeCaption;

         part.dock = &dock;
         part.pane = &pane;
         part.button = NULL;
         part.dock = &dock;
         part.pane = &pane;
         part.button = NULL;


@@ -1520,13 +1593,13 @@ void wxFrameManager::LayoutAddPane(wxSizer* cont,
         for (i = 0, button_count = pane.buttons.GetCount();
              i < button_count; ++i)
         {
         for (i = 0, button_count = pane.buttons.GetCount();
              i < button_count; ++i)
         {

-            wxPaneButton& button = pane.buttons.Item(i);
+            wxAuiPaneButton& button = pane.buttons.Item(i);

 
             sizer_item = caption_sizer->Add(pane_button_size,
                                             caption_size,
                                             0, wxEXPAND);
 
 
             sizer_item = caption_sizer->Add(pane_button_size,
                                             caption_size,
                                             0, wxEXPAND);
 

-            part.type = wxDockUIPart::typePaneButton;
+            part.type = wxAuiDockUIPart::typePaneButton;

             part.dock = &dock;
             part.pane = &pane;
             part.button = &button;
             part.dock = &dock;
             part.pane = &pane;
             part.button = &button;


@@ -1535,6 +1608,13 @@ void wxFrameManager::LayoutAddPane(wxSizer* cont,
             part.sizer_item = sizer_item;
             uiparts.Add(part);
         }
             part.sizer_item = sizer_item;
             uiparts.Add(part);
         }

+        
+        // if we have buttons, add a little space to the right
+        // of them to ease visual crowding
+        if (button_count >= 1)
+        {
+            caption_sizer->Add(3,1);
+        }

 
         // add the caption sizer
         sizer_item = vert_pane_sizer->Add(caption_sizer, 0, wxEXPAND);
 
         // add the caption sizer
         sizer_item = vert_pane_sizer->Add(caption_sizer, 0, wxEXPAND);


@@ -1556,7 +1636,7 @@ void wxFrameManager::LayoutAddPane(wxSizer* cont,
         vert_pane_sizer->SetItemMinSize(pane.window, 1, 1);
     }
 
         vert_pane_sizer->SetItemMinSize(pane.window, 1, 1);
     }
 

-    part.type = wxDockUIPart::typePane;
+    part.type = wxAuiDockUIPart::typePane;

     part.dock = &dock;
     part.pane = &pane;
     part.button = NULL;
     part.dock = &dock;
     part.pane = &pane;
     part.button = NULL;


@@ -1567,7 +1647,7 @@ void wxFrameManager::LayoutAddPane(wxSizer* cont,
 
 
     // determine if the pane should have a minimum size; if the pane is
 
 
     // determine if the pane should have a minimum size; if the pane is

-    // non-resizable (fixed) then we must set a minimum size. Alternitavely,
+    // non-resizable (fixed) then we must set a minimum size. Alternatively,

     // if the pane.min_size is set, we must use that value as well
 
     wxSize min_size = pane.min_size;
     // if the pane.min_size is set, we must use that value as well
 
     wxSize min_size = pane.min_size;


@@ -1600,7 +1680,7 @@ void wxFrameManager::LayoutAddPane(wxSizer* cont,
         sizer_item = cont->Add(horz_pane_sizer, pane_proportion,
                                wxEXPAND | wxALL, pane_border_size);
 
         sizer_item = cont->Add(horz_pane_sizer, pane_proportion,
                                wxEXPAND | wxALL, pane_border_size);
 

-        part.type = wxDockUIPart::typePaneBorder;
+        part.type = wxAuiDockUIPart::typePaneBorder;

         part.dock = &dock;
         part.pane = &pane;
         part.button = NULL;
         part.dock = &dock;
         part.pane = &pane;
         part.button = NULL;


@@ -1609,21 +1689,21 @@ void wxFrameManager::LayoutAddPane(wxSizer* cont,
         part.sizer_item = sizer_item;
         uiparts.Add(part);
     }
         part.sizer_item = sizer_item;
         uiparts.Add(part);
     }

-    else
+     else

     {
         sizer_item = cont->Add(horz_pane_sizer, pane_proportion, wxEXPAND);
     }
 }
 
     {
         sizer_item = cont->Add(horz_pane_sizer, pane_proportion, wxEXPAND);
     }
 }
 

-void wxFrameManager::LayoutAddDock(wxSizer* cont,
-                                   wxDockInfo& dock,
-                                   wxDockUIPartArray& uiparts,
-                                   bool spacer_only)
+void wxAuiManager::LayoutAddDock(wxSizer* cont,
+                                 wxAuiDockInfo& dock,
+                                 wxAuiDockUIPartArray& uiparts,
+                                 bool spacer_only)

 {
     wxSizerItem* sizer_item;
 {
     wxSizerItem* sizer_item;

-    wxDockUIPart part;
+    wxAuiDockUIPart part;

 
 

-    int sash_size = m_art->GetMetric(wxAUI_ART_SASH_SIZE);
+    int sash_size = m_art->GetMetric(wxAUI_DOCKART_SASH_SIZE);

     int orientation = dock.IsHorizontal() ? wxHORIZONTAL : wxVERTICAL;
 
     // resizable bottom and right docks have a sash before them
     int orientation = dock.IsHorizontal() ? wxHORIZONTAL : wxVERTICAL;
 
     // resizable bottom and right docks have a sash before them


@@ -1632,7 +1712,7 @@ void wxFrameManager::LayoutAddDock(wxSizer* cont,
     {
         sizer_item = cont->Add(sash_size, sash_size, 0, wxEXPAND);
 
     {
         sizer_item = cont->Add(sash_size, sash_size, 0, wxEXPAND);
 

-        part.type = wxDockUIPart::typeDockSizer;
+        part.type = wxAuiDockUIPart::typeDockSizer;

         part.orientation = orientation;
         part.dock = &dock;
         part.pane = NULL;
         part.orientation = orientation;
         part.dock = &dock;
         part.pane = NULL;


@@ -1660,11 +1740,12 @@ void wxFrameManager::LayoutAddDock(wxSizer* cont,
         int offset = 0;
         for (pane_i = 0; pane_i < pane_count; ++pane_i)
         {
         int offset = 0;
         for (pane_i = 0; pane_i < pane_count; ++pane_i)
         {

-            wxPaneInfo& pane = *(dock.panes.Item(pane_i));
+            wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i));

             int pane_pos = pane_positions.Item(pane_i);
             int pane_pos = pane_positions.Item(pane_i);

-            if(pane.IsMaximized()) {
+            
+            if (pane.IsMaximized())

                 has_maximized_pane = true;
                 has_maximized_pane = true;

-            }
+

 
             int amount = pane_pos - offset;
             if (amount > 0)
 
             int amount = pane_pos - offset;
             if (amount > 0)


@@ -1674,7 +1755,7 @@ void wxFrameManager::LayoutAddDock(wxSizer* cont,
                      else
                     sizer_item = dock_sizer->Add(amount, 1, 0, wxEXPAND);
 
                      else
                     sizer_item = dock_sizer->Add(amount, 1, 0, wxEXPAND);
 

-                part.type = wxDockUIPart::typeBackground;
+                part.type = wxAuiDockUIPart::typeBackground;

                 part.dock = &dock;
                 part.pane = NULL;
                 part.button = NULL;
                 part.dock = &dock;
                 part.pane = NULL;
                 part.button = NULL;


@@ -1692,9 +1773,9 @@ void wxFrameManager::LayoutAddDock(wxSizer* cont,
         }
 
         // at the end add a very small stretchable background area
         }
 
         // at the end add a very small stretchable background area

-        sizer_item = dock_sizer->Add(1,1, 1, wxEXPAND);
+        sizer_item = dock_sizer->Add(0,0, 1, wxEXPAND);

 
 

-        part.type = wxDockUIPart::typeBackground;
+        part.type = wxAuiDockUIPart::typeBackground;

         part.dock = &dock;
         part.pane = NULL;
         part.button = NULL;
         part.dock = &dock;
         part.pane = NULL;
         part.button = NULL;


@@ -1707,10 +1788,10 @@ void wxFrameManager::LayoutAddDock(wxSizer* cont,
     {
         for (pane_i = 0; pane_i < pane_count; ++pane_i)
         {
     {
         for (pane_i = 0; pane_i < pane_count; ++pane_i)
         {

-            wxPaneInfo& pane = *(dock.panes.Item(pane_i));
-            if(pane.IsMaximized()) {
+            wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i));
+            
+            if (pane.IsMaximized())

                 has_maximized_pane = true;
                 has_maximized_pane = true;

-            }

 
             // if this is not the first pane being added,
             // we need to add a pane sizer
 
             // if this is not the first pane being added,
             // we need to add a pane sizer


@@ -1718,7 +1799,7 @@ void wxFrameManager::LayoutAddDock(wxSizer* cont,
             {
                 sizer_item = dock_sizer->Add(sash_size, sash_size, 0, wxEXPAND);
 
             {
                 sizer_item = dock_sizer->Add(sash_size, sash_size, 0, wxEXPAND);
 

-                part.type = wxDockUIPart::typePaneSizer;
+                part.type = wxAuiDockUIPart::typePaneSizer;

                 part.dock = &dock;
                 part.pane = dock.panes.Item(pane_i-1);
                 part.button = NULL;
                 part.dock = &dock;
                 part.pane = dock.panes.Item(pane_i-1);
                 part.button = NULL;


@@ -1737,7 +1818,7 @@ void wxFrameManager::LayoutAddDock(wxSizer* cont,
          else
         sizer_item = cont->Add(dock_sizer, 0, wxEXPAND);
 
          else
         sizer_item = cont->Add(dock_sizer, 0, wxEXPAND);
 

-    part.type = wxDockUIPart::typeDock;
+    part.type = wxAuiDockUIPart::typeDock;

     part.dock = &dock;
     part.pane = NULL;
     part.button = NULL;
     part.dock = &dock;
     part.pane = NULL;
     part.button = NULL;


@@ -1752,12 +1833,14 @@ void wxFrameManager::LayoutAddDock(wxSizer* cont,
         cont->SetItemMinSize(dock_sizer, dock.size, 0);
 
     //  top and left docks have a sash after them
         cont->SetItemMinSize(dock_sizer, dock.size, 0);
 
     //  top and left docks have a sash after them

-    if (!m_has_maximized && !dock.fixed && (dock.dock_direction == wxAUI_DOCK_TOP ||
-                        dock.dock_direction == wxAUI_DOCK_LEFT))
+    if (!m_has_maximized &&
+        !dock.fixed &&
+          (dock.dock_direction == wxAUI_DOCK_TOP ||
+           dock.dock_direction == wxAUI_DOCK_LEFT))

     {
         sizer_item = cont->Add(sash_size, sash_size, 0, wxEXPAND);
 
     {
         sizer_item = cont->Add(sash_size, sash_size, 0, wxEXPAND);
 

-        part.type = wxDockUIPart::typeDockSizer;
+        part.type = wxAuiDockUIPart::typeDockSizer;

         part.dock = &dock;
         part.pane = NULL;
         part.button = NULL;
         part.dock = &dock;
         part.pane = NULL;
         part.button = NULL;


@@ -1768,22 +1851,34 @@ void wxFrameManager::LayoutAddDock(wxSizer* cont,
     }
 }
 
     }
 }
 

-wxSizer* wxFrameManager::LayoutAll(wxPaneInfoArray& panes,
-                                   wxDockInfoArray& docks,
-                                   wxDockUIPartArray& uiparts,
-                                   bool spacer_only)
+wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
+                                 wxAuiDockInfoArray& docks,
+                                 wxAuiDockUIPartArray& uiparts,
+                                 bool spacer_only)

 {
     wxBoxSizer* container = new wxBoxSizer(wxVERTICAL);
 
 {
     wxBoxSizer* container = new wxBoxSizer(wxVERTICAL);
 

-    int pane_border_size = m_art->GetMetric(wxAUI_ART_PANE_BORDER_SIZE);
-    int caption_size = m_art->GetMetric(wxAUI_ART_CAPTION_SIZE);
+    int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE);
+    int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE);

     wxSize cli_size = m_frame->GetClientSize();
     int i, dock_count, pane_count;
 
 
     // empty all docks out
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
     wxSize cli_size = m_frame->GetClientSize();
     int i, dock_count, pane_count;
 
 
     // empty all docks out
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)

-        docks.Item(i).panes.Empty();
+    {
+        wxAuiDockInfo& dock = docks.Item(i);
+        
+        // empty out all panes, as they will be readded below
+        dock.panes.Empty();
+        
+        if (dock.fixed)
+        {
+            // always reset fixed docks' sizes, because
+            // the contained windows may have been resized
+            dock.size = 0;
+        }
+    }

 
 
     // iterate through all known panes, filing each
 
 
     // iterate through all known panes, filing each


@@ -1791,21 +1886,23 @@ wxSizer* wxFrameManager::LayoutAll(wxPaneInfoArray& panes,
     // pane does not exist in the dock, add it
     for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
     {
     // pane does not exist in the dock, add it
     for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
     {

-        wxPaneInfo& p = panes.Item(i);
+        wxAuiPaneInfo& p = panes.Item(i);

 
 

-        // find any docks in this layer
-        wxDockInfo* dock;
-        wxDockInfoPtrArray arr;
+        // find any docks with the same dock direction, dock layer, and
+        // dock row as the pane we are working on
+        wxAuiDockInfo* dock;
+        wxAuiDockInfoPtrArray arr;

         FindDocks(docks, p.dock_direction, p.dock_layer, p.dock_row, arr);
 
         if (arr.GetCount() > 0)
         {
         FindDocks(docks, p.dock_direction, p.dock_layer, p.dock_row, arr);
 
         if (arr.GetCount() > 0)
         {

+            // found the right dock

             dock = arr.Item(0);
         }
          else
         {
             // dock was not found, so we need to create a new one
             dock = arr.Item(0);
         }
          else
         {
             // dock was not found, so we need to create a new one

-            wxDockInfo d;
+            wxAuiDockInfo d;

             d.dock_direction = p.dock_direction;
             d.dock_layer = p.dock_layer;
             d.dock_row = p.dock_row;
             d.dock_direction = p.dock_direction;
             d.dock_layer = p.dock_layer;
             d.dock_row = p.dock_row;


@@ -1842,7 +1939,7 @@ wxSizer* wxFrameManager::LayoutAll(wxPaneInfoArray& panes,
     // configure the docks further
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
     {
     // configure the docks further
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
     {

-        wxDockInfo& dock = docks.Item(i);
+        wxAuiDockInfo& dock = docks.Item(i);

         int j, dock_pane_count = dock.panes.GetCount();
 
         // sort the dock pane array by the pane's
         int j, dock_pane_count = dock.panes.GetCount();
 
         // sort the dock pane array by the pane's


@@ -1856,7 +1953,7 @@ wxSizer* wxFrameManager::LayoutAll(wxPaneInfoArray& panes,
 
             for (j = 0; j < dock_pane_count; ++j)
             {
 
             for (j = 0; j < dock_pane_count; ++j)
             {

-                wxPaneInfo& pane = *dock.panes.Item(j);
+                wxAuiPaneInfo& pane = *dock.panes.Item(j);

                 wxSize pane_size = pane.best_size;
                 if (pane_size == wxDefaultSize)
                     pane_size = pane.min_size;
                 wxSize pane_size = pane.best_size;
                 if (pane_size == wxDefaultSize)
                     pane_size = pane.min_size;


@@ -1894,14 +1991,22 @@ wxSizer* wxFrameManager::LayoutAll(wxPaneInfoArray& panes,
                 }
             }
 
                 }
             }
 

-            // new dock's size may not be more than 1/3 of the frame size
+
+            // new dock's size may not be more than the dock constraint
+            // parameter specifies.  See SetDockSizeConstraint()
+            
+            int max_dock_x_size = (int)(m_dock_constraint_x * ((double)cli_size.x));
+            int max_dock_y_size = (int)(m_dock_constraint_y * ((double)cli_size.y));
+            

             if (dock.IsHorizontal())
             if (dock.IsHorizontal())

-                size = wxMin(size, cli_size.y/3);
+                size = wxMin(size, max_dock_y_size);

                  else
                  else

-                size = wxMin(size, cli_size.x/3);
+                size = wxMin(size, max_dock_x_size);

 
 

+            // absolute minimum size for a dock is 10 pixels

             if (size < 10)
                 size = 10;
             if (size < 10)
                 size = 10;

+                

             dock.size = size;
         }
 
             dock.size = size;
         }
 


@@ -1912,7 +2017,7 @@ wxSizer* wxFrameManager::LayoutAll(wxPaneInfoArray& panes,
         int dock_min_size = 0;
         for (j = 0; j < dock_pane_count; ++j)
         {
         int dock_min_size = 0;
         for (j = 0; j < dock_pane_count; ++j)
         {

-            wxPaneInfo& pane = *dock.panes.Item(j);
+            wxAuiPaneInfo& pane = *dock.panes.Item(j);

             if (pane.min_size != wxDefaultSize)
             {
                 if (pane.HasBorder())
             if (pane.min_size != wxDefaultSize)
             {
                 if (pane.HasBorder())


@@ -1953,12 +2058,12 @@ wxSizer* wxFrameManager::LayoutAll(wxPaneInfoArray& panes,
         dock.toolbar = true;
         for (j = 0; j < dock_pane_count; ++j)
         {
         dock.toolbar = true;
         for (j = 0; j < dock_pane_count; ++j)
         {

-            wxPaneInfo& pane = *dock.panes.Item(j);
+            wxAuiPaneInfo& pane = *dock.panes.Item(j);

             if (!pane.IsFixed())
                 dock.fixed = false;
             if (!pane.IsToolbar())
                 dock.toolbar = false;
             if (!pane.IsFixed())
                 dock.fixed = false;
             if (!pane.IsToolbar())
                 dock.toolbar = false;

-            if (pane.state & wxPaneInfo::actionPane)
+            if (pane.state & wxAuiPaneInfo::actionPane)

                 action_pane_marked = true;
         }
 
                 action_pane_marked = true;
         }
 


@@ -1970,7 +2075,7 @@ wxSizer* wxFrameManager::LayoutAll(wxPaneInfoArray& panes,
         {
             for (j = 0; j < dock_pane_count; ++j)
             {
         {
             for (j = 0; j < dock_pane_count; ++j)
             {

-                wxPaneInfo& pane = *dock.panes.Item(j);
+                wxAuiPaneInfo& pane = *dock.panes.Item(j);

                 pane.dock_pos = j;
             }
         }
                 pane.dock_pos = j;
             }
         }


@@ -1978,7 +2083,7 @@ wxSizer* wxFrameManager::LayoutAll(wxPaneInfoArray& panes,
         // if the dock mode is fixed, and none of the panes
         // are being moved right now, make sure the panes
         // do not overlap each other.  If they do, we will
         // if the dock mode is fixed, and none of the panes
         // are being moved right now, make sure the panes
         // do not overlap each other.  If they do, we will

-        // adjust the panes' positions
+        // adjust the positions of the panes

         if (dock.fixed && !action_pane_marked)
         {
             wxArrayInt pane_positions, pane_sizes;
         if (dock.fixed && !action_pane_marked)
         {
             wxArrayInt pane_positions, pane_sizes;


@@ -1987,7 +2092,7 @@ wxSizer* wxFrameManager::LayoutAll(wxPaneInfoArray& panes,
             int offset = 0;
             for (j = 0; j < dock_pane_count; ++j)
             {
             int offset = 0;
             for (j = 0; j < dock_pane_count; ++j)
             {

-                wxPaneInfo& pane = *(dock.panes.Item(j));
+                wxAuiPaneInfo& pane = *(dock.panes.Item(j));

                 pane.dock_pos = pane_positions[j];
 
                 int amount = pane.dock_pos - offset;
                 pane.dock_pos = pane_positions[j];
 
                 int amount = pane.dock_pos - offset;


@@ -2019,7 +2124,7 @@ wxSizer* wxFrameManager::LayoutAll(wxPaneInfoArray& panes,
 
     for (layer = 0; layer <= max_layer; ++layer)
     {
 
     for (layer = 0; layer <= max_layer; ++layer)
     {

-        wxDockInfoPtrArray arr;
+        wxAuiDockInfoPtrArray arr;

 
         // find any docks in this layer
         FindDocks(docks, -1, layer, -1, arr);
 
         // find any docks in this layer
         FindDocks(docks, -1, layer, -1, arr);


@@ -2074,8 +2179,8 @@ wxSizer* wxFrameManager::LayoutAll(wxPaneInfoArray& panes,
             {
                 // there are no center docks, add a background area
                 wxSizerItem* sizer_item = middle->Add(1,1, 1, wxEXPAND);
             {
                 // there are no center docks, add a background area
                 wxSizerItem* sizer_item = middle->Add(1,1, 1, wxEXPAND);

-                wxDockUIPart part;
-                part.type = wxDockUIPart::typeBackground;
+                wxAuiDockUIPart part;
+                part.type = wxAuiDockUIPart::typeBackground;

                 part.pane = NULL;
                 part.dock = NULL;
                 part.button = NULL;
                 part.pane = NULL;
                 part.dock = NULL;
                 part.button = NULL;


@@ -2119,8 +2224,8 @@ wxSizer* wxFrameManager::LayoutAll(wxPaneInfoArray& panes,
         // therefore we will create a simple background area
         cont = new wxBoxSizer(wxVERTICAL);
         wxSizerItem* sizer_item = cont->Add(1,1, 1, wxEXPAND);
         // therefore we will create a simple background area
         cont = new wxBoxSizer(wxVERTICAL);
         wxSizerItem* sizer_item = cont->Add(1,1, 1, wxEXPAND);

-        wxDockUIPart part;
-        part.type = wxDockUIPart::typeBackground;
+        wxAuiDockUIPart part;
+        part.type = wxAuiDockUIPart::typeBackground;

         part.pane = NULL;
         part.dock = NULL;
         part.button = NULL;
         part.pane = NULL;
         part.dock = NULL;
         part.button = NULL;


@@ -2134,23 +2239,42 @@ wxSizer* wxFrameManager::LayoutAll(wxPaneInfoArray& panes,
 }
 
 
 }
 
 

+// SetDockSizeConstraint() allows the dock constraints to be set.  For example,
+// specifying values of 0.5, 0.5 will mean that upon dock creation, a dock may
+// not be larger than half of the window's size
+
+void wxAuiManager::SetDockSizeConstraint(double width_pct, double height_pct)
+{
+    m_dock_constraint_x = wxMax(0.0, wxMin(1.0, width_pct));
+    m_dock_constraint_y = wxMax(0.0, wxMin(1.0, height_pct));
+}
+
+void wxAuiManager::GetDockSizeConstraint(double* width_pct, double* height_pct) const
+{
+    if (width_pct)
+        *width_pct = m_dock_constraint_x;
+    
+    if (height_pct)
+        *height_pct = m_dock_constraint_y;
+}
+
+
+

 // Update() updates the layout.  Whenever changes are made to
 // one or more panes, this function should be called.  It is the
 // external entry point for running the layout engine.
 
 // Update() updates the layout.  Whenever changes are made to
 // one or more panes, this function should be called.  It is the
 // external entry point for running the layout engine.
 

-void wxFrameManager::Update()
+void wxAuiManager::Update()

 {
     wxSizer* sizer;
     int i, pane_count = m_panes.GetCount();
 
 {
     wxSizer* sizer;
     int i, pane_count = m_panes.GetCount();
 

-    // delete old sizer first
-    m_frame->SetSizer(NULL);

 
     // destroy floating panes which have been
     // redocked or are becoming non-floating
     for (i = 0; i < pane_count; ++i)
     {
 
     // destroy floating panes which have been
     // redocked or are becoming non-floating
     for (i = 0; i < pane_count; ++i)
     {

-        wxPaneInfo& p = m_panes.Item(i);
+        wxAuiPaneInfo& p = m_panes.Item(i);

 
         if (!p.IsFloating() && p.frame)
         {
 
         if (!p.IsFloating() && p.frame)
         {


@@ -2161,28 +2285,30 @@ void wxFrameManager::Update()
             p.window->SetSize(1,1);
 
 
             p.window->SetSize(1,1);
 
 

-           // the following block is a workaround for bug #1531361
-           // (see wxWidgets sourceforge page).  On wxGTK (only), when
-           // a frame is shown/hidden, a move event unfortunately
-           // also gets fired.  Because we may be dragging around
-           // a pane, we need to cancel that action here to prevent
-           // a spurious crash.
-           if (m_action_window == p.frame)
-           {
-               if (wxWindow::GetCapture() == m_frame)
+               // the following block is a workaround for bug #1531361
+               // (see wxWidgets sourceforge page).  On wxGTK (only), when
+               // a frame is shown/hidden, a move event unfortunately
+               // also gets fired.  Because we may be dragging around
+               // a pane, we need to cancel that action here to prevent
+               // a spurious crash.
+               if (m_action_window == p.frame)
+               {
+                       if (wxWindow::GetCapture() == m_frame)

                     m_frame->ReleaseMouse();
                 m_action = actionNone;
                     m_frame->ReleaseMouse();
                 m_action = actionNone;

-               m_action_window = NULL;
-           }
+                       m_action_window = NULL;
+               }

 
 

-           // hide the frame
+               // hide the frame

             if (p.frame->IsShown())
                 p.frame->Show(false);
 
             // reparent to m_frame and destroy the pane
             if (p.frame->IsShown())
                 p.frame->Show(false);
 
             // reparent to m_frame and destroy the pane

-            if(m_action_window == p.frame) {
+            if (m_action_window == p.frame)
+            {

                 m_action_window = NULL;
             }
                 m_action_window = NULL;
             }

+            

             p.window->Reparent(m_frame);
             p.frame->SetSizer(NULL);
             p.frame->Destroy();
             p.window->Reparent(m_frame);
             p.frame->SetSizer(NULL);
             p.frame->Destroy();


@@ -2191,6 +2317,9 @@ void wxFrameManager::Update()
     }
 
 
     }
 
 

+    // delete old sizer first
+    m_frame->SetSizer(NULL);
+

     // create a layout for all of the panes
     sizer = LayoutAll(m_panes, m_docks, m_uiparts, false);
 
     // create a layout for all of the panes
     sizer = LayoutAll(m_panes, m_docks, m_uiparts, false);
 


@@ -2198,7 +2327,7 @@ void wxFrameManager::Update()
     // and float panes as necessary
     for (i = 0; i < pane_count; ++i)
     {
     // and float panes as necessary
     for (i = 0; i < pane_count; ++i)
     {

-        wxPaneInfo& p = m_panes.Item(i);
+        wxAuiPaneInfo& p = m_panes.Item(i);

 
         if (p.IsFloating())
         {
 
         if (p.IsFloating())
         {


@@ -2206,16 +2335,14 @@ void wxFrameManager::Update()
             {
                 // we need to create a frame for this
                 // pane, which has recently been floated
             {
                 // we need to create a frame for this
                 // pane, which has recently been floated

-                wxFloatingPane* frame = CreateFloatingFrame(m_frame, p);
+                wxAuiFloatingFrame* frame = CreateFloatingFrame(m_frame, p);

 
 

-#if wxCHECK_VERSION(2,7,0)

                 // on MSW and Mac, if the owner desires transparent dragging, and
                 // the dragging is happening right now, then the floating
                 // window should have this style by default
                 if (m_action == actionDragFloatingPane &&
                     (m_flags & wxAUI_MGR_TRANSPARENT_DRAG))
                         frame->SetTransparent(150);
                 // on MSW and Mac, if the owner desires transparent dragging, and
                 // the dragging is happening right now, then the floating
                 // window should have this style by default
                 if (m_action == actionDragFloatingPane &&
                     (m_flags & wxAUI_MGR_TRANSPARENT_DRAG))
                         frame->SetTransparent(150);

-#endif

 
                 frame->SetPaneWindow(p);
                 p.frame = frame;
 
                 frame->SetPaneWindow(p);
                 p.frame = frame;


@@ -2226,13 +2353,18 @@ void wxFrameManager::Update()
              else
             {
                 // frame already exists, make sure it's position
              else
             {
                 // frame already exists, make sure it's position

-                // and size reflect the information in wxPaneInfo
+                // and size reflect the information in wxAuiPaneInfo

                 if (p.frame->GetPosition() != p.floating_pos)
                 {
                 if (p.frame->GetPosition() != p.floating_pos)
                 {

+                    p.frame->SetSize(p.floating_pos.x, p.floating_pos.y,
+                                     p.floating_size.x, p.floating_size.y,
+                                     wxSIZE_USE_EXISTING);
+                /*

                     p.frame->SetSize(p.floating_pos.x, p.floating_pos.y,
                                      wxDefaultCoord, wxDefaultCoord,
                                      wxSIZE_USE_EXISTING);
                     //p.frame->Move(p.floating_pos.x, p.floating_pos.y);
                     p.frame->SetSize(p.floating_pos.x, p.floating_pos.y,
                                      wxDefaultCoord, wxDefaultCoord,
                                      wxSIZE_USE_EXISTING);
                     //p.frame->Move(p.floating_pos.x, p.floating_pos.y);

+                */

                 }
 
                 if (p.frame->IsShown() != p.IsShown())
                 }
 
                 if (p.frame->IsShown() != p.IsShown())


@@ -2249,7 +2381,7 @@ void wxFrameManager::Update()
         // any optionActive values from the pane states
         if ((m_flags & wxAUI_MGR_ALLOW_ACTIVE_PANE) == 0)
         {
         // any optionActive values from the pane states
         if ((m_flags & wxAUI_MGR_ALLOW_ACTIVE_PANE) == 0)
         {

-            p.state &= ~wxPaneInfo::optionActive;
+            p.state &= ~wxAuiPaneInfo::optionActive;

         }
     }
 
         }
     }
 


@@ -2260,7 +2392,7 @@ void wxFrameManager::Update()
     for (i = 0; i < pane_count; ++i)
     {
         wxRect r;
     for (i = 0; i < pane_count; ++i)
     {
         wxRect r;

-        wxPaneInfo& p = m_panes.Item(i);
+        wxAuiPaneInfo& p = m_panes.Item(i);

 
         if (p.window && p.IsShown() && p.IsDocked())
             r = p.rect;
 
         if (p.window && p.IsShown() && p.IsDocked())
             r = p.rect;


@@ -2284,7 +2416,7 @@ void wxFrameManager::Update()
     // changed, the corresponding panes must also be updated
     for (i = 0; i < pane_count; ++i)
     {
     // changed, the corresponding panes must also be updated
     for (i = 0; i < pane_count; ++i)
     {

-        wxPaneInfo& p = m_panes.Item(i);
+        wxAuiPaneInfo& p = m_panes.Item(i);

         if (p.window && p.window->IsShown() && p.IsDocked())
         {
             if (p.rect != old_pane_rects[i])
         if (p.window && p.window->IsShown() && p.IsDocked())
         {
             if (p.rect != old_pane_rects[i])


@@ -2326,14 +2458,14 @@ void wxFrameManager::Update()
 // and updates their internal rectangles.  This should always be called
 // instead of calling m_frame->Layout() directly
 
 // and updates their internal rectangles.  This should always be called
 // instead of calling m_frame->Layout() directly
 

-void wxFrameManager::DoFrameLayout()
+void wxAuiManager::DoFrameLayout()

 {
     m_frame->Layout();
 
     int i, part_count;
     for (i = 0, part_count = m_uiparts.GetCount(); i < part_count; ++i)
     {
 {
     m_frame->Layout();
 
     int i, part_count;
     for (i = 0, part_count = m_uiparts.GetCount(); i < part_count; ++i)
     {

-        wxDockUIPart& part = m_uiparts.Item(i);
+        wxAuiDockUIPart& part = m_uiparts.Item(i);

 
         // get the rectangle of the UI part
         // originally, this code looked like this:
 
         // get the rectangle of the UI part
         // originally, this code looked like this:


@@ -2366,9 +2498,9 @@ void wxFrameManager::DoFrameLayout()
             part.rect.width += border;
 
 
             part.rect.width += border;
 
 

-        if (part.type == wxDockUIPart::typeDock)
+        if (part.type == wxAuiDockUIPart::typeDock)

             part.dock->rect = part.rect;
             part.dock->rect = part.rect;

-        if (part.type == wxDockUIPart::typePane)
+        if (part.type == wxAuiDockUIPart::typePane)

             part.pane->rect = part.rect;
     }
 }
             part.pane->rect = part.rect;
     }
 }


@@ -2378,20 +2510,20 @@ void wxFrameManager::DoFrameLayout()
 // rectangle of the pane in question, including decorations like
 // caption and border (if any).
 
 // rectangle of the pane in question, including decorations like
 // caption and border (if any).
 

-wxDockUIPart* wxFrameManager::GetPanePart(wxWindow* wnd)
+wxAuiDockUIPart* wxAuiManager::GetPanePart(wxWindow* wnd)

 {
     int i, part_count;
     for (i = 0, part_count = m_uiparts.GetCount(); i < part_count; ++i)
     {
 {
     int i, part_count;
     for (i = 0, part_count = m_uiparts.GetCount(); i < part_count; ++i)
     {

-        wxDockUIPart& part = m_uiparts.Item(i);
-        if (part.type == wxDockUIPart::typePaneBorder &&
+        wxAuiDockUIPart& part = m_uiparts.Item(i);
+        if (part.type == wxAuiDockUIPart::typePaneBorder &&

             part.pane && part.pane->window == wnd)
                 return &part;
     }
     for (i = 0, part_count = m_uiparts.GetCount(); i < part_count; ++i)
     {
             part.pane && part.pane->window == wnd)
                 return &part;
     }
     for (i = 0, part_count = m_uiparts.GetCount(); i < part_count; ++i)
     {

-        wxDockUIPart& part = m_uiparts.Item(i);
-        if (part.type == wxDockUIPart::typePane &&
+        wxAuiDockUIPart& part = m_uiparts.Item(i);
+        if (part.type == wxAuiDockUIPart::typePane &&

             part.pane && part.pane->window == wnd)
                 return &part;
     }
             part.pane && part.pane->window == wnd)
                 return &part;
     }


@@ -2406,15 +2538,15 @@ wxDockUIPart* wxFrameManager::GetPanePart(wxWindow* wnd)
 // vertical docks).  This value is necessary for calculating
 // fixel-pane/toolbar offsets when they are dragged.
 
 // vertical docks).  This value is necessary for calculating
 // fixel-pane/toolbar offsets when they are dragged.
 

-int wxFrameManager::GetDockPixelOffset(wxPaneInfo& test)
+int wxAuiManager::GetDockPixelOffset(wxAuiPaneInfo& test)

 {
     // the only way to accurately calculate the dock's
     // offset is to actually run a theoretical layout
 
     int i, part_count, dock_count;
 {
     // the only way to accurately calculate the dock's
     // offset is to actually run a theoretical layout
 
     int i, part_count, dock_count;

-    wxDockInfoArray docks;
-    wxPaneInfoArray panes;
-    wxDockUIPartArray uiparts;
+    wxAuiDockInfoArray docks;
+    wxAuiPaneInfoArray panes;
+    wxAuiDockUIPartArray uiparts;

     CopyDocksAndPanes(docks, panes, m_docks, m_panes);
     panes.Add(test);
 
     CopyDocksAndPanes(docks, panes, m_docks, m_panes);
     panes.Add(test);
 


@@ -2425,10 +2557,10 @@ int wxFrameManager::GetDockPixelOffset(wxPaneInfo& test)
 
     for (i = 0, part_count = uiparts.GetCount(); i < part_count; ++i)
     {
 
     for (i = 0, part_count = uiparts.GetCount(); i < part_count; ++i)
     {

-        wxDockUIPart& part = uiparts.Item(i);
+        wxAuiDockUIPart& part = uiparts.Item(i);

         part.rect = wxRect(part.sizer_item->GetPosition(),
                            part.sizer_item->GetSize());
         part.rect = wxRect(part.sizer_item->GetPosition(),
                            part.sizer_item->GetSize());

-        if (part.type == wxDockUIPart::typeDock)
+        if (part.type == wxAuiDockUIPart::typeDock)

             part.dock->rect = part.rect;
     }
 
             part.dock->rect = part.rect;
     }
 


@@ -2436,7 +2568,7 @@ int wxFrameManager::GetDockPixelOffset(wxPaneInfo& test)
 
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
     {
 
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
     {

-        wxDockInfo& dock = docks.Item(i);
+        wxAuiDockInfo& dock = docks.Item(i);

         if (test.dock_direction == dock.dock_direction &&
             test.dock_layer==dock.dock_layer && test.dock_row==dock.dock_row)
         {
         if (test.dock_direction == dock.dock_direction &&
             test.dock_layer==dock.dock_layer && test.dock_row==dock.dock_row)
         {


@@ -2456,8 +2588,8 @@ int wxFrameManager::GetDockPixelOffset(wxPaneInfo& test)
 // if a dock operation is allowed, the new dock position is copied into
 // the target info.  If the operation was allowed, the function returns true.
 
 // if a dock operation is allowed, the new dock position is copied into
 // the target info.  If the operation was allowed, the function returns true.
 

-bool wxFrameManager::ProcessDockResult(wxPaneInfo& target,
-                              const wxPaneInfo& new_pos)
+bool wxAuiManager::ProcessDockResult(wxAuiPaneInfo& target,
+                                     const wxAuiPaneInfo& new_pos)

 {
     bool allowed = false;
     switch (new_pos.dock_direction)
 {
     bool allowed = false;
     switch (new_pos.dock_direction)


@@ -2480,7 +2612,7 @@ bool wxFrameManager::ProcessDockResult(wxPaneInfo& target,
 // dropped, it performs the drop operation using the specified dock and pane
 // arrays.  By specifying copied dock and pane arrays when calling, a "what-if"
 // scenario can be performed, giving precise coordinates for drop hints.
 // dropped, it performs the drop operation using the specified dock and pane
 // arrays.  By specifying copied dock and pane arrays when calling, a "what-if"
 // scenario can be performed, giving precise coordinates for drop hints.

-// If, however, wxFrameManager:m_docks and wxFrameManager::m_panes are specified
+// If, however, wxAuiManager:m_docks and wxAuiManager::m_panes are specified

 // as parameters, the changes will be made to the main state arrays
 
 const int auiInsertRowPixels = 10;
 // as parameters, the changes will be made to the main state arrays
 
 const int auiInsertRowPixels = 10;


@@ -2488,15 +2620,15 @@ const int auiNewRowPixels = 40;
 const int auiLayerInsertPixels = 40;
 const int auiLayerInsertOffset = 5;
 
 const int auiLayerInsertPixels = 40;
 const int auiLayerInsertOffset = 5;
 

-bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
-                            wxPaneInfoArray& panes,
-                            wxPaneInfo& target,
-                            const wxPoint& pt,
-                            const wxPoint& offset)
+bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
+                          wxAuiPaneInfoArray& panes,
+                          wxAuiPaneInfo& target,
+                          const wxPoint& pt,
+                          const wxPoint& offset)

 {
     wxSize cli_size = m_frame->GetClientSize();
 
 {
     wxSize cli_size = m_frame->GetClientSize();
 

-    wxPaneInfo drop = target;
+    wxAuiPaneInfo drop = target;

 
 
     // The result should always be shown
 
 
     // The result should always be shown


@@ -2508,13 +2640,22 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
 
 
     int layer_insert_offset = auiLayerInsertOffset;
 
 
     int layer_insert_offset = auiLayerInsertOffset;

-    if (target.IsToolbar())
+    if (drop.IsToolbar())

         layer_insert_offset = 0;
 
         layer_insert_offset = 0;
 

+

     if (pt.x < layer_insert_offset &&
         pt.x > layer_insert_offset-auiLayerInsertPixels)
     {
     if (pt.x < layer_insert_offset &&
         pt.x > layer_insert_offset-auiLayerInsertPixels)
     {

+        int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_LEFT),
+                                GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)),
+                                GetMaxLayer(docks, wxAUI_DOCK_TOP)) + 1;
+                                
+        if (drop.IsToolbar())
+            new_layer = auiToolBarLayer;
+            

         drop.Dock().Left().
         drop.Dock().Left().

+             Layer(new_layer).

              Row(0).
              Position(pt.y - GetDockPixelOffset(drop) - offset.y);
         return ProcessDockResult(target, drop);
              Row(0).
              Position(pt.y - GetDockPixelOffset(drop) - offset.y);
         return ProcessDockResult(target, drop);


@@ -2522,7 +2663,15 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
     else if (pt.y < layer_insert_offset &&
              pt.y > layer_insert_offset-auiLayerInsertPixels)
     {
     else if (pt.y < layer_insert_offset &&
              pt.y > layer_insert_offset-auiLayerInsertPixels)
     {

+        int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_TOP),
+                                GetMaxLayer(docks, wxAUI_DOCK_LEFT)),
+                                GetMaxLayer(docks, wxAUI_DOCK_RIGHT)) + 1;
+                                
+        if (drop.IsToolbar())
+            new_layer = auiToolBarLayer;
+            

         drop.Dock().Top().
         drop.Dock().Top().

+             Layer(new_layer).

              Row(0).
              Position(pt.x - GetDockPixelOffset(drop) - offset.x);
         return ProcessDockResult(target, drop);
              Row(0).
              Position(pt.x - GetDockPixelOffset(drop) - offset.x);
         return ProcessDockResult(target, drop);


@@ -2530,7 +2679,15 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
     else if (pt.x >= cli_size.x - layer_insert_offset &&
              pt.x < cli_size.x - layer_insert_offset + auiLayerInsertPixels)
     {
     else if (pt.x >= cli_size.x - layer_insert_offset &&
              pt.x < cli_size.x - layer_insert_offset + auiLayerInsertPixels)
     {

+        int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_RIGHT),
+                                GetMaxLayer(docks, wxAUI_DOCK_TOP)),
+                                GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)) + 1; 
+                                
+        if (drop.IsToolbar())
+            new_layer = auiToolBarLayer;
+            

         drop.Dock().Right().
         drop.Dock().Right().

+             Layer(new_layer).

              Row(0).
              Position(pt.y - GetDockPixelOffset(drop) - offset.y);
         return ProcessDockResult(target, drop);
              Row(0).
              Position(pt.y - GetDockPixelOffset(drop) - offset.y);
         return ProcessDockResult(target, drop);


@@ -2541,7 +2698,10 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
         int new_layer = wxMax( wxMax( GetMaxLayer(docks, wxAUI_DOCK_BOTTOM),
                                       GetMaxLayer(docks, wxAUI_DOCK_LEFT)),
                                       GetMaxLayer(docks, wxAUI_DOCK_RIGHT)) + 1;
         int new_layer = wxMax( wxMax( GetMaxLayer(docks, wxAUI_DOCK_BOTTOM),
                                       GetMaxLayer(docks, wxAUI_DOCK_LEFT)),
                                       GetMaxLayer(docks, wxAUI_DOCK_RIGHT)) + 1;

-
+                                
+        if (drop.IsToolbar())
+            new_layer = auiToolBarLayer;
+            

         drop.Dock().Bottom().
              Layer(new_layer).
              Row(0).
         drop.Dock().Bottom().
              Layer(new_layer).
              Row(0).


@@ -2549,7 +2709,8 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
         return ProcessDockResult(target, drop);
     }
 
         return ProcessDockResult(target, drop);
     }
 

-    wxDockUIPart* part = HitTest(pt.x, pt.y);
+
+    wxAuiDockUIPart* part = HitTest(pt.x, pt.y);

 
 
     if (drop.IsToolbar())
 
 
     if (drop.IsToolbar())


@@ -2666,16 +2827,16 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
     if (!part)
         return false;
 
     if (!part)
         return false;
 

-    if (part->type == wxDockUIPart::typePaneBorder ||
-        part->type == wxDockUIPart::typeCaption ||
-        part->type == wxDockUIPart::typeGripper ||
-        part->type == wxDockUIPart::typePaneButton ||
-        part->type == wxDockUIPart::typePane ||
-        part->type == wxDockUIPart::typePaneSizer ||
-        part->type == wxDockUIPart::typeDockSizer ||
-        part->type == wxDockUIPart::typeBackground)
+    if (part->type == wxAuiDockUIPart::typePaneBorder ||
+        part->type == wxAuiDockUIPart::typeCaption ||
+        part->type == wxAuiDockUIPart::typeGripper ||
+        part->type == wxAuiDockUIPart::typePaneButton ||
+        part->type == wxAuiDockUIPart::typePane ||
+        part->type == wxAuiDockUIPart::typePaneSizer ||
+        part->type == wxAuiDockUIPart::typeDockSizer ||
+        part->type == wxAuiDockUIPart::typeBackground)

     {
     {

-        if (part->type == wxDockUIPart::typeDockSizer)
+        if (part->type == wxAuiDockUIPart::typeDockSizer)

         {
             if (part->dock->panes.GetCount() != 1)
                 return false;
         {
             if (part->dock->panes.GetCount() != 1)
                 return false;


@@ -2867,7 +3028,7 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
 }
 
 
 }
 
 

-void wxFrameManager::OnHintFadeTimer(wxTimerEvent& WXUNUSED(event))
+void wxAuiManager::OnHintFadeTimer(wxTimerEvent& WXUNUSED(event))

 {
     if (!m_hint_wnd || m_hint_fadeamt >= m_hint_fademax)
     {
 {
     if (!m_hint_wnd || m_hint_fadeamt >= m_hint_fademax)
     {


@@ -2876,15 +3037,10 @@ void wxFrameManager::OnHintFadeTimer(wxTimerEvent& WXUNUSED(event))
     }
 
     m_hint_fadeamt += 4;
     }
 
     m_hint_fadeamt += 4;

-#if wxCHECK_VERSION(2,7,0)

     m_hint_wnd->SetTransparent(m_hint_fadeamt);
     m_hint_wnd->SetTransparent(m_hint_fadeamt);

-#else
-    if (m_hint_wnd->IsKindOf(CLASSINFO(wxPseudoTransparentFrame)))
-        ((wxPseudoTransparentFrame *)m_hint_wnd)->SetTransparent(m_hint_fadeamt);
-#endif

 }
 
 }
 

-void wxFrameManager::ShowHint(const wxRect& rect)
+void wxAuiManager::ShowHint(const wxRect& rect)

 {
     if (m_hint_wnd)
     {
 {
     if (m_hint_wnd)
     {


@@ -2911,12 +3067,7 @@ void wxFrameManager::ShowHint(const wxRect& rect)
         if (m_action == actionDragFloatingPane && m_action_window)
             m_action_window->SetFocus();
 
         if (m_action == actionDragFloatingPane && m_action_window)
             m_action_window->SetFocus();
 

-#if wxCHECK_VERSION(2,7,0)

         m_hint_wnd->SetTransparent(m_hint_fadeamt);
         m_hint_wnd->SetTransparent(m_hint_fadeamt);

-#else
-        if (m_hint_wnd->IsKindOf(CLASSINFO(wxPseudoTransparentFrame)))
-            ((wxPseudoTransparentFrame*)m_hint_wnd)->SetTransparent(m_hint_fadeamt);
-#endif

         m_hint_wnd->Raise();
 
 
         m_hint_wnd->Raise();
 
 


@@ -2947,7 +3098,7 @@ void wxFrameManager::ShowHint(const wxRect& rect)
         int i, pane_count;
         for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
         {
         int i, pane_count;
         for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
         {

-            wxPaneInfo& pane = m_panes.Item(i);
+            wxAuiPaneInfo& pane = m_panes.Item(i);

 
             if (pane.IsFloating() &&
                 pane.frame->IsShown())
 
             if (pane.IsFloating() &&
                 pane.frame->IsShown())


@@ -2983,19 +3134,14 @@ void wxFrameManager::ShowHint(const wxRect& rect)
     }
 }
 
     }
 }
 

-void wxFrameManager::HideHint()
+void wxAuiManager::HideHint()

 {
     // hides a transparent window hint, if there is one
     if (m_hint_wnd)
     {
         if (m_hint_wnd->IsShown())
             m_hint_wnd->Show(false);
 {
     // hides a transparent window hint, if there is one
     if (m_hint_wnd)
     {
         if (m_hint_wnd->IsShown())
             m_hint_wnd->Show(false);

-#if wxCHECK_VERSION(2,7,0)

         m_hint_wnd->SetTransparent(0);
         m_hint_wnd->SetTransparent(0);

-#else
-        if (m_hint_wnd->IsKindOf(CLASSINFO(wxPseudoTransparentFrame)))
-        ((wxPseudoTransparentFrame *)m_hint_wnd)->SetTransparent(0);
-#endif

         m_hint_fadetimer.Stop();
         m_last_hint = wxRect();
         return;
         m_hint_fadetimer.Stop();
         m_last_hint = wxRect();
         return;


@@ -3012,15 +3158,40 @@ void wxFrameManager::HideHint()
 
 
 
 
 
 

-// DrawHintRect() draws a drop hint rectangle. First calls DoDrop() to
-// determine the exact position the pane would be at were if dropped.  If
-// the pame would indeed become docked at the specified drop point,
-// DrawHintRect() then calls ShowHint() to indicate this drop rectangle.
-// "pane_window" is the window pointer of the pane being dragged, pt is
-// the mouse position, in client coordinates
-void wxFrameManager::DrawHintRect(wxWindow* pane_window,
-                                  const wxPoint& pt,
-                                  const wxPoint& offset)
+void wxAuiManager::StartPaneDrag(wxWindow* pane_window,
+                                 const wxPoint& offset)
+{
+    wxAuiPaneInfo& pane = GetPane(pane_window);
+    if (!pane.IsOk())
+        return;
+    
+    if (pane.IsToolbar())
+    {
+        m_action = actionDragToolbarPane;
+    }
+     else
+    {
+        m_action = actionDragFloatingPane;
+    }
+    
+    m_action_window = pane_window;
+    m_action_offset = offset;
+    m_frame->CaptureMouse();
+}
+
+
+// CalculateHintRect() calculates the drop hint rectangle.  The method
+// first calls DoDrop() to determine the exact position the pane would
+// be at were if dropped.  If the pane would indeed become docked at the
+// specified drop point, the the rectangle hint will be returned in
+// screen coordinates.  Otherwise, an empty rectangle is returned.
+// |pane_window| is the window pointer of the pane being dragged, |pt| is
+// the mouse position, in client coordinates.  |offset| describes the offset
+// that the mouse is from the upper-left corner of the item being dragged
+
+wxRect wxAuiManager::CalculateHintRect(wxWindow* pane_window,
+                                       const wxPoint& pt,
+                                       const wxPoint& offset)

 {
     wxRect rect;
 
 {
     wxRect rect;
 


@@ -3030,15 +3201,15 @@ void wxFrameManager::DrawHintRect(wxWindow* pane_window,
     // so that we don't modify the real thing on screen
 
     int i, pane_count, part_count;
     // so that we don't modify the real thing on screen
 
     int i, pane_count, part_count;

-    wxDockInfoArray docks;
-    wxPaneInfoArray panes;
-    wxDockUIPartArray uiparts;
-    wxPaneInfo hint = GetPane(pane_window);
+    wxAuiDockInfoArray docks;
+    wxAuiPaneInfoArray panes;
+    wxAuiDockUIPartArray uiparts;
+    wxAuiPaneInfo hint = GetPane(pane_window);

     hint.name = wxT("__HINT__");
     hint.Show();
 
     if (!hint.IsOk())
     hint.name = wxT("__HINT__");
     hint.Show();
 
     if (!hint.IsOk())

-        return;
+        return rect;

 
     CopyDocksAndPanes(docks, panes, m_docks, m_panes);
 
 
     CopyDocksAndPanes(docks, panes, m_docks, m_panes);
 


@@ -3057,8 +3228,7 @@ void wxFrameManager::DrawHintRect(wxWindow* pane_window,
     // find out where the new pane would be
     if (!DoDrop(docks, panes, hint, pt, offset))
     {
     // find out where the new pane would be
     if (!DoDrop(docks, panes, hint, pt, offset))
     {

-        HideHint();
-        return;
+        return rect;

     }
 
     panes.Add(hint);
     }
 
     panes.Add(hint);


@@ -3071,9 +3241,9 @@ void wxFrameManager::DrawHintRect(wxWindow* pane_window,
     for (i = 0, part_count = uiparts.GetCount();
          i < part_count; ++i)
     {
     for (i = 0, part_count = uiparts.GetCount();
          i < part_count; ++i)
     {

-        wxDockUIPart& part = uiparts.Item(i);
+        wxAuiDockUIPart& part = uiparts.Item(i);

 
 

-        if (part.type == wxDockUIPart::typePaneBorder &&
+        if (part.type == wxAuiDockUIPart::typePaneBorder &&

             part.pane && part.pane->name == wxT("__HINT__"))
         {
             rect = wxRect(part.sizer_item->GetPosition(),
             part.pane && part.pane->name == wxT("__HINT__"))
         {
             rect = wxRect(part.sizer_item->GetPosition(),


@@ -3086,31 +3256,55 @@ void wxFrameManager::DrawHintRect(wxWindow* pane_window,
 
     if (rect.IsEmpty())
     {
 
     if (rect.IsEmpty())
     {

-        HideHint();
-        return;
+        return rect;

     }
 
     // actually show the hint rectangle on the screen
     m_frame->ClientToScreen(&rect.x, &rect.y);
     }
 
     // actually show the hint rectangle on the screen
     m_frame->ClientToScreen(&rect.x, &rect.y);

-    ShowHint(rect);
+
+    if ( m_frame->GetLayoutDirection() == wxLayout_RightToLeft )
+    {
+        // Mirror rectangle in RTL mode
+        rect.x -= rect.GetWidth();
+    }
+
+    return rect;

 }
 
 }
 

-void wxFrameManager::OnFloatingPaneMoveStart(wxWindow* wnd)
+// DrawHintRect() calculates the hint rectangle by calling
+// CalculateHintRect().  If there is a rectangle, it shows it
+// by calling ShowHint(), otherwise it hides any hint
+// rectangle currently shown
+void wxAuiManager::DrawHintRect(wxWindow* pane_window,
+                                const wxPoint& pt,
+                                const wxPoint& offset)
+{
+    wxRect rect = CalculateHintRect(pane_window, pt, offset);
+    
+    if (rect.IsEmpty())
+    {
+        HideHint();
+    }
+     else
+    {
+        ShowHint(rect);
+    }
+}
+
+void wxAuiManager::OnFloatingPaneMoveStart(wxWindow* wnd)

 {
     // try to find the pane
 {
     // try to find the pane

-    wxPaneInfo& pane = GetPane(wnd);
+    wxAuiPaneInfo& pane = GetPane(wnd);

     wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
 
     wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
 

-#if wxCHECK_VERSION(2,7,0)

     if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG)
         pane.frame->SetTransparent(150);
     if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG)
         pane.frame->SetTransparent(150);

-#endif

 }
 
 }
 

-void wxFrameManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir)
+void wxAuiManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir)

 {
     // try to find the pane
 {
     // try to find the pane

-    wxPaneInfo& pane = GetPane(wnd);
+    wxAuiPaneInfo& pane = GetPane(wnd);

     wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
 
     wxPoint pt = ::wxGetMousePosition();
     wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
 
     wxPoint pt = ::wxGetMousePosition();


@@ -3163,10 +3357,10 @@ void wxFrameManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir)
     {
         if (m_action == actionDragFloatingPane)
         {
     {
         if (m_action == actionDragFloatingPane)
         {

-            wxDockInfoArray docks;
-            wxPaneInfoArray panes;
-            wxDockUIPartArray uiparts;
-            wxPaneInfo hint = pane;
+            wxAuiDockInfoArray docks;
+            wxAuiPaneInfoArray panes;
+            wxAuiDockUIPartArray uiparts;
+            wxAuiPaneInfo hint = pane;

 
             CopyDocksAndPanes(docks, panes, m_docks, m_panes);
 
 
             CopyDocksAndPanes(docks, panes, m_docks, m_panes);
 


@@ -3210,10 +3404,10 @@ void wxFrameManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir)
     m_frame->Update();
 }
 
     m_frame->Update();
 }
 

-void wxFrameManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir)
+void wxAuiManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir)

 {
     // try to find the pane
 {
     // try to find the pane

-    wxPaneInfo& pane = GetPane(wnd);
+    wxAuiPaneInfo& pane = GetPane(wnd);

     wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
 
     wxPoint pt = ::wxGetMousePosition();
     wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
 
     wxPoint pt = ::wxGetMousePosition();


@@ -3276,11 +3470,11 @@ void wxFrameManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir)
     {
         pane.floating_pos = pane.frame->GetPosition();
 
     {
         pane.floating_pos = pane.frame->GetPosition();
 

-#if wxCHECK_VERSION(2,7,0)

         if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG)
             pane.frame->SetTransparent(255);
         if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG)
             pane.frame->SetTransparent(255);

-#endif
-    } else if(m_has_maximized) {
+    }
+     else if (m_has_maximized)
+    {

         RestoreMaximizedPane();
     }
 
         RestoreMaximizedPane();
     }
 


@@ -3289,25 +3483,25 @@ void wxFrameManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir)
     HideHint();
 }
 
     HideHint();
 }
 

-void wxFrameManager::OnFloatingPaneResized(wxWindow* wnd, const wxSize& size)
+void wxAuiManager::OnFloatingPaneResized(wxWindow* wnd, const wxSize& size)

 {
     // try to find the pane
 {
     // try to find the pane

-    wxPaneInfo& pane = GetPane(wnd);
+    wxAuiPaneInfo& pane = GetPane(wnd);

     wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
 
     pane.floating_size = size;
 }
 
 
     wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
 
     pane.floating_size = size;
 }
 
 

-void wxFrameManager::OnFloatingPaneClosed(wxWindow* wnd, wxCloseEvent& evt)
+void wxAuiManager::OnFloatingPaneClosed(wxWindow* wnd, wxCloseEvent& evt)

 {
     // try to find the pane
 {
     // try to find the pane

-    wxPaneInfo& pane = GetPane(wnd);
+    wxAuiPaneInfo& pane = GetPane(wnd);

     wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
 
 
     // fire pane close event
     wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
 
 
     // fire pane close event

-    wxFrameManagerEvent e(wxEVT_AUI_PANECLOSE);
+    wxAuiManagerEvent e(wxEVT_AUI_PANE_CLOSE);

     e.SetPane(&pane);
     e.SetCanVeto(evt.CanVeto());
     ProcessMgrEvent(e);
     e.SetPane(&pane);
     e.SetCanVeto(evt.CanVeto());
     ProcessMgrEvent(e);


@@ -3325,7 +3519,7 @@ void wxFrameManager::OnFloatingPaneClosed(wxWindow* wnd, wxCloseEvent& evt)
 
 
 
 
 
 

-void wxFrameManager::OnFloatingPaneActivated(wxWindow* wnd)
+void wxAuiManager::OnFloatingPaneActivated(wxWindow* wnd)

 {
     if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
     {
 {
     if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
     {


@@ -3341,7 +3535,7 @@ void wxFrameManager::OnFloatingPaneActivated(wxWindow* wnd)
 // backgrounds, captions, grippers, pane borders and buttons.
 // It renders the entire user interface.
 
 // backgrounds, captions, grippers, pane borders and buttons.
 // It renders the entire user interface.
 

-void wxFrameManager::OnRender(wxFrameManagerEvent& evt)
+void wxAuiManager::OnRender(wxAuiManagerEvent& evt)

 {
     wxDC* dc = evt.GetDC();
 
 {
     wxDC* dc = evt.GetDC();
 


@@ -3352,7 +3546,7 @@ void wxFrameManager::OnRender(wxFrameManagerEvent& evt)
     for (i = 0, part_count = m_uiparts.GetCount();
          i < part_count; ++i)
     {
     for (i = 0, part_count = m_uiparts.GetCount();
          i < part_count; ++i)
     {

-        wxDockUIPart& part = m_uiparts.Item(i);
+        wxAuiDockUIPart& part = m_uiparts.Item(i);

 
         // don't draw hidden pane items
         if (part.sizer_item && !part.sizer_item->IsShown())
 
         // don't draw hidden pane items
         if (part.sizer_item && !part.sizer_item->IsShown())


@@ -3360,23 +3554,23 @@ void wxFrameManager::OnRender(wxFrameManagerEvent& evt)
 
         switch (part.type)
         {
 
         switch (part.type)
         {

-            case wxDockUIPart::typeDockSizer:
-            case wxDockUIPart::typePaneSizer:
+            case wxAuiDockUIPart::typeDockSizer:
+            case wxAuiDockUIPart::typePaneSizer:

                 m_art->DrawSash(*dc, m_frame, part.orientation, part.rect);
                 break;
                 m_art->DrawSash(*dc, m_frame, part.orientation, part.rect);
                 break;

-            case wxDockUIPart::typeBackground:
+            case wxAuiDockUIPart::typeBackground:

                 m_art->DrawBackground(*dc, m_frame, part.orientation, part.rect);
                 break;
                 m_art->DrawBackground(*dc, m_frame, part.orientation, part.rect);
                 break;

-            case wxDockUIPart::typeCaption:
+            case wxAuiDockUIPart::typeCaption:

                 m_art->DrawCaption(*dc, m_frame, part.pane->caption, part.rect, *part.pane);
                 break;
                 m_art->DrawCaption(*dc, m_frame, part.pane->caption, part.rect, *part.pane);
                 break;

-            case wxDockUIPart::typeGripper:
+            case wxAuiDockUIPart::typeGripper:

                 m_art->DrawGripper(*dc, m_frame, part.rect, *part.pane);
                 break;
                 m_art->DrawGripper(*dc, m_frame, part.rect, *part.pane);
                 break;

-            case wxDockUIPart::typePaneBorder:
+            case wxAuiDockUIPart::typePaneBorder:

                 m_art->DrawBorder(*dc, m_frame, part.rect, *part.pane);
                 break;
                 m_art->DrawBorder(*dc, m_frame, part.rect, *part.pane);
                 break;

-            case wxDockUIPart::typePaneButton:
+            case wxAuiDockUIPart::typePaneButton:

                 m_art->DrawPaneButton(*dc, m_frame, part.button->button_id,
                         wxAUI_BUTTON_STATE_NORMAL, part.rect, *part.pane);
                 break;
                 m_art->DrawPaneButton(*dc, m_frame, part.button->button_id,
                         wxAUI_BUTTON_STATE_NORMAL, part.rect, *part.pane);
                 break;


@@ -3386,19 +3580,20 @@ void wxFrameManager::OnRender(wxFrameManagerEvent& evt)
 
 
 // Render() fire a render event, which is normally handled by
 
 
 // Render() fire a render event, which is normally handled by

-// wxFrameManager::OnRender().  This allows the render function to
+// wxAuiManager::OnRender().  This allows the render function to

 // be overridden via the render event.  This can be useful for paintin
 // custom graphics in the main window. Default behavior can be
 // invoked in the overridden function by calling OnRender()
 
 // be overridden via the render event.  This can be useful for paintin
 // custom graphics in the main window. Default behavior can be
 // invoked in the overridden function by calling OnRender()
 

-void wxFrameManager::Render(wxDC* dc)
+void wxAuiManager::Render(wxDC* dc)

 {
 {

-    wxFrameManagerEvent e(wxEVT_AUI_RENDER);
+    wxAuiManagerEvent e(wxEVT_AUI_RENDER);
+    e.SetManager(this);

     e.SetDC(dc);
     ProcessMgrEvent(e);
 }
 
     e.SetDC(dc);
     ProcessMgrEvent(e);
 }
 

-void wxFrameManager::Repaint(wxDC* dc)
+void wxAuiManager::Repaint(wxDC* dc)

 {
 #ifdef __WXMAC__
     if ( dc == NULL )
 {
 #ifdef __WXMAC__
     if ( dc == NULL )


@@ -3435,13 +3630,13 @@ void wxFrameManager::Repaint(wxDC* dc)
         delete client_dc;
 }
 
         delete client_dc;
 }
 

-void wxFrameManager::OnPaint(wxPaintEvent& WXUNUSED(event))
+void wxAuiManager::OnPaint(wxPaintEvent& WXUNUSED(event))

 {
     wxPaintDC dc(m_frame);
     Repaint(&dc);
 }
 
 {
     wxPaintDC dc(m_frame);
     Repaint(&dc);
 }
 

-void wxFrameManager::OnEraseBackground(wxEraseEvent& event)
+void wxAuiManager::OnEraseBackground(wxEraseEvent& event)

 {
 #ifdef __WXMAC__
     event.Skip() ;
 {
 #ifdef __WXMAC__
     event.Skip() ;


@@ -3450,31 +3645,63 @@ void wxFrameManager::OnEraseBackground(wxEraseEvent& event)
 #endif
 }
 
 #endif
 }
 

-void wxFrameManager::OnSize(wxSizeEvent& event)
+void wxAuiManager::OnSize(wxSizeEvent& event)

 {
     if (m_frame)
     {
         DoFrameLayout();
         Repaint();
 {
     if (m_frame)
     {
         DoFrameLayout();
         Repaint();

+        
+#if wxUSE_MDI
+        if (m_frame->IsKindOf(CLASSINFO(wxMDIParentFrame)))
+        {
+            // for MDI parent frames, this event must not
+            // be "skipped".  In other words, the parent frame
+            // must not be allowed to resize the client window
+            // after we are finished processing sizing changes
+            return;
+        }
+#endif

     }
     event.Skip();
 }
 
     }
     event.Skip();
 }
 

+void wxAuiManager::OnFindManager(wxAuiManagerEvent& evt)
+{
+    // get the window we are managing, if none, return NULL
+    wxWindow* window = GetManagedWindow();
+    if (!window)
+    {
+        evt.SetManager(NULL);
+        return;
+    }
+    
+    // if we are managing a child frame, get the 'real' manager
+    if (window->IsKindOf(CLASSINFO(wxAuiFloatingFrame)))
+    {
+        wxAuiFloatingFrame* float_frame = static_cast<wxAuiFloatingFrame*>(window);
+        evt.SetManager(float_frame->GetOwnerManager());
+        return;
+    }
+        
+    // return pointer to ourself
+    evt.SetManager(this);
+}

 
 

-void wxFrameManager::OnSetCursor(wxSetCursorEvent& event)
+void wxAuiManager::OnSetCursor(wxSetCursorEvent& event)

 {
     // determine cursor
 {
     // determine cursor

-    wxDockUIPart* part = HitTest(event.GetX(), event.GetY());
+    wxAuiDockUIPart* part = HitTest(event.GetX(), event.GetY());

     wxCursor cursor = wxNullCursor;
 
     if (part)
     {
     wxCursor cursor = wxNullCursor;
 
     if (part)
     {

-        if (part->type == wxDockUIPart::typeDockSizer ||
-            part->type == wxDockUIPart::typePaneSizer)
+        if (part->type == wxAuiDockUIPart::typeDockSizer ||
+            part->type == wxAuiDockUIPart::typePaneSizer)

         {
             // a dock may not be resized if it has a single
             // pane which is not resizable
         {
             // a dock may not be resized if it has a single
             // pane which is not resizable

-            if (part->type == wxDockUIPart::typeDockSizer && part->dock &&
+            if (part->type == wxAuiDockUIPart::typeDockSizer && part->dock &&

                 part->dock->panes.GetCount() == 1 &&
                 part->dock->panes.Item(0)->IsFixed())
                     return;
                 part->dock->panes.GetCount() == 1 &&
                 part->dock->panes.Item(0)->IsFixed())
                     return;


@@ -3488,7 +3715,7 @@ void wxFrameManager::OnSetCursor(wxSetCursorEvent& event)
                  else
                 cursor = wxCursor(wxCURSOR_SIZENS);
         }
                  else
                 cursor = wxCursor(wxCURSOR_SIZENS);
         }

-         else if (part->type == wxDockUIPart::typeGripper)
+         else if (part->type == wxAuiDockUIPart::typeGripper)

         {
             cursor = wxCursor(wxCURSOR_SIZING);
         }
         {
             cursor = wxCursor(wxCURSOR_SIZING);
         }


@@ -3499,11 +3726,13 @@ void wxFrameManager::OnSetCursor(wxSetCursorEvent& event)
 
 
 
 
 
 

-void wxFrameManager::UpdateButtonOnScreen(wxDockUIPart* button_ui_part,
-                                          const wxMouseEvent& event)
+void wxAuiManager::UpdateButtonOnScreen(wxAuiDockUIPart* button_ui_part,
+                                        const wxMouseEvent& event)

 {
 {

-    wxDockUIPart* hit_test = HitTest(event.GetX(), event.GetY());
-
+    wxAuiDockUIPart* hit_test = HitTest(event.GetX(), event.GetY());
+    if (!hit_test || !button_ui_part)
+        return;
+        

     int state = wxAUI_BUTTON_STATE_NORMAL;
 
     if (hit_test == button_ui_part)
     int state = wxAUI_BUTTON_STATE_NORMAL;
 
     if (hit_test == button_ui_part)


@@ -3538,20 +3767,20 @@ void wxFrameManager::UpdateButtonOnScreen(wxDockUIPart* button_ui_part,
     }
 }
 
     }
 }
 

-void wxFrameManager::OnLeftDown(wxMouseEvent& event)
+void wxAuiManager::OnLeftDown(wxMouseEvent& event)

 {
 {

-    wxDockUIPart* part = HitTest(event.GetX(), event.GetY());
+    wxAuiDockUIPart* part = HitTest(event.GetX(), event.GetY());

     if (part)
     {
     if (part)
     {

-        if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
-            return;
-
-        if (part->type == wxDockUIPart::typeDockSizer ||
-            part->type == wxDockUIPart::typePaneSizer)
+        if (part->type == wxAuiDockUIPart::typeDockSizer ||
+            part->type == wxAuiDockUIPart::typePaneSizer)

         {
         {

+            if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
+                return;
+        

             // a dock may not be resized if it has a single
             // pane which is not resizable
             // a dock may not be resized if it has a single
             // pane which is not resizable

-            if (part->type == wxDockUIPart::typeDockSizer && part->dock &&
+            if (part->type == wxAuiDockUIPart::typeDockSizer && part->dock &&

                 part->dock->panes.GetCount() == 1 &&
                 part->dock->panes.Item(0)->IsFixed())
                     return;
                 part->dock->panes.GetCount() == 1 &&
                 part->dock->panes.Item(0)->IsFixed())
                     return;


@@ -3568,7 +3797,7 @@ void wxFrameManager::OnLeftDown(wxMouseEvent& event)
                                       event.m_y - part->rect.y);
             m_frame->CaptureMouse();
         }
                                       event.m_y - part->rect.y);
             m_frame->CaptureMouse();
         }

-         else if (part->type == wxDockUIPart::typePaneButton)
+         else if (part->type == wxAuiDockUIPart::typePaneButton)

         {
             m_action = actionClickButton;
             m_action_part = part;
         {
             m_action = actionClickButton;
             m_action_part = part;


@@ -3577,9 +3806,32 @@ void wxFrameManager::OnLeftDown(wxMouseEvent& event)
 
             UpdateButtonOnScreen(part, event);
         }
 
             UpdateButtonOnScreen(part, event);
         }

-         else if (part->type == wxDockUIPart::typeCaption ||
-                  part->type == wxDockUIPart::typeGripper)
+         else if (part->type == wxAuiDockUIPart::typeCaption ||
+                  part->type == wxAuiDockUIPart::typeGripper)

         {
         {

+            // if we are managing a wxAuiFloatingFrame window, then
+            // we are an embedded wxAuiManager inside the wxAuiFloatingFrame.
+            // We want to initiate a toolbar drag in our owner manager
+            wxWindow* managed_wnd = GetManagedWindow();
+            
+            if (part->pane && 
+                part->pane->window &&
+                managed_wnd &&
+                managed_wnd->IsKindOf(CLASSINFO(wxAuiFloatingFrame)))
+            {
+                wxAuiFloatingFrame* floating_frame = (wxAuiFloatingFrame*)managed_wnd;
+                wxAuiManager* owner_mgr = floating_frame->GetOwnerManager();
+                owner_mgr->StartPaneDrag(part->pane->window,
+                                             wxPoint(event.m_x - part->rect.x,
+                                                     event.m_y - part->rect.y));
+                return;
+            }
+            
+        
+        
+            if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
+                return;
+

             if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
             {
                 // set the caption as active
             if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
             {
                 // set the caption as active


@@ -3612,7 +3864,7 @@ void wxFrameManager::OnLeftDown(wxMouseEvent& event)
 }
 
 
 }
 
 

-void wxFrameManager::OnLeftUp(wxMouseEvent& event)
+void wxAuiManager::OnLeftUp(wxMouseEvent& event)

 {
     if (m_action == actionResize)
     {
 {
     if (m_action == actionResize)
     {


@@ -3623,7 +3875,7 @@ void wxFrameManager::OnLeftUp(wxMouseEvent& event)
         DrawResizeHint(dc, m_action_hintrect);
 
         // resize the dock or the pane
         DrawResizeHint(dc, m_action_hintrect);
 
         // resize the dock or the pane

-        if (m_action_part && m_action_part->type==wxDockUIPart::typeDockSizer)
+        if (m_action_part && m_action_part->type==wxAuiDockUIPart::typeDockSizer)

         {
             wxRect& rect = m_action_part->dock->rect;
 
         {
             wxRect& rect = m_action_part->dock->rect;
 


@@ -3652,24 +3904,24 @@ void wxFrameManager::OnLeftUp(wxMouseEvent& event)
             Repaint(NULL);
         }
          else if (m_action_part &&
             Repaint(NULL);
         }
          else if (m_action_part &&

-                  m_action_part->type == wxDockUIPart::typePaneSizer)
+                  m_action_part->type == wxAuiDockUIPart::typePaneSizer)

         {
         {

-            wxDockInfo& dock = *m_action_part->dock;
-            wxPaneInfo& pane = *m_action_part->pane;
+            wxAuiDockInfo& dock = *m_action_part->dock;
+            wxAuiPaneInfo& pane = *m_action_part->pane;

 
             int total_proportion = 0;
             int dock_pixels = 0;
             int new_pixsize = 0;
 
 
             int total_proportion = 0;
             int dock_pixels = 0;
             int new_pixsize = 0;
 

-            int caption_size = m_art->GetMetric(wxAUI_ART_CAPTION_SIZE);
-            int pane_border_size = m_art->GetMetric(wxAUI_ART_PANE_BORDER_SIZE);
-            int sash_size = m_art->GetMetric(wxAUI_ART_SASH_SIZE);
+            int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE);
+            int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE);
+            int sash_size = m_art->GetMetric(wxAUI_DOCKART_SASH_SIZE);

 
             wxPoint new_pos(event.m_x - m_action_offset.x,
                             event.m_y - m_action_offset.y);
 
             // determine the pane rectangle by getting the pane part
 
             wxPoint new_pos(event.m_x - m_action_offset.x,
                             event.m_y - m_action_offset.y);
 
             // determine the pane rectangle by getting the pane part

-            wxDockUIPart* pane_part = GetPanePart(pane.window);
+            wxAuiDockUIPart* pane_part = GetPanePart(pane.window);

             wxASSERT_MSG(pane_part,
                        wxT("Pane border part not found -- shouldn't happen"));
 
             wxASSERT_MSG(pane_part,
                        wxT("Pane border part not found -- shouldn't happen"));
 


@@ -3693,7 +3945,7 @@ void wxFrameManager::OnLeftUp(wxMouseEvent& event)
             int pane_position = -1;
             for (i = 0; i < dock_pane_count; ++i)
             {
             int pane_position = -1;
             for (i = 0; i < dock_pane_count; ++i)
             {

-                wxPaneInfo& p = *dock.panes.Item(i);
+                wxAuiPaneInfo& p = *dock.panes.Item(i);

                 if (p.window == pane.window)
                     pane_position = i;
 
                 if (p.window == pane.window)
                     pane_position = i;
 


@@ -3726,7 +3978,7 @@ void wxFrameManager::OnLeftUp(wxMouseEvent& event)
             int borrow_pane = -1;
             for (i = pane_position+1; i < dock_pane_count; ++i)
             {
             int borrow_pane = -1;
             for (i = pane_position+1; i < dock_pane_count; ++i)
             {

-                wxPaneInfo& p = *dock.panes.Item(i);
+                wxAuiPaneInfo& p = *dock.panes.Item(i);

                 if (!p.IsFixed())
                 {
                     borrow_pane = i;
                 if (!p.IsFixed())
                 {
                     borrow_pane = i;


@@ -3812,7 +4064,8 @@ void wxFrameManager::OnLeftUp(wxMouseEvent& event)
         if (m_action_part == HitTest(event.GetX(), event.GetY()))
         {
             // fire button-click event
         if (m_action_part == HitTest(event.GetX(), event.GetY()))
         {
             // fire button-click event

-            wxFrameManagerEvent e(wxEVT_AUI_PANEBUTTON);
+            wxAuiManagerEvent e(wxEVT_AUI_PANE_BUTTON);
+            e.SetManager(this);

             e.SetPane(m_action_part->pane);
             e.SetButton(m_action_part->button->button_id);
             ProcessMgrEvent(e);
             e.SetPane(m_action_part->pane);
             e.SetButton(m_action_part->button->button_id);
             ProcessMgrEvent(e);


@@ -3830,16 +4083,16 @@ void wxFrameManager::OnLeftUp(wxMouseEvent& event)
     {
         m_frame->ReleaseMouse();
 
     {
         m_frame->ReleaseMouse();
 

-        wxPaneInfo& pane = GetPane(m_action_window);
+        wxAuiPaneInfo& pane = GetPane(m_action_window);

         wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
 
         // save the new positions
         wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
 
         // save the new positions

-        wxDockInfoPtrArray docks;
+        wxAuiDockInfoPtrArray docks;

         FindDocks(m_docks, pane.dock_direction,
                   pane.dock_layer, pane.dock_row, docks);
         if (docks.GetCount() == 1)
         {
         FindDocks(m_docks, pane.dock_direction,
                   pane.dock_layer, pane.dock_row, docks);
         if (docks.GetCount() == 1)
         {

-            wxDockInfo& dock = *docks.Item(0);
+            wxAuiDockInfo& dock = *docks.Item(0);

 
             wxArrayInt pane_positions, pane_sizes;
             GetPanePositionsAndSizes(dock, pane_positions, pane_sizes);
 
             wxArrayInt pane_positions, pane_sizes;
             GetPanePositionsAndSizes(dock, pane_positions, pane_sizes);


@@ -3849,7 +4102,7 @@ void wxFrameManager::OnLeftUp(wxMouseEvent& event)
                 dock.panes.Item(i)->dock_pos = pane_positions[i];
         }
 
                 dock.panes.Item(i)->dock_pos = pane_positions[i];
         }
 

-        pane.state &= ~wxPaneInfo::actionPane;
+        pane.state &= ~wxAuiPaneInfo::actionPane;

         Update();
     }
     else
         Update();
     }
     else


@@ -3862,7 +4115,7 @@ void wxFrameManager::OnLeftUp(wxMouseEvent& event)
 }
 
 
 }
 
 

-void wxFrameManager::OnMotion(wxMouseEvent& event)
+void wxAuiManager::OnMotion(wxMouseEvent& event)

 {
     // sometimes when Update() is called from inside this method,
     // a spurious mouse move event is generated; this check will make
 {
     // sometimes when Update() is called from inside this method,
     // a spurious mouse move event is generated; this check will make


@@ -3904,7 +4157,7 @@ void wxFrameManager::OnMotion(wxMouseEvent& event)
         if (abs(event.m_x - m_action_start.x) > drag_x_threshold ||
             abs(event.m_y - m_action_start.y) > drag_y_threshold)
         {
         if (abs(event.m_x - m_action_start.x) > drag_x_threshold ||
             abs(event.m_y - m_action_start.y) > drag_y_threshold)
         {

-            wxPaneInfo* pane_info = m_action_part->pane;
+            wxAuiPaneInfo* pane_info = m_action_part->pane;

 
             if (!pane_info->IsToolbar())
             {
 
             if (!pane_info->IsToolbar())
             {


@@ -3919,9 +4172,8 @@ void wxFrameManager::OnMotion(wxMouseEvent& event)
                                                       pt.y - m_action_offset.y);
 
                     // float the window
                                                       pt.y - m_action_offset.y);
 
                     // float the window

-                    if(pane_info->IsMaximized()) {
+                    if (pane_info->IsMaximized())

                         RestorePane(*pane_info);
                         RestorePane(*pane_info);

-                    }

                     pane_info->Float();
                     Update();
 
                     pane_info->Float();
                     Update();
 


@@ -3946,7 +4198,8 @@ void wxFrameManager::OnMotion(wxMouseEvent& event)
     }
     else if (m_action == actionDragFloatingPane)
     {
     }
     else if (m_action == actionDragFloatingPane)
     {

-        if(m_action_window) {
+        if (m_action_window)
+        {

             wxPoint pt = m_frame->ClientToScreen(event.GetPosition());
             m_action_window->Move(pt.x - m_action_offset.x,
                                 pt.y - m_action_offset.y);
             wxPoint pt = m_frame->ClientToScreen(event.GetPosition());
             m_action_window->Move(pt.x - m_action_offset.x,
                                 pt.y - m_action_offset.y);


@@ -3954,10 +4207,10 @@ void wxFrameManager::OnMotion(wxMouseEvent& event)
     }
     else if (m_action == actionDragToolbarPane)
     {
     }
     else if (m_action == actionDragToolbarPane)
     {

-        wxPaneInfo& pane = GetPane(m_action_window);
+        wxAuiPaneInfo& pane = GetPane(m_action_window);

         wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
 
         wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
 

-        pane.state |= wxPaneInfo::actionPane;
+        pane.state |= wxAuiPaneInfo::actionPane;

 
         wxPoint pt = event.GetPosition();
         DoDrop(m_docks, m_panes, pane, pt, m_action_offset);
 
         wxPoint pt = event.GetPosition();
         DoDrop(m_docks, m_panes, pane, pt, m_action_offset);


@@ -3982,15 +4235,15 @@ void wxFrameManager::OnMotion(wxMouseEvent& event)
         // EVT_MOTION() events will move the floating pane
         if (pane.IsFloating())
         {
         // EVT_MOTION() events will move the floating pane
         if (pane.IsFloating())
         {

-            pane.state &= ~wxPaneInfo::actionPane;
+            pane.state &= ~wxAuiPaneInfo::actionPane;

             m_action = actionDragFloatingPane;
             m_action_window = pane.frame;
         }
     }
     else
     {
             m_action = actionDragFloatingPane;
             m_action_window = pane.frame;
         }
     }
     else
     {

-        wxDockUIPart* part = HitTest(event.GetX(), event.GetY());
-        if (part && part->type == wxDockUIPart::typePaneButton)
+        wxAuiDockUIPart* part = HitTest(event.GetX(), event.GetY());
+        if (part && part->type == wxAuiDockUIPart::typePaneButton)

         {
             if (part != m_hover_button)
             {
         {
             if (part != m_hover_button)
             {


@@ -4023,7 +4276,7 @@ void wxFrameManager::OnMotion(wxMouseEvent& event)
     }
 }
 
     }
 }
 

-void wxFrameManager::OnLeaveWindow(wxMouseEvent& WXUNUSED(event))
+void wxAuiManager::OnLeaveWindow(wxMouseEvent& WXUNUSED(event))

 {
     if (m_hover_button)
     {
 {
     if (m_hover_button)
     {


@@ -4032,7 +4285,7 @@ void wxFrameManager::OnLeaveWindow(wxMouseEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

-void wxFrameManager::OnChildFocus(wxChildFocusEvent& event)
+void wxAuiManager::OnChildFocus(wxChildFocusEvent& event)

 {
     // when a child pane has it's focus set, we should change the
     // pane's active state to reflect this. (this is only true if
 {
     // when a child pane has it's focus set, we should change the
     // pane's active state to reflect this. (this is only true if


@@ -4052,16 +4305,17 @@ void wxFrameManager::OnChildFocus(wxChildFocusEvent& event)
 
 // OnPaneButton() is an event handler that is called
 // when a pane button has been pressed.
 
 // OnPaneButton() is an event handler that is called
 // when a pane button has been pressed.

-void wxFrameManager::OnPaneButton(wxFrameManagerEvent& evt)
+void wxAuiManager::OnPaneButton(wxAuiManagerEvent& evt)

 {
 {

-    wxASSERT_MSG(evt.pane, wxT("Pane Info passed to wxFrameManager::OnPaneButton must be non-null"));
+    wxASSERT_MSG(evt.pane, wxT("Pane Info passed to wxAuiManager::OnPaneButton must be non-null"));

 
 

-    wxPaneInfo& pane = *(evt.pane);
+    wxAuiPaneInfo& pane = *(evt.pane);

 
     if (evt.button == wxAUI_BUTTON_CLOSE)
     {
         // fire pane close event
 
     if (evt.button == wxAUI_BUTTON_CLOSE)
     {
         // fire pane close event

-        wxFrameManagerEvent e(wxEVT_AUI_PANECLOSE);
+        wxAuiManagerEvent e(wxEVT_AUI_PANE_CLOSE);
+        e.SetManager(this);

         e.SetPane(evt.pane);
         ProcessMgrEvent(e);
 
         e.SetPane(evt.pane);
         ProcessMgrEvent(e);
 


@@ -4074,7 +4328,8 @@ void wxFrameManager::OnPaneButton(wxFrameManagerEvent& evt)
     else if (evt.button == wxAUI_BUTTON_MAXIMIZE_RESTORE && !pane.IsMaximized())
     {
         // fire pane close event
     else if (evt.button == wxAUI_BUTTON_MAXIMIZE_RESTORE && !pane.IsMaximized())
     {
         // fire pane close event

-        wxFrameManagerEvent e(wxEVT_AUI_PANEMAXIMIZE);
+        wxAuiManagerEvent e(wxEVT_AUI_PANE_MAXIMIZE);
+        e.SetManager(this);

         e.SetPane(evt.pane);
         ProcessMgrEvent(e);
 
         e.SetPane(evt.pane);
         ProcessMgrEvent(e);
 


@@ -4087,7 +4342,8 @@ void wxFrameManager::OnPaneButton(wxFrameManagerEvent& evt)
     else if (evt.button == wxAUI_BUTTON_MAXIMIZE_RESTORE && pane.IsMaximized())
     {
         // fire pane close event
     else if (evt.button == wxAUI_BUTTON_MAXIMIZE_RESTORE && pane.IsMaximized())
     {
         // fire pane close event

-        wxFrameManagerEvent e(wxEVT_AUI_PANERESTORE);
+        wxAuiManagerEvent e(wxEVT_AUI_PANE_RESTORE);
+        e.SetManager(this);

         e.SetPane(evt.pane);
         ProcessMgrEvent(e);
 
         e.SetPane(evt.pane);
         ProcessMgrEvent(e);