Restore setting focus to generic wxDataViewCtrl on any mouse click.

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

diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index 402724309bbfe8867754ed216531fae171e09992..30691c1c036a1e581a046a2e0c10abb84fbda6b9 100644 (file)
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -1544,9 +1544,9 @@ public:
         for (i = 0; i < page_count; ++i)
         {
             wxAuiNotebookPage& page = pages.Item(i);
-            int border_width = m_tabs->GetArtProvider()->GetBorderWidth(page.window);
+            int border_space = m_tabs->GetArtProvider()->GetAdditionalBorderSpace(page.window);
 
-            int height = m_rect.height - m_tabCtrlHeight - border_width;
+            int height = m_rect.height - m_tabCtrlHeight - border_space;
             if ( height < 0 )
             {
                 // avoid passing negative height to wxWindow::SetSize(), this
@@ -1556,16 +1556,16 @@ public:
 
             if (m_tabs->GetFlags() & wxAUI_NB_BOTTOM)
             {
-                page.window->SetSize(m_rect.x + 2 * border_width,
-                                     m_rect.y + 2 *  border_width,
-                                     m_rect.width - 4 * border_width,
+                page.window->SetSize(m_rect.x + border_space,
+                                     m_rect.y + border_space,
+                                     m_rect.width - 2 * border_space,
                                      height);
             }
             else //TODO: if (GetFlags() & wxAUI_NB_TOP)
             {
-                page.window->SetSize(m_rect.x + 2 * border_width,
+                page.window->SetSize(m_rect.x + border_space,
                                      m_rect.y + m_tabCtrlHeight,
-                                     m_rect.width - 4 * border_width,
+                                     m_rect.width - 2 * border_space,
                                      height);
             }
             // TODO: else if (GetFlags() & wxAUI_NB_LEFT){}