Don't needlessly indirect through NSNotificationCenter.

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

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index ea05d8bbd7adec74f0ecc33fd7fdcc0ac8366f38..93379c808761f993bb1cb651fa9b5adc476aca29 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -28,6 +28,7 @@
 #include "wx/aui/framemanager.h"
 #include "wx/aui/dockart.h"
 #include "wx/aui/floatpane.h"
 #include "wx/aui/framemanager.h"
 #include "wx/aui/dockart.h"
 #include "wx/aui/floatpane.h"

+#include "wx/aui/tabmdi.h"

 
 #ifndef WX_PRECOMP
     #include "wx/panel.h"
 
 #ifndef WX_PRECOMP
     #include "wx/panel.h"


@@ -151,7 +152,7 @@ public:
             wxRect rect(upd.GetRect());
             dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
 
             wxRect rect(upd.GetRect());
             dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
 

-            upd++;
+            ++upd;

         }
     }
 
         }
     }
 


@@ -502,7 +503,7 @@ wxAuiManager::wxAuiManager(wxWindow* managed_wnd, unsigned int flags)
     m_dock_constraint_x = 0.3;
     m_dock_constraint_y = 0.3;
     m_reserved = NULL;
     m_dock_constraint_x = 0.3;
     m_dock_constraint_y = 0.3;
     m_reserved = NULL;

-    
+

     if (managed_wnd)
     {
         SetManagedWindow(managed_wnd);
     if (managed_wnd)
     {
         SetManagedWindow(managed_wnd);


@@ -511,6 +512,13 @@ wxAuiManager::wxAuiManager(wxWindow* managed_wnd, unsigned int flags)
 
 wxAuiManager::~wxAuiManager()
 {
 
 wxAuiManager::~wxAuiManager()
 {

+    for ( size_t i = 0; i < m_panes.size(); i++ )
+    {
+        wxAuiPaneInfo& pinfo = m_panes[i];
+        if (pinfo.window && !pinfo.window->GetParent())
+            delete pinfo.window;
+    }
+

     delete m_art;
 }
 
     delete m_art;
 }
 


@@ -612,7 +620,7 @@ void wxAuiManager::SetFlags(unsigned int flags)
 
     // set the new flags
     m_flags = flags;
 
     // set the new flags
     m_flags = flags;

-    
+

     if (update_hint_wnd)
     {
         UpdateHintWindowConfig();
     if (update_hint_wnd)
     {
         UpdateHintWindowConfig();


@@ -650,7 +658,7 @@ wxAuiManager* wxAuiManager::GetManager(wxWindow* window)
     evt.ResumePropagation(wxEVENT_PROPAGATE_MAX);
     if (!window->ProcessEvent(evt))
         return NULL;
     evt.ResumePropagation(wxEVENT_PROPAGATE_MAX);
     if (!window->ProcessEvent(evt))
         return NULL;

-        
+

     return evt.GetManager();
 }
 
     return evt.GetManager();
 }
 


@@ -659,7 +667,7 @@ 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;

-    
+

     wxWindow* w = m_frame;
     while (w)
     {
     wxWindow* w = m_frame;
     while (w)
     {


@@ -669,10 +677,10 @@ void wxAuiManager::UpdateHintWindowConfig()
             can_do_transparent = f->CanSetTransparent();
             break;
         }
             can_do_transparent = f->CanSetTransparent();
             break;
         }

-        
+

         w = w->GetParent();
     }
         w = w->GetParent();
     }

-    
+

     // if there is an existing hint window, delete it
     if (m_hint_wnd)
     {
     // if there is an existing hint window, delete it
     if (m_hint_wnd)
     {


@@ -682,9 +690,9 @@ void wxAuiManager::UpdateHintWindowConfig()
 
     m_hint_fademax = 50;
     m_hint_wnd = NULL;
 
     m_hint_fademax = 50;
     m_hint_wnd = NULL;

-    
+

     if ((m_flags & wxAUI_MGR_TRANSPARENT_HINT) && can_do_transparent)
     if ((m_flags & wxAUI_MGR_TRANSPARENT_HINT) && can_do_transparent)

-    { 
+    {

         // Make a window to use for a transparent hint
         #if defined(__WXMSW__) || defined(__WXGTK__)
             m_hint_wnd = new wxFrame(m_frame, wxID_ANY, wxEmptyString,
         // Make a window to use for a transparent hint
         #if defined(__WXMSW__) || defined(__WXGTK__)
             m_hint_wnd = new wxFrame(m_frame, wxID_ANY, wxEmptyString,


@@ -712,9 +720,9 @@ void wxAuiManager::UpdateHintWindowConfig()
             // blue.
             p->SetBackgroundColour(*wxBLUE);
         #endif
             // blue.
             p->SetBackgroundColour(*wxBLUE);
         #endif

-        
+

     }
     }

-     else
+    else

     {
         if ((m_flags & wxAUI_MGR_TRANSPARENT_HINT) != 0 ||
             (m_flags & wxAUI_MGR_VENETIAN_BLINDS_HINT) != 0)
     {
         if ((m_flags & wxAUI_MGR_TRANSPARENT_HINT) != 0 ||
             (m_flags & wxAUI_MGR_VENETIAN_BLINDS_HINT) != 0)


@@ -762,6 +770,17 @@ void wxAuiManager::SetManagedWindow(wxWindow* wnd)
                 wxAuiPaneInfo().Name(wxT("mdiclient")).
                 CenterPane().PaneBorder(false));
     }
                 wxAuiPaneInfo().Name(wxT("mdiclient")).
                 CenterPane().PaneBorder(false));
     }

+    else if (m_frame->IsKindOf(CLASSINFO(wxAuiMDIParentFrame)))
+    {
+        wxAuiMDIParentFrame* mdi_frame = (wxAuiMDIParentFrame*)m_frame;
+        wxAuiMDIClientWindow* client_window = mdi_frame->GetClientWindow();
+        wxASSERT_MSG(client_window, wxT("Client window is NULL!"));
+
+        AddPane(client_window,
+                wxAuiPaneInfo().Name(wxT("mdiclient")).
+                CenterPane().PaneBorder(false));
+    }
+

 #endif
 
     UpdateHintWindowConfig();
 #endif
 
     UpdateHintWindowConfig();


@@ -872,14 +891,14 @@ bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info)
         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.HasPinButton())
     {
         wxAuiPaneButton button;
         button.button_id = wxAUI_BUTTON_PIN;
         pinfo.buttons.Add(button);
     }

-    
+

     if (pinfo.HasCloseButton())
     {
         wxAuiPaneButton button;
     if (pinfo.HasCloseButton())
     {
         wxAuiPaneButton button;


@@ -904,7 +923,8 @@ bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info)
             // I believe this to be the correct action, until
             // wxToolBar::GetBestSize() is fixed.  Is this assumption
             // correct?
             // I believe this to be the correct action, until
             // wxToolBar::GetBestSize() is fixed.  Is this assumption
             // correct?

-            pinfo.best_size.y++;
+            // commented out by JACS 2007-9-08 after having added a pixel in wxMSW's wxToolBar::DoGetBestSize()
+            // pinfo.best_size.y++;

         }
 
         if (pinfo.min_size != wxDefaultSize)
         }
 
         if (pinfo.min_size != wxDefaultSize)


@@ -983,7 +1003,7 @@ bool wxAuiManager::InsertPane(wxWindow* window, const wxAuiPaneInfo& pane_info,
     {
         return AddPane(window, pane_info);
     }
     {
         return AddPane(window, pane_info);
     }

-     else
+    else

     {
         if (pane_info.IsFloating())
         {
     {
         if (pane_info.IsFloating())
         {


@@ -993,7 +1013,7 @@ bool wxAuiManager::InsertPane(wxWindow* window, const wxAuiPaneInfo& pane_info,
             if (pane_info.floating_size != wxDefaultSize)
                 existing_pane.FloatingSize(pane_info.floating_size);
         }
             if (pane_info.floating_size != wxDefaultSize)
                 existing_pane.FloatingSize(pane_info.floating_size);
         }

-         else
+        else

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


@@ -1035,7 +1055,7 @@ bool wxAuiManager::DetachPane(wxWindow* window)
                 {
                     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();


@@ -1096,7 +1116,7 @@ void wxAuiManager::ClosePane(wxAuiPaneInfo& pane_info)
     }
 
     // now we need to either destroy or hide the pane
     }
 
     // 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);


@@ -1104,8 +1124,8 @@ void wxAuiManager::ClosePane(wxAuiPaneInfo& pane_info)
         {
             window->Destroy();
         }
         {
             window->Destroy();
         }

-    } 
-    else 
+    }
+    else

     {
         pane_info.Hide();
     }
     {
         pane_info.Hide();
     }


@@ -1122,7 +1142,7 @@ void wxAuiManager::MaximizePane(wxAuiPaneInfo& pane_info)
         if (!p.IsToolbar())
         {
             p.Restore();
         if (!p.IsToolbar())
         {
             p.Restore();

-            
+

             // save hidden state
             p.SetFlag(wxAuiPaneInfo::savedHiddenState,
                       p.HasFlag(wxAuiPaneInfo::optionHidden));
             // save hidden state
             p.SetFlag(wxAuiPaneInfo::savedHiddenState,
                       p.HasFlag(wxAuiPaneInfo::optionHidden));


@@ -1478,7 +1498,7 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock,
                 size += gripper_size;
             size += pane.best_size.x;
         }
                 size += gripper_size;
             size += pane.best_size.x;
         }

-         else
+        else

         {
             if (pane.HasGripper() && pane.HasGripperTop())
                 size += gripper_size;
         {
             if (pane.HasGripper() && pane.HasGripperTop())
                 size += gripper_size;


@@ -1503,7 +1523,7 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock,
 
         if (amount >= 0)
             offset += amount;
 
         if (amount >= 0)
             offset += amount;

-             else
+        else

             positions[pane_i] -= -amount;
 
         offset += sizes[pane_i];
             positions[pane_i] -= -amount;
 
         offset += sizes[pane_i];


@@ -1517,7 +1537,7 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock,
         int amount = positions[pane_i] - offset;
         if (amount >= 0)
             offset += amount;
         int amount = positions[pane_i] - offset;
         if (amount >= 0)
             offset += amount;

-             else
+        else

             positions[pane_i] += -amount;
 
         offset += sizes[pane_i];
             positions[pane_i] += -amount;
 
         offset += sizes[pane_i];


@@ -1544,7 +1564,7 @@ void wxAuiManager::LayoutAddPane(wxSizer* cont,
     int orientation;
     if (dock.IsHorizontal())
         orientation = wxHORIZONTAL;
     int orientation;
     if (dock.IsHorizontal())
         orientation = wxHORIZONTAL;

-         else
+    else

         orientation = wxVERTICAL;
 
     // this variable will store the proportion
         orientation = wxVERTICAL;
 
     // this variable will store the proportion


@@ -1608,7 +1628,7 @@ void wxAuiManager::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)
         // if we have buttons, add a little space to the right
         // of them to ease visual crowding
         if (button_count >= 1)


@@ -1689,7 +1709,7 @@ void wxAuiManager::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);
     }


@@ -1742,7 +1762,7 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont,
         {
             wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i));
             int pane_pos = pane_positions.Item(pane_i);
         {
             wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i));
             int pane_pos = pane_positions.Item(pane_i);

-            
+

             if (pane.IsMaximized())
                 has_maximized_pane = true;
 
             if (pane.IsMaximized())
                 has_maximized_pane = true;
 


@@ -1752,7 +1772,7 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont,
             {
                 if (dock.IsVertical())
                     sizer_item = dock_sizer->Add(1, amount, 0, wxEXPAND);
             {
                 if (dock.IsVertical())
                     sizer_item = dock_sizer->Add(1, amount, 0, wxEXPAND);

-                     else
+                else

                     sizer_item = dock_sizer->Add(amount, 1, 0, wxEXPAND);
 
                 part.type = wxAuiDockUIPart::typeBackground;
                     sizer_item = dock_sizer->Add(amount, 1, 0, wxEXPAND);
 
                 part.type = wxAuiDockUIPart::typeBackground;


@@ -1789,7 +1809,7 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont,
         for (pane_i = 0; pane_i < pane_count; ++pane_i)
         {
             wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i));
         for (pane_i = 0; pane_i < pane_count; ++pane_i)
         {
             wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i));

-            
+

             if (pane.IsMaximized())
                 has_maximized_pane = true;
 
             if (pane.IsMaximized())
                 has_maximized_pane = true;
 


@@ -1815,7 +1835,7 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont,
 
     if (dock.dock_direction == wxAUI_DOCK_CENTER || has_maximized_pane)
         sizer_item = cont->Add(dock_sizer, 1, wxEXPAND);
 
     if (dock.dock_direction == wxAUI_DOCK_CENTER || has_maximized_pane)
         sizer_item = cont->Add(dock_sizer, 1, wxEXPAND);

-         else
+    else

         sizer_item = cont->Add(dock_sizer, 0, wxEXPAND);
 
     part.type = wxAuiDockUIPart::typeDock;
         sizer_item = cont->Add(dock_sizer, 0, wxEXPAND);
 
     part.type = wxAuiDockUIPart::typeDock;


@@ -1829,7 +1849,7 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont,
 
     if (dock.IsHorizontal())
         cont->SetItemMinSize(dock_sizer, 0, dock.size);
 
     if (dock.IsHorizontal())
         cont->SetItemMinSize(dock_sizer, 0, dock.size);

-         else
+    else

         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


@@ -1868,10 +1888,10 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
     {
         wxAuiDockInfo& dock = docks.Item(i);
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
     {
         wxAuiDockInfo& dock = docks.Item(i);

-        
+

         // empty out all panes, as they will be readded below
         dock.panes.Empty();
         // empty out all panes, as they will be readded below
         dock.panes.Empty();

-        
+

         if (dock.fixed)
         {
             // always reset fixed docks' sizes, because
         if (dock.fixed)
         {
             // always reset fixed docks' sizes, because


@@ -1899,7 +1919,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
             // found the right dock
             dock = arr.Item(0);
         }
             // found the right dock
             dock = arr.Item(0);
         }

-         else
+        else

         {
             // dock was not found, so we need to create a new one
             wxAuiDockInfo d;
         {
             // dock was not found, so we need to create a new one
             wxAuiDockInfo d;


@@ -1921,7 +1941,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
             if (!FindPaneInDock(*dock, p.window))
                 dock->panes.Add(&p);
         }
             if (!FindPaneInDock(*dock, p.window))
                 dock->panes.Add(&p);
         }

-         else
+        else

         {
             // remove the pane from any existing docks
             RemovePaneFromDocks(docks, p);
         {
             // remove the pane from any existing docks
             RemovePaneFromDocks(docks, p);


@@ -1962,7 +1982,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
 
                 if (dock.IsHorizontal())
                     size = wxMax(pane_size.y, size);
 
                 if (dock.IsHorizontal())
                     size = wxMax(pane_size.y, size);

-                     else
+                else

                     size = wxMax(pane_size.x, size);
             }
 
                     size = wxMax(pane_size.x, size);
             }
 


@@ -1994,19 +2014,19 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
 
             // new dock's size may not be more than the dock constraint
             // parameter specifies.  See SetDockSizeConstraint()
 
             // 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));
             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())
                 size = wxMin(size, max_dock_y_size);
             if (dock.IsHorizontal())
                 size = wxMin(size, max_dock_y_size);

-                 else
+            else

                 size = wxMin(size, max_dock_x_size);
 
             // absolute minimum size for a dock is 10 pixels
             if (size < 10)
                 size = 10;
                 size = wxMin(size, max_dock_x_size);
 
             // absolute minimum size for a dock is 10 pixels
             if (size < 10)
                 size = 10;

-                
+

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


@@ -2029,7 +2049,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
                     if (pane.min_size.y > dock_min_size)
                         dock_min_size = pane.min_size.y;
                 }
                     if (pane.min_size.y > dock_min_size)
                         dock_min_size = pane.min_size.y;
                 }

-                 else
+                else

                 {
                     if (pane.min_size.x > dock_min_size)
                         dock_min_size = pane.min_size.x;
                 {
                     if (pane.min_size.x > dock_min_size)
                         dock_min_size = pane.min_size.x;


@@ -2098,7 +2118,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
                 int amount = pane.dock_pos - offset;
                 if (amount >= 0)
                     offset += amount;
                 int amount = pane.dock_pos - offset;
                 if (amount >= 0)
                     offset += amount;

-                     else
+                else

                     pane.dock_pos += -amount;
 
                 offset += pane_sizes[j];
                     pane.dock_pos += -amount;
 
                 offset += pane_sizes[j];


@@ -2175,7 +2195,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
                 for (row = 0,row_count = arr.GetCount(); row<row_count; ++row)
                    LayoutAddDock(middle, *arr.Item(row), uiparts, spacer_only);
             }
                 for (row = 0,row_count = arr.GetCount(); row<row_count; ++row)
                    LayoutAddDock(middle, *arr.Item(row), uiparts, spacer_only);
             }

-             else if (!m_has_maximized)
+            else if (!m_has_maximized)

             {
                 // 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);


@@ -2189,7 +2209,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
                 uiparts.Add(part);
             }
         }
                 uiparts.Add(part);
             }
         }

-         else
+        else

         {
             middle->Add(old_cont, 1, wxEXPAND);
         }
         {
             middle->Add(old_cont, 1, wxEXPAND);
         }


@@ -2253,7 +2273,7 @@ void wxAuiManager::GetDockSizeConstraint(double* width_pct, double* height_pct)
 {
     if (width_pct)
         *width_pct = m_dock_constraint_x;
 {
     if (width_pct)
         *width_pct = m_dock_constraint_x;

-    
+

     if (height_pct)
         *height_pct = m_dock_constraint_y;
 }
     if (height_pct)
         *height_pct = m_dock_constraint_y;
 }


@@ -2285,21 +2305,21 @@ void wxAuiManager::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);
 
             if (p.frame->IsShown())
                 p.frame->Show(false);
 


@@ -2308,7 +2328,7 @@ void wxAuiManager::Update()
             {
                 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();


@@ -2350,7 +2370,7 @@ void wxAuiManager::Update()
                 if (p.IsShown() && !frame->IsShown())
                     frame->Show();
             }
                 if (p.IsShown() && !frame->IsShown())
                     frame->Show();
             }

-             else
+            else

             {
                 // frame already exists, make sure it's position
                 // and size reflect the information in wxAuiPaneInfo
             {
                 // frame already exists, make sure it's position
                 // and size reflect the information in wxAuiPaneInfo


@@ -2371,7 +2391,7 @@ void wxAuiManager::Update()
                     p.frame->Show(p.IsShown());
             }
         }
                     p.frame->Show(p.IsShown());
             }
         }

-         else
+        else

         {
             if (p.window->IsShown() != p.IsShown())
                 p.window->Show(p.IsShown());
         {
             if (p.window->IsShown() != p.IsShown())
                 p.window->Show(p.IsShown());


@@ -2574,7 +2594,7 @@ int wxAuiManager::GetDockPixelOffset(wxAuiPaneInfo& test)
         {
             if (dock.IsVertical())
                 return dock.rect.y;
         {
             if (dock.IsVertical())
                 return dock.rect.y;

-                 else
+            else

                 return dock.rect.x;
         }
     }
                 return dock.rect.x;
         }
     }


@@ -2650,10 +2670,10 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
         int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_LEFT),
                                 GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)),
                                 GetMaxLayer(docks, wxAUI_DOCK_TOP)) + 1;
         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;
         if (drop.IsToolbar())
             new_layer = auiToolBarLayer;

-            
+

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


@@ -2666,10 +2686,10 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
         int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_TOP),
                                 GetMaxLayer(docks, wxAUI_DOCK_LEFT)),
                                 GetMaxLayer(docks, wxAUI_DOCK_RIGHT)) + 1;
         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;
         if (drop.IsToolbar())
             new_layer = auiToolBarLayer;

-            
+

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


@@ -2681,11 +2701,11 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
     {
         int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_RIGHT),
                                 GetMaxLayer(docks, wxAUI_DOCK_TOP)),
     {
         int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_RIGHT),
                                 GetMaxLayer(docks, wxAUI_DOCK_TOP)),

-                                GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)) + 1; 
-                                
+                                GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)) + 1;
+

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

-            
+

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


@@ -2698,10 +2718,10 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& 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;
         if (drop.IsToolbar())
             new_layer = auiToolBarLayer;

-            
+

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


@@ -2723,7 +2743,7 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
         int dock_drop_offset = 0;
         if (part->dock->IsHorizontal())
             dock_drop_offset = pt.x - part->dock->rect.x - offset.x;
         int dock_drop_offset = 0;
         if (part->dock->IsHorizontal())
             dock_drop_offset = pt.x - part->dock->rect.x - offset.x;

-             else
+        else

             dock_drop_offset = pt.y - part->dock->rect.y - offset.y;
 
 
             dock_drop_offset = pt.y - part->dock->rect.y - offset.y;
 
 


@@ -2755,16 +2775,11 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
 
             return ProcessDockResult(target, drop);
         }
 
             return ProcessDockResult(target, drop);
         }

-        else
-        {
-            m_skipping = false;
-        }

 
 

-        if (!m_skipping)
-        {
-            m_last_rect = part->dock->rect;
-            m_last_rect.Inflate( 15, 15 );
-        }
+        m_skipping = false;
+
+        m_last_rect = part->dock->rect;
+        m_last_rect.Inflate( 15, 15 );

 
         drop.Dock().
              Direction(part->dock->dock_direction).
 
         drop.Dock().
              Direction(part->dock->dock_direction).


@@ -2942,23 +2957,19 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
 
                 insert_layer = 0;
                 insert_dock_row = true;
 
                 insert_layer = 0;
                 insert_dock_row = true;

-                if (pt.x >= part->rect.x &&
-                    pt.x < part->rect.x+new_row_pixels_x)
-                        insert_dir = wxAUI_DOCK_LEFT;
-                 else
-                if (pt.y >= part->rect.y &&
-                    pt.y < part->rect.y+new_row_pixels_y)
-                        insert_dir = wxAUI_DOCK_TOP;
-                 else
-                if (pt.x >= part->rect.x + part->rect.width-new_row_pixels_x &&
-                    pt.x < part->rect.x + part->rect.width)
-                        insert_dir = wxAUI_DOCK_RIGHT;
-                 else
-                if (pt.y >= part->rect.y+ part->rect.height-new_row_pixels_y &&
-                    pt.y < part->rect.y + part->rect.height)
-                        insert_dir = wxAUI_DOCK_BOTTOM;
-                 else
-                return false;
+                const wxRect& pr = part->rect;
+                if (pt.x >= pr.x && pt.x < pr.x + new_row_pixels_x)
+                    insert_dir = wxAUI_DOCK_LEFT;
+                else if (pt.y >= pr.y && pt.y < pr.y + new_row_pixels_y)
+                    insert_dir = wxAUI_DOCK_TOP;
+                else if (pt.x >= pr.x + pr.width - new_row_pixels_x &&
+                         pt.x < pr.x + pr.width)
+                    insert_dir = wxAUI_DOCK_RIGHT;
+                else if (pt.y >= pr.y+ pr.height - new_row_pixels_y &&
+                         pt.y < pr.y + pr.height)
+                    insert_dir = wxAUI_DOCK_BOTTOM;
+                else
+                    return false;

 
                 insert_row = GetMaxRow(panes, insert_dir, insert_layer) + 1;
             }
 
                 insert_row = GetMaxRow(panes, insert_dir, insert_layer) + 1;
             }


@@ -2984,7 +2995,7 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
             offset = pt.y - part->rect.y;
             size = part->rect.GetHeight();
         }
             offset = pt.y - part->rect.y;
             size = part->rect.GetHeight();
         }

-         else
+        else

         {
             offset = pt.x - part->rect.x;
             size = part->rect.GetWidth();
         {
             offset = pt.x - part->rect.x;
             size = part->rect.GetWidth();


@@ -3050,7 +3061,7 @@ void wxAuiManager::ShowHint(const wxRect& rect)
         m_last_hint = rect;
 
         m_hint_fadeamt = m_hint_fademax;
         m_last_hint = rect;
 
         m_hint_fadeamt = m_hint_fademax;

-        
+

         if ((m_flags & wxAUI_MGR_HINT_FADE)
             && !((m_hint_wnd->IsKindOf(CLASSINFO(wxPseudoTransparentFrame))) &&
                  (m_flags & wxAUI_MGR_NO_VENETIAN_BLINDS_FADE))
         if ((m_flags & wxAUI_MGR_HINT_FADE)
             && !((m_hint_wnd->IsKindOf(CLASSINFO(wxPseudoTransparentFrame))) &&
                  (m_flags & wxAUI_MGR_NO_VENETIAN_BLINDS_FADE))


@@ -3058,6 +3069,7 @@ void wxAuiManager::ShowHint(const wxRect& rect)
             m_hint_fadeamt = 0;
 
         m_hint_wnd->SetSize(rect);
             m_hint_fadeamt = 0;
 
         m_hint_wnd->SetSize(rect);

+        m_hint_wnd->SetTransparent(m_hint_fadeamt);

 
         if (!m_hint_wnd->IsShown())
             m_hint_wnd->Show();
 
         if (!m_hint_wnd->IsShown())
             m_hint_wnd->Show();


@@ -3067,7 +3079,6 @@ void wxAuiManager::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();
 

-        m_hint_wnd->SetTransparent(m_hint_fadeamt);

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


@@ -3078,11 +3089,11 @@ void wxAuiManager::ShowHint(const wxRect& rect)
             m_hint_fadetimer.Start(5);
         }
     }
             m_hint_fadetimer.Start(5);
         }
     }

-     else  // Not using a transparent hint window...
+    else  // Not using a transparent hint window...

     {
         if (!(m_flags & wxAUI_MGR_RECTANGLE_HINT))
             return;
     {
         if (!(m_flags & wxAUI_MGR_RECTANGLE_HINT))
             return;

-            
+

         if (m_last_hint != rect)
         {
             // remove the last hint rectangle
         if (m_last_hint != rect)
         {
             // remove the last hint rectangle


@@ -3164,16 +3175,16 @@ void wxAuiManager::StartPaneDrag(wxWindow* pane_window,
     wxAuiPaneInfo& pane = GetPane(pane_window);
     if (!pane.IsOk())
         return;
     wxAuiPaneInfo& pane = GetPane(pane_window);
     if (!pane.IsOk())
         return;

-    
+

     if (pane.IsToolbar())
     {
         m_action = actionDragToolbarPane;
     }
     if (pane.IsToolbar())
     {
         m_action = actionDragToolbarPane;
     }

-     else
+    else

     {
         m_action = actionDragFloatingPane;
     }
     {
         m_action = actionDragFloatingPane;
     }

-    
+

     m_action_window = pane_window;
     m_action_offset = offset;
     m_frame->CaptureMouse();
     m_action_window = pane_window;
     m_action_offset = offset;
     m_frame->CaptureMouse();


@@ -3206,6 +3217,7 @@ wxRect wxAuiManager::CalculateHintRect(wxWindow* pane_window,
     wxAuiDockUIPartArray uiparts;
     wxAuiPaneInfo hint = GetPane(pane_window);
     hint.name = wxT("__HINT__");
     wxAuiDockUIPartArray uiparts;
     wxAuiPaneInfo hint = GetPane(pane_window);
     hint.name = wxT("__HINT__");

+    hint.PaneBorder(true);

     hint.Show();
 
     if (!hint.IsOk())
     hint.Show();
 
     if (!hint.IsOk())


@@ -3280,12 +3292,12 @@ void wxAuiManager::DrawHintRect(wxWindow* pane_window,
                                 const wxPoint& offset)
 {
     wxRect rect = CalculateHintRect(pane_window, pt, offset);
                                 const wxPoint& offset)
 {
     wxRect rect = CalculateHintRect(pane_window, pt, offset);

-    
+

     if (rect.IsEmpty())
     {
         HideHint();
     }
     if (rect.IsEmpty())
     {
         HideHint();
     }

-     else
+    else

     {
         ShowHint(rect);
     }
     {
         ShowHint(rect);
     }


@@ -3319,22 +3331,22 @@ void wxAuiManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir)
         pt.y = pos.y;
         // and some more pixels for the title bar
         pt.y -= 5;
         pt.y = pos.y;
         // and some more pixels for the title bar
         pt.y -= 5;

-    } else
-    if (dir == wxWEST)
+    }
+    else if (dir == wxWEST)

     {
         // move to pane's left border
         wxPoint pos( 0,0 );
         pos = wnd->ClientToScreen( pos );
         pt.x = pos.x;
     {
         // move to pane's left border
         wxPoint pos( 0,0 );
         pos = wnd->ClientToScreen( pos );
         pt.x = pos.x;

-    } else
-    if (dir == wxEAST)
+    }
+    else if (dir == wxEAST)

     {
         // move to pane's right border
         wxPoint pos( wnd->GetSize().x, 0 );
         pos = wnd->ClientToScreen( pos );
         pt.x = pos.x;
     {
         // move to pane's right border
         wxPoint pos( wnd->GetSize().x, 0 );
         pos = wnd->ClientToScreen( pos );
         pt.x = pos.x;

-    } else
-    if (dir == wxSOUTH)
+    }
+    else if (dir == wxSOUTH)

     {
         // move to pane's bottom border
         wxPoint pos( 0, wnd->GetSize().y );
     {
         // move to pane's bottom border
         wxPoint pos( 0, wnd->GetSize().y );


@@ -3355,27 +3367,24 @@ void wxAuiManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir)
     // no hint for toolbar floating windows
     if (pane.IsToolbar() && m_action == actionDragFloatingPane)
     {
     // no hint for toolbar floating windows
     if (pane.IsToolbar() && m_action == actionDragFloatingPane)
     {

-        if (m_action == actionDragFloatingPane)
-        {
-            wxAuiDockInfoArray docks;
-            wxAuiPaneInfoArray panes;
-            wxAuiDockUIPartArray uiparts;
-            wxAuiPaneInfo 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);

 
 

-            // find out where the new pane would be
-            if (!DoDrop(docks, panes, hint, client_pt))
-                return;
-            if (hint.IsFloating())
-                return;
+        // find out where the new pane would be
+        if (!DoDrop(docks, panes, hint, client_pt))
+            return;
+        if (hint.IsFloating())
+            return;

 
 

-            pane = hint;
-            m_action = actionDragToolbarPane;
-            m_action_window = pane.window;
+        pane = hint;
+        m_action = actionDragToolbarPane;
+        m_action_window = pane.window;

 
 

-            Update();
-        }
+        Update();

 
         return;
     }
 
         return;
     }


@@ -3422,22 +3431,22 @@ void wxAuiManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir)
         pt.y = pos.y;
         // and some more pixels for the title bar
         pt.y -= 10;
         pt.y = pos.y;
         // and some more pixels for the title bar
         pt.y -= 10;

-    } else
-    if (dir == wxWEST)
+    }
+    else if (dir == wxWEST)

     {
         // move to pane's left border
         wxPoint pos( 0,0 );
         pos = wnd->ClientToScreen( pos );
         pt.x = pos.x;
     {
         // move to pane's left border
         wxPoint pos( 0,0 );
         pos = wnd->ClientToScreen( pos );
         pt.x = pos.x;

-    } else
-    if (dir == wxEAST)
+    }
+    else if (dir == wxEAST)

     {
         // move to pane's right border
         wxPoint pos( wnd->GetSize().x, 0 );
         pos = wnd->ClientToScreen( pos );
         pt.x = pos.x;
     {
         // move to pane's right border
         wxPoint pos( wnd->GetSize().x, 0 );
         pos = wnd->ClientToScreen( pos );
         pt.x = pos.x;

-    } else
-    if (dir == wxSOUTH)
+    }
+    else if (dir == wxSOUTH)

     {
         // move to pane's bottom border
         wxPoint pos( 0, wnd->GetSize().y );
     {
         // move to pane's bottom border
         wxPoint pos( 0, wnd->GetSize().y );


@@ -3473,7 +3482,7 @@ void wxAuiManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir)
         if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG)
             pane.frame->SetTransparent(255);
     }
         if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG)
             pane.frame->SetTransparent(255);
     }

-     else if (m_has_maximized)
+    else if (m_has_maximized)

     {
         RestoreMaximizedPane();
     }
     {
         RestoreMaximizedPane();
     }


@@ -3511,7 +3520,7 @@ void wxAuiManager::OnFloatingPaneClosed(wxWindow* wnd, wxCloseEvent& evt)
         evt.Veto();
         return;
     }
         evt.Veto();
         return;
     }

-     else 
+    else

     {
         ClosePane(pane);
     }
     {
         ClosePane(pane);
     }


@@ -3537,6 +3546,10 @@ void wxAuiManager::OnFloatingPaneActivated(wxWindow* wnd)
 
 void wxAuiManager::OnRender(wxAuiManagerEvent& evt)
 {
 
 void wxAuiManager::OnRender(wxAuiManagerEvent& evt)
 {

+    // if the frame is about to be deleted, don't bother
+    if (!m_frame || wxPendingDelete.Member(m_frame))
+        return;
+

     wxDC* dc = evt.GetDC();
 
 #ifdef __WXMAC__
     wxDC* dc = evt.GetDC();
 
 #ifdef __WXMAC__


@@ -3651,7 +3664,7 @@ void wxAuiManager::OnSize(wxSizeEvent& event)
     {
         DoFrameLayout();
         Repaint();
     {
         DoFrameLayout();
         Repaint();

-        
+

 #if wxUSE_MDI
         if (m_frame->IsKindOf(CLASSINFO(wxMDIParentFrame)))
         {
 #if wxUSE_MDI
         if (m_frame->IsKindOf(CLASSINFO(wxMDIParentFrame)))
         {


@@ -3675,7 +3688,7 @@ void wxAuiManager::OnFindManager(wxAuiManagerEvent& evt)
         evt.SetManager(NULL);
         return;
     }
         evt.SetManager(NULL);
         return;
     }

-    
+

     // if we are managing a child frame, get the 'real' manager
     if (window->IsKindOf(CLASSINFO(wxAuiFloatingFrame)))
     {
     // if we are managing a child frame, get the 'real' manager
     if (window->IsKindOf(CLASSINFO(wxAuiFloatingFrame)))
     {


@@ -3683,7 +3696,7 @@ void wxAuiManager::OnFindManager(wxAuiManagerEvent& evt)
         evt.SetManager(float_frame->GetOwnerManager());
         return;
     }
         evt.SetManager(float_frame->GetOwnerManager());
         return;
     }

-        
+

     // return pointer to ourself
     evt.SetManager(this);
 }
     // return pointer to ourself
     evt.SetManager(this);
 }


@@ -3712,10 +3725,10 @@ void wxAuiManager::OnSetCursor(wxSetCursorEvent& event)
 
             if (part->orientation == wxVERTICAL)
                 cursor = wxCursor(wxCURSOR_SIZEWE);
 
             if (part->orientation == wxVERTICAL)
                 cursor = wxCursor(wxCURSOR_SIZEWE);

-                 else
+            else

                 cursor = wxCursor(wxCURSOR_SIZENS);
         }
                 cursor = wxCursor(wxCURSOR_SIZENS);
         }

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

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


@@ -3732,17 +3745,17 @@ void wxAuiManager::UpdateButtonOnScreen(wxAuiDockUIPart* button_ui_part,
     wxAuiDockUIPart* hit_test = HitTest(event.GetX(), event.GetY());
     if (!hit_test || !button_ui_part)
         return;
     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)
     {
         if (event.LeftDown())
             state = wxAUI_BUTTON_STATE_PRESSED;
     int state = wxAUI_BUTTON_STATE_NORMAL;
 
     if (hit_test == button_ui_part)
     {
         if (event.LeftDown())
             state = wxAUI_BUTTON_STATE_PRESSED;

-             else
+        else

             state = wxAUI_BUTTON_STATE_HOVER;
     }
             state = wxAUI_BUTTON_STATE_HOVER;
     }

-     else
+    else

     {
         if (event.LeftDown())
             state = wxAUI_BUTTON_STATE_HOVER;
     {
         if (event.LeftDown())
             state = wxAUI_BUTTON_STATE_HOVER;


@@ -3777,7 +3790,7 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event)
         {
             if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
                 return;
         {
             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
             if (part->type == wxAuiDockUIPart::typeDockSizer && part->dock &&
             // a dock may not be resized if it has a single
             // pane which is not resizable
             if (part->type == wxAuiDockUIPart::typeDockSizer && part->dock &&


@@ -3797,7 +3810,7 @@ void wxAuiManager::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 == wxAuiDockUIPart::typePaneButton)
+        else if (part->type == wxAuiDockUIPart::typePaneButton)

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


@@ -3806,15 +3819,15 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event)
 
             UpdateButtonOnScreen(part, event);
         }
 
             UpdateButtonOnScreen(part, event);
         }

-         else if (part->type == wxAuiDockUIPart::typeCaption ||
+        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();
                   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 && 
+
+            if (part->pane &&

                 part->pane->window &&
                 managed_wnd &&
                 managed_wnd->IsKindOf(CLASSINFO(wxAuiFloatingFrame)))
                 part->pane->window &&
                 managed_wnd &&
                 managed_wnd->IsKindOf(CLASSINFO(wxAuiFloatingFrame)))


@@ -3826,9 +3839,9 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event)
                                                      event.m_y - part->rect.y));
                 return;
             }
                                                      event.m_y - part->rect.y));
                 return;
             }

-            
-        
-        
+
+
+

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


@@ -3903,8 +3916,8 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event)
             Update();
             Repaint(NULL);
         }
             Update();
             Repaint(NULL);
         }

-         else if (m_action_part &&
-                  m_action_part->type == wxAuiDockUIPart::typePaneSizer)
+        else if (m_action_part &&
+                 m_action_part->type == wxAuiDockUIPart::typePaneSizer)

         {
             wxAuiDockInfo& dock = *m_action_part->dock;
             wxAuiPaneInfo& pane = *m_action_part->pane;
         {
             wxAuiDockInfo& dock = *m_action_part->dock;
             wxAuiPaneInfo& pane = *m_action_part->pane;


@@ -3929,13 +3942,13 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event)
             // this will help us recalculate the pane's proportion
             if (dock.IsHorizontal())
                 new_pixsize = new_pos.x - pane_part->rect.x;
             // this will help us recalculate the pane's proportion
             if (dock.IsHorizontal())
                 new_pixsize = new_pos.x - pane_part->rect.x;

-                 else
+            else

                 new_pixsize = new_pos.y - pane_part->rect.y;
 
             // determine the size of the dock, based on orientation
             if (dock.IsHorizontal())
                 dock_pixels = dock.rect.GetWidth();
                 new_pixsize = new_pos.y - pane_part->rect.y;
 
             // determine the size of the dock, based on orientation
             if (dock.IsHorizontal())
                 dock_pixels = dock.rect.GetWidth();

-                 else
+            else

                 dock_pixels = dock.rect.GetHeight();
 
             // determine the total proportion of all resizable panes,
                 dock_pixels = dock.rect.GetHeight();
 
             // determine the total proportion of all resizable panes,


@@ -3962,10 +3975,10 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event)
                 {
                     if (dock.IsHorizontal())
                         dock_pixels -= p.best_size.x;
                 {
                     if (dock.IsHorizontal())
                         dock_pixels -= p.best_size.x;

-                         else
+                    else

                         dock_pixels -= p.best_size.y;
                 }
                         dock_pixels -= p.best_size.y;
                 }

-                 else
+                else

                 {
                     total_proportion += p.dock_proportion;
                 }
                 {
                     total_proportion += p.dock_proportion;
                 }


@@ -4022,7 +4035,7 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event)
                     if (pane.HasCaption())
                         min_size += caption_size;
                 }
                     if (pane.HasCaption())
                         min_size += caption_size;
                 }

-                 else
+                else

                 {
                     min_size += pane.min_size.x;
                 }
                 {
                     min_size += pane.min_size.x;
                 }


@@ -4134,7 +4147,7 @@ void wxAuiManager::OnMotion(wxMouseEvent& event)
         wxPoint pos = m_action_part->rect.GetPosition();
         if (m_action_part->orientation == wxHORIZONTAL)
             pos.y = wxMax(0, event.m_y - m_action_offset.y);
         wxPoint pos = m_action_part->rect.GetPosition();
         if (m_action_part->orientation == wxHORIZONTAL)
             pos.y = wxMax(0, event.m_y - m_action_offset.y);

-             else
+        else

             pos.x = wxMax(0, event.m_x - m_action_offset.x);
 
         wxRect rect(m_frame->ClientToScreen(pos),
             pos.x = wxMax(0, event.m_x - m_action_offset.x);
 
         wxRect rect(m_frame->ClientToScreen(pos),


@@ -4189,7 +4202,7 @@ void wxAuiManager::OnMotion(wxMouseEvent& event)
                         m_action_offset.x = 30;
                 }
             }
                         m_action_offset.x = 30;
                 }
             }

-             else
+            else

             {
                 m_action = actionDragToolbarPane;
                 m_action_window = pane_info->window;
             {
                 m_action = actionDragToolbarPane;
                 m_action_window = pane_info->window;


@@ -4253,22 +4266,22 @@ void wxAuiManager::OnMotion(wxMouseEvent& event)
                     UpdateButtonOnScreen(m_hover_button, event);
                     Repaint();
                 }
                     UpdateButtonOnScreen(m_hover_button, event);
                     Repaint();
                 }

-                
+

                 // mouse is over a button, so repaint the
                 // button in hover mode
                 UpdateButtonOnScreen(part, event);
                 m_hover_button = part;
                 // mouse is over a button, so repaint the
                 // button in hover mode
                 UpdateButtonOnScreen(part, event);
                 m_hover_button = part;

-                
+

             }
         }
             }
         }

-         else
+        else

         {
             if (m_hover_button)
             {
                 m_hover_button = NULL;
                 Repaint();
             }
         {
             if (m_hover_button)
             {
                 m_hover_button = NULL;
                 Repaint();
             }

-             else
+            else

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


@@ -4353,7 +4366,7 @@ void wxAuiManager::OnPaneButton(wxAuiManagerEvent& evt)
             Update();
         }
     }
             Update();
         }
     }

-     else if (evt.button == wxAUI_BUTTON_PIN)
+    else if (evt.button == wxAUI_BUTTON_PIN)

     {
         if ((m_flags & wxAUI_MGR_ALLOW_FLOATING) &&
             pane.IsFloatable())
     {
         if ((m_flags & wxAUI_MGR_ALLOW_FLOATING) &&
             pane.IsFloatable())