]> git.saurik.com Git - wxWidgets.git/blobdiff - src/aui/auibook.cpp
Removed GetAdjustedBestSize().
[wxWidgets.git] / src / aui / auibook.cpp
index 276eb8956e1761a0d8577399765dc4f5d5cb72dc..e831f89b34f22807fb541a2ae3dcb05b41c4d4e2 100644 (file)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        src/aui/notebook.cpp
+// Name:        src/aui/auibook.cpp
 // Purpose:     wxaui: wx advanced user interface - notebook
 // Author:      Benjamin I. Williams
 // Modified by:
 // Purpose:     wxaui: wx advanced user interface - notebook
 // Author:      Benjamin I. Williams
 // Modified by:
 
 #if wxUSE_AUI
 
 
 #if wxUSE_AUI
 
-#include "wx/settings.h"
 #include "wx/aui/auibook.h"
 #include "wx/aui/auibook.h"
-#include "wx/aui/tabmdi.h"
-#include "wx/dcbuffer.h"
 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP
+    #include "wx/settings.h"
+    #include "wx/image.h"
 #endif
 
 #endif
 
+#include "wx/aui/tabmdi.h"
+#include "wx/dcbuffer.h"
+
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxAuiNotebookPageArray)
 WX_DEFINE_OBJARRAY(wxAuiTabContainerButtonArray)
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxAuiNotebookPageArray)
 WX_DEFINE_OBJARRAY(wxAuiTabContainerButtonArray)
@@ -43,17 +45,8 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION)
 
 IMPLEMENT_DYNAMIC_CLASS(wxAuiNotebookEvent, wxEvent)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxAuiNotebookEvent, wxEvent)
 
-// -- wxAuiTabContainer class implementation --
 
 
 
 
-// wxAuiTabContainer is a class which contains information about each
-// tab.  It also can render an entire tab control to a specified DC.
-// It's not a window class itself, because this code will be used by
-// the wxFrameMananger, where it is disadvantageous to have separate
-// windows for each tab control in the case of "docked tabs"
-
-// A derived class, wxAuiTabCtrl, is an actual wxWindow-derived window
-// which can be used as a tab control in the normal sense.
 
 
 // This functions are here for this proof of concept
 
 
 // This functions are here for this proof of concept
@@ -72,13 +65,13 @@ static wxBitmap BitmapFromBits(const unsigned char bits[], int w, int h,
                                const wxColour& color)
 {
     wxImage img = wxBitmap((const char*)bits, w, h).ConvertToImage();
                                const wxColour& color)
 {
     wxImage img = wxBitmap((const char*)bits, w, h).ConvertToImage();
-    img.Replace(255,255,255,123,123,123);
-    img.Replace(0,0,0,color.Red(),color.Green(),color.Blue());
+    img.Replace(0,0,0,123,123,123);
+    img.Replace(255,255,255,color.Red(),color.Green(),color.Blue());
     img.SetMaskColour(123,123,123);
     return wxBitmap(img);
 }
 
     img.SetMaskColour(123,123,123);
     return wxBitmap(img);
 }
 
-static void DrawButton(wxDC& dc,
+static void DrawButtonS(wxDC& dc,
                        const wxRect& _rect,
                        const wxBitmap& bmp,
                        const wxColour& bkcolour,
                        const wxRect& _rect,
                        const wxBitmap& bmp,
                        const wxColour& bkcolour,
@@ -109,43 +102,343 @@ static void DrawButton(wxDC& dc,
 
 
 
 
 
 
-wxAuiTabContainer::wxAuiTabContainer()
+
+// -- wxDefaultTabArt class implementation --
+
+wxDefaultTabArt::wxDefaultTabArt()
 {
     m_normal_font = *wxNORMAL_FONT;
     m_selected_font = *wxNORMAL_FONT;
     m_selected_font.SetWeight(wxBOLD);
     m_measuring_font = m_selected_font;
 {
     m_normal_font = *wxNORMAL_FONT;
     m_selected_font = *wxNORMAL_FONT;
     m_selected_font.SetWeight(wxBOLD);
     m_measuring_font = m_selected_font;
-    
+
     wxColour base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     wxColour base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-    
+
     wxColour background_colour = StepColour(base_colour, 95);
     wxColour normaltab_colour = base_colour;
     wxColour selectedtab_colour = *wxWHITE;
     wxColour background_colour = StepColour(base_colour, 95);
     wxColour normaltab_colour = base_colour;
     wxColour selectedtab_colour = *wxWHITE;
-    
+
     m_bkbrush = wxBrush(background_colour);
     m_normal_bkbrush = wxBrush(normaltab_colour);
     m_normal_bkpen = wxPen(normaltab_colour);
     m_selected_bkbrush = wxBrush(selectedtab_colour);
     m_selected_bkpen = wxPen(selectedtab_colour);
     m_bkbrush = wxBrush(background_colour);
     m_normal_bkbrush = wxBrush(normaltab_colour);
     m_normal_bkpen = wxPen(normaltab_colour);
     m_selected_bkbrush = wxBrush(selectedtab_colour);
     m_selected_bkpen = wxPen(selectedtab_colour);
+    
+    
+#if defined( __WXMAC__ )
+     static unsigned char close_bits[]={
+         0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0xFE, 0x03, 0xF8, 0x01, 0xF0, 0x19, 0xF3,
+         0xB8, 0xE3, 0xF0, 0xE1, 0xE0, 0xE0, 0xF0, 0xE1, 0xB8, 0xE3, 0x19, 0xF3,
+         0x01, 0xF0, 0x03, 0xF8, 0x0F, 0xFE, 0xFF, 0xFF };
+#elif defined( __WXGTK__)
+    static unsigned char close_bits[]={
+         0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xfb, 0xef, 0xdb, 0xed, 0x8b, 0xe8,
+         0x1b, 0xec, 0x3b, 0xee, 0x1b, 0xec, 0x8b, 0xe8, 0xdb, 0xed, 0xfb, 0xef,
+         0x07, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+#else
+    static unsigned char close_bits[]={
+        0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0xfb,0xcf,0xf9,
+        0x9f,0xfc,0x3f,0xfe,0x3f,0xfe,0x9f,0xfc,0xcf,0xf9,0xef,0xfb,
+        0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
+#endif
+
+    static unsigned char left_bits[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0xfe, 0x3f, 0xfe,
+       0x1f, 0xfe, 0x0f, 0xfe, 0x1f, 0xfe, 0x3f, 0xfe, 0x7f, 0xfe, 0xff, 0xfe,
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+    
+    static unsigned char right_bits[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0x9f, 0xff, 0x1f, 0xff,
+       0x1f, 0xfe, 0x1f, 0xfc, 0x1f, 0xfe, 0x1f, 0xff, 0x9f, 0xff, 0xdf, 0xff,
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+   
+    m_active_close_bmp = BitmapFromBits(close_bits, 16, 16, *wxBLACK);
+    m_disabled_close_bmp = BitmapFromBits(close_bits, 16, 16, wxColour(128,128,128));
+    
+    m_active_left_bmp = BitmapFromBits(left_bits, 16, 16, *wxBLACK);
+    m_disabled_left_bmp = BitmapFromBits(left_bits, 16, 16, wxColour(128,128,128));
+    
+    m_active_right_bmp = BitmapFromBits(right_bits, 16, 16, *wxBLACK);
+    m_disabled_right_bmp = BitmapFromBits(right_bits, 16, 16, wxColour(128,128,128));
+}
+
+wxDefaultTabArt::~wxDefaultTabArt()
+{
+}
+
+void wxDefaultTabArt::DrawBackground(wxDC* dc,
+                                     const wxRect& rect)
+{
+    // draw background
+    dc->SetBrush(m_bkbrush);
+    dc->SetPen(*wxTRANSPARENT_PEN);
+    dc->DrawRectangle(-1, -1, rect.GetWidth()+2, rect.GetHeight()+2);
+
+    // draw base line
+    dc->SetPen(*wxGREY_PEN);
+    dc->DrawLine(0, rect.GetHeight()-1, rect.GetWidth(), rect.GetHeight()-1);
+}
+
+
+// DrawTab() draws an individual tab.
+//
+// dc       - output dc
+// in_rect  - rectangle the tab should be confined to
+// caption  - tab's caption
+// active   - whether or not the tab is active
+// out_rect - actual output rectangle
+// x_extent - the advance x; where the next tab should start
+
+void wxDefaultTabArt::DrawTab(wxDC* dc,
+                              const wxRect& in_rect,
+                              const wxString& caption_text,
+                              bool active,
+                              wxRect* out_rect,
+                              int* x_extent)
+{
+    wxCoord normal_textx, normal_texty;
+    wxCoord selected_textx, selected_texty;
+    wxCoord measured_textx, measured_texty;
+    wxCoord textx, texty;
+
+
+    // if the caption is empty, measure some temporary text
+    wxString caption = caption_text;
+    if (caption_text.empty())
+        caption = wxT("Xj");
+        
+    // measure text
+    dc->SetFont(m_measuring_font);
+    dc->GetTextExtent(caption, &measured_textx, &measured_texty);
+
+    dc->SetFont(m_selected_font);
+    dc->GetTextExtent(caption, &selected_textx, &selected_texty);
+
+    dc->SetFont(m_normal_font);
+    dc->GetTextExtent(caption, &normal_textx, &normal_texty);
+
+    caption = caption_text;
+
+    wxCoord tab_height = measured_texty + 4;
+    wxCoord tab_width = measured_textx + tab_height + 5;
+    wxCoord tab_x = in_rect.x;
+    wxCoord tab_y = in_rect.y + in_rect.height - tab_height;
+
+
+    // select pen, brush and font for the tab to be drawn
+
+    if (active)
+    {
+        dc->SetPen(m_selected_bkpen);
+        dc->SetBrush(m_selected_bkbrush);
+        dc->SetFont(m_selected_font);
+        textx = selected_textx;
+        texty = selected_texty;
+    }
+     else
+    {
+        dc->SetPen(m_normal_bkpen);
+        dc->SetBrush(m_normal_bkbrush);
+        dc->SetFont(m_normal_font);
+        textx = normal_textx;
+        texty = normal_texty;
+    }
+
+
+    // -- draw line --
+
+    wxPoint points[7];
+    points[0].x = tab_x;
+    points[0].y = tab_y + tab_height - 1;
+    points[1].x = tab_x + tab_height - 3;
+    points[1].y = tab_y + 2;
+    points[2].x = tab_x + tab_height + 3;
+    points[2].y = tab_y;
+    points[3].x = tab_x + tab_width - 2;
+    points[3].y = tab_y;
+    points[4].x = tab_x + tab_width;
+    points[4].y = tab_y + 2;
+    points[5].x = tab_x + tab_width;
+    points[5].y = tab_y + tab_height - 1;
+    points[6] = points[0];
+
+
+    dc->DrawPolygon(6, points);
+
+    dc->SetPen(*wxGREY_PEN);
+
+    //dc->DrawLines(active ? 6 : 7, points);
+    dc->DrawLines(7, points);
+
+    // -- draw text --
+
+    dc->DrawText(caption,
+                 tab_x + (tab_height/3) + (tab_width/2) - (textx/2),
+                 tab_y + tab_height - texty - 2);
+
+    *out_rect = wxRect(tab_x, tab_y, tab_width, tab_height);
+    *x_extent = tab_width - (tab_height/2) - 1;
+}
+
+
+wxSize wxDefaultTabArt::GetTabSize(wxDC* dc,
+                                   const wxString& caption,
+                                   bool WXUNUSED(active),
+                                   int* x_extent)
+{
+    wxCoord measured_textx, measured_texty;
+    
+    dc->SetFont(m_measuring_font);
+    dc->GetTextExtent(caption, &measured_textx, &measured_texty);
+    
+    wxCoord tab_height = measured_texty + 4;
+    wxCoord tab_width = measured_textx + tab_height + 5;
+
+    *x_extent = tab_width - (tab_height/2) - 1;
+
+    return wxSize(tab_width, tab_height);
+}
+
+
+void wxDefaultTabArt::DrawButton(
+                 wxDC* dc,
+                 const wxRect& in_rect,
+                 int bitmap_id,
+                 int button_state,
+                 int orientation,
+                 const wxBitmap& bitmap_override,
+                 wxRect* out_rect)
+{
+    wxBitmap bmp;
+    wxRect rect;
+    
+    if (bitmap_override.IsOk())
+    {
+        bmp = bitmap_override;
+    }
+     else
+    {
+        switch (bitmap_id)
+        {
+            case wxAUI_BUTTON_CLOSE:
+                if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+                    bmp = m_disabled_close_bmp;
+                     else
+                    bmp = m_active_close_bmp;
+                break;
+            case wxAUI_BUTTON_LEFT:
+                if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+                    bmp = m_disabled_left_bmp;
+                     else
+                    bmp = m_active_left_bmp;
+                break;
+            case wxAUI_BUTTON_RIGHT:
+                if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+                    bmp = m_disabled_right_bmp;
+                     else
+                    bmp = m_active_right_bmp;
+                break;
+        }
+    }
+
+    if (!bmp.IsOk())
+        return;
+        
+    rect = in_rect;
+    
+    if (orientation == wxLEFT)
+    {
+        rect.SetWidth(bmp.GetWidth());
+        rect.SetHeight(bmp.GetHeight());
+    }
+     else
+    {
+        rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(), in_rect.y,
+                      bmp.GetWidth(), bmp.GetHeight());
+    }
+    
+        
+    DrawButtonS(*dc, rect, bmp, *wxWHITE, button_state);
+    
+    *out_rect = rect;
+}
+
+
+
+
+
+void wxDefaultTabArt::SetNormalFont(const wxFont& font)
+{
+    m_normal_font = font;
+}
+
+void wxDefaultTabArt::SetSelectedFont(const wxFont& font)
+{
+    m_selected_font = font;
+}
+
+void wxDefaultTabArt::SetMeasuringFont(const wxFont& font)
+{
+    m_measuring_font = font;
+}
+
+
+
+
+
+
+// -- wxAuiTabContainer class implementation --
+
+
+// wxAuiTabContainer is a class which contains information about each
+// tab.  It also can render an entire tab control to a specified DC.
+// It's not a window class itself, because this code will be used by
+// the wxFrameMananger, where it is disadvantageous to have separate
+// windows for each tab control in the case of "docked tabs"
+
+// A derived class, wxAuiTabCtrl, is an actual wxWindow-derived window
+// which can be used as a tab control in the normal sense.
+
+
+wxAuiTabContainer::wxAuiTabContainer()
+{
+    m_tab_offset = 0;
+    m_art = new wxDefaultTabArt;
+    
+    AddButton(wxAUI_BUTTON_LEFT, wxLEFT);       
+    AddButton(wxAUI_BUTTON_RIGHT, wxRIGHT);      
+    AddButton(wxAUI_BUTTON_CLOSE, wxRIGHT);
 }
 
 wxAuiTabContainer::~wxAuiTabContainer()
 {
 }
 
 wxAuiTabContainer::~wxAuiTabContainer()
 {
+    delete m_art;
+}
+
+void wxAuiTabContainer::SetArtProvider(wxTabArt* art)
+{
+    delete m_art;
+    m_art = art;
+}
+
+wxTabArt* wxAuiTabContainer::GetArtProvider()
+{
+    return m_art;
 }
 
 void wxAuiTabContainer::SetNormalFont(const wxFont& font)
 {
 }
 
 void wxAuiTabContainer::SetNormalFont(const wxFont& font)
 {
-    m_normal_font = font;
+    m_art->SetNormalFont(font);
 }
 
 void wxAuiTabContainer::SetSelectedFont(const wxFont& font)
 {
 }
 
 void wxAuiTabContainer::SetSelectedFont(const wxFont& font)
 {
-    m_selected_font = font;
+    m_art->SetSelectedFont(font);
 }
 
 void wxAuiTabContainer::SetMeasuringFont(const wxFont& font)
 {
 }
 
 void wxAuiTabContainer::SetMeasuringFont(const wxFont& font)
 {
-    m_measuring_font = font;
+    m_art->SetMeasuringFont(font);
 }
 
 void wxAuiTabContainer::SetRect(const wxRect& rect)
 }
 
 void wxAuiTabContainer::SetRect(const wxRect& rect)
@@ -159,7 +452,7 @@ bool wxAuiTabContainer::AddPage(wxWindow* page,
     wxAuiNotebookPage page_info;
     page_info = info;
     page_info.window = page;
     wxAuiNotebookPage page_info;
     page_info = info;
     page_info.window = page;
-    
+
     m_pages.Add(page_info);
 
     return true;
     m_pages.Add(page_info);
 
     return true;
@@ -172,7 +465,7 @@ bool wxAuiTabContainer::InsertPage(wxWindow* page,
     wxAuiNotebookPage page_info;
     page_info = info;
     page_info.window = page;
     wxAuiNotebookPage page_info;
     page_info = info;
     page_info.window = page;
-    
+
     if (idx >= m_pages.GetCount())
         m_pages.Add(page_info);
          else
     if (idx >= m_pages.GetCount())
         m_pages.Add(page_info);
          else
@@ -193,14 +486,14 @@ bool wxAuiTabContainer::RemovePage(wxWindow* wnd)
             return true;
         }
     }
             return true;
         }
     }
-    
+
     return false;
 }
 
 bool wxAuiTabContainer::SetActivePage(wxWindow* wnd)
 {
     bool found = false;
     return false;
 }
 
 bool wxAuiTabContainer::SetActivePage(wxWindow* wnd)
 {
     bool found = false;
-    
+
     size_t i, page_count = m_pages.GetCount();
     for (i = 0; i < page_count; ++i)
     {
     size_t i, page_count = m_pages.GetCount();
     for (i = 0; i < page_count; ++i)
     {
@@ -215,7 +508,7 @@ bool wxAuiTabContainer::SetActivePage(wxWindow* wnd)
             page.active = false;
         }
     }
             page.active = false;
         }
     }
-    
+
     return found;
 }
 
     return found;
 }
 
@@ -233,10 +526,10 @@ bool wxAuiTabContainer::SetActivePage(size_t page)
 {
     if (page >= m_pages.GetCount())
         return false;
 {
     if (page >= m_pages.GetCount())
         return false;
-        
+
     return SetActivePage(m_pages.Item(page).window);
 }
     return SetActivePage(m_pages.Item(page).window);
 }
-    
+
 int wxAuiTabContainer::GetActivePage() const
 {
     size_t i, page_count = m_pages.GetCount();
 int wxAuiTabContainer::GetActivePage() const
 {
     size_t i, page_count = m_pages.GetCount();
@@ -246,7 +539,7 @@ int wxAuiTabContainer::GetActivePage() const
         if (page.active)
             return i;
     }
         if (page.active)
             return i;
     }
-    
+
     return -1;
 }
 
     return -1;
 }
 
@@ -254,7 +547,7 @@ wxWindow* wxAuiTabContainer::GetWindowFromIdx(size_t idx) const
 {
     if (idx >= m_pages.GetCount())
         return NULL;
 {
     if (idx >= m_pages.GetCount())
         return NULL;
-    
+
     return m_pages[idx].window;
 }
 
     return m_pages[idx].window;
 }
 
@@ -287,203 +580,215 @@ size_t wxAuiTabContainer::GetPageCount() const
     return m_pages.GetCount();
 }
 
     return m_pages.GetCount();
 }
 
-void wxAuiTabContainer::AddButton(int id, const wxBitmap& bmp)
+void wxAuiTabContainer::AddButton(int id,
+                                  int location,
+                                  const wxBitmap& normal_bitmap,
+                                  const wxBitmap& disabled_bitmap)
 {
     wxAuiTabContainerButton button;
     button.id = id;
 {
     wxAuiTabContainerButton button;
     button.id = id;
-    button.bitmap = bmp;
+    button.bitmap = normal_bitmap;
+    button.dis_bitmap = disabled_bitmap;
+    button.location = location;
     button.cur_state = wxAUI_BUTTON_STATE_NORMAL;
     button.cur_state = wxAUI_BUTTON_STATE_NORMAL;
-    
+
     m_buttons.Add(button);
 }
 
     m_buttons.Add(button);
 }
 
+size_t wxAuiTabContainer::GetTabOffset() const
+{
+    return m_tab_offset;
+}
 
 
+void wxAuiTabContainer::SetTabOffset(size_t offset)
+{
+    m_tab_offset = offset;
+}
 
 
-// DrawTab() draws an individual tab.
-// As it is virtual it may be overridden.
-//
-// dc       - output dc
-// in_rect  - rectangle the tab should be confined to
-// caption  - tab's caption
-// active   - whether or not the tab is active
-// out_rect - actual output rectangle
-// x_extent - the advance x; where the next tab should start
-
-void wxAuiTabContainer::DrawTab(wxDC* dc,
-                                const wxRect& in_rect,
-                                const wxString& caption,
-                                bool active,
-                                wxRect* out_rect,
-                                int* x_extent)
+// Render() renders the tab catalog to the specified DC
+// It is a virtual function and can be overridden to
+// provide custom drawing capabilities
+void wxAuiTabContainer::Render(wxDC* raw_dc)
 {
 {
-    wxCoord normal_textx, normal_texty;
-    wxCoord selected_textx, selected_texty;
-    wxCoord measured_textx, measured_texty;
-    wxCoord textx, texty;
-    
-    
-    // measure text
-    dc->SetFont(m_measuring_font);
-    dc->GetTextExtent(caption, &measured_textx, &measured_texty);
-    
-    dc->SetFont(m_selected_font);
-    dc->GetTextExtent(caption, &selected_textx, &selected_texty);
-    
-    dc->SetFont(m_normal_font);
-    dc->GetTextExtent(caption, &normal_textx, &normal_texty);
+    wxMemoryDC dc;
+    wxBitmap bmp;
+    size_t i;
+    size_t page_count = m_pages.GetCount();
+    size_t button_count = m_buttons.GetCount();
 
 
+    // create off-screen bitmap
+    bmp.Create(m_rect.GetWidth(), m_rect.GetHeight());
+    dc.SelectObject(bmp);
+
+
+    // find out if size of tabs is larger than can be
+    // afforded on screen
+    int total_width = 0;
     
     
-    wxCoord tab_height = measured_texty + 4;
-    wxCoord tab_width = measured_textx + tab_height + 5;
-    wxCoord tab_x = in_rect.x;
-    wxCoord tab_y = in_rect.y + in_rect.height - tab_height;
-    
-    
-    // select pen, brush and font for the tab to be drawn
+    for (i = 0; i < page_count; ++i)
+    {
+        wxAuiNotebookPage& page = m_pages.Item(i);
+        int x_extent = 0;
+        wxSize size = m_art->GetTabSize(&dc, page.caption, page.active, &x_extent);
+        if (i+1 < page_count)
+            total_width += x_extent;
+             else
+            total_width += size.x;
+    }
     
     
-    if (active)
+    if (total_width > m_rect.GetWidth() - 20 || m_tab_offset != 0)
     {
     {
-        dc->SetPen(m_selected_bkpen);
-        dc->SetBrush(m_selected_bkbrush);
-        dc->SetFont(m_selected_font);
-        textx = selected_textx;
-        texty = selected_texty;
+        // show left/right buttons
+        for (i = 0; i < button_count; ++i)
+        {
+            wxAuiTabContainerButton& button = m_buttons.Item(i);
+            if (button.id == wxAUI_BUTTON_LEFT ||
+                button.id == wxAUI_BUTTON_RIGHT)
+            {
+                button.cur_state &= ~wxAUI_BUTTON_STATE_HIDDEN;
+            }
+        }
     }
      else
     {
     }
      else
     {
-        dc->SetPen(m_normal_bkpen);
-        dc->SetBrush(m_normal_bkbrush);
-        dc->SetFont(m_normal_font);
-        textx = normal_textx;
-        texty = normal_texty;
+        // hide left/right buttons
+        for (i = 0; i < button_count; ++i)
+        {
+            wxAuiTabContainerButton& button = m_buttons.Item(i);
+            if (button.id == wxAUI_BUTTON_LEFT ||
+                button.id == wxAUI_BUTTON_RIGHT)
+            {
+                button.cur_state |= wxAUI_BUTTON_STATE_HIDDEN;
+            }
+        }
     }
     }
-    
-     
-    // -- draw line --
-    
-    wxPoint points[7];
-    points[0].x = tab_x;
-    points[0].y = tab_y + tab_height - 1;
-    points[1].x = tab_x + tab_height - 3;
-    points[1].y = tab_y + 2;
-    points[2].x = tab_x + tab_height + 3;
-    points[2].y = tab_y;
-    points[3].x = tab_x + tab_width - 2;
-    points[3].y = tab_y;
-    points[4].x = tab_x + tab_width;
-    points[4].y = tab_y + 2;
-    points[5].x = tab_x + tab_width;
-    points[5].y = tab_y + tab_height - 1;
-    points[6] = points[0];
 
 
 
 
-    dc->DrawPolygon(6, points);
-    
-    dc->SetPen(*wxGREY_PEN);
-    
-    //dc->DrawLines(active ? 6 : 7, points);
-    dc->DrawLines(7, points);
+
+    // draw background
+    m_art->DrawBackground(&dc, m_rect);
+
+    // draw buttons
+    int left_buttons_width = 0;
+    int right_buttons_width = 0;
     
     
-    // -- draw text --
+    int offset = 0;
+
+    // draw the buttons on the right side
+    offset = m_rect.x + m_rect.width;
+    for (i = 0; i < button_count; ++i)
+    {
+        wxAuiTabContainerButton& button = m_buttons.Item(button_count - i - 1);
+        
+        if (button.location != wxRIGHT)
+            continue;
+        if (button.cur_state & wxAUI_BUTTON_STATE_HIDDEN)
+            continue;
+                
+        wxRect button_rect = m_rect;
+        button_rect.SetY(1);
+        button_rect.SetWidth(offset);
+
+        m_art->DrawButton(&dc,
+                          button_rect,
+                          button.id,
+                          button.cur_state,
+                          wxRIGHT,
+                          wxNullBitmap,
+                          &button.rect);
+
+        offset -= button.rect.GetWidth();
+        right_buttons_width += button.rect.GetWidth();
+    }
+
+
+
+    offset = 0;
     
     
-       dc->DrawText(caption,
-                    tab_x + (tab_height/3) + (tab_width/2) - (textx/2),
-                 tab_y + tab_height - texty - 2);
-                 
-    *out_rect = wxRect(tab_x, tab_y, tab_width, tab_height);
-    *x_extent = tab_width - (tab_height/2) - 1;
-}
+    // draw the buttons on the left side
 
 
+    for (i = 0; i < button_count; ++i)
+    {
+        wxAuiTabContainerButton& button = m_buttons.Item(button_count - i - 1);
+        
+        if (button.location != wxLEFT)
+            continue;
+        if (button.cur_state & wxAUI_BUTTON_STATE_HIDDEN)
+            continue;
+   
+        wxRect button_rect(offset, 1, 1000, m_rect.height);
+
+        m_art->DrawButton(&dc,
+                          button_rect,
+                          button.id,
+                          button.cur_state,
+                          wxLEFT,
+                          wxNullBitmap,
+                          &button.rect);
+                          
+        offset += button.rect.GetWidth();
+        left_buttons_width += button.rect.GetWidth();
+    }
 
 
-// Render() renders the tab catalog to the specified DC
-// It is a virtual function and can be overridden to
-// provide custom drawing capabilities
-void wxAuiTabContainer::Render(wxDC* raw_dc)
-{   
-    wxMemoryDC dc;
-    wxBitmap bmp;
-    bmp.Create(m_rect.GetWidth(), m_rect.GetHeight());
-    dc.SelectObject(bmp);
-    // draw background
-    dc.SetBrush(m_bkbrush);
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.DrawRectangle(-1, -1, m_rect.GetWidth()+2, m_rect.GetHeight()+2);
-    // draw base line
-    dc.SetPen(*wxGREY_PEN);
-    dc.DrawLine(0, m_rect.GetHeight()-1, m_rect.GetWidth(), m_rect.GetHeight()-1);
-    size_t i, page_count = m_pages.GetCount();
-    int offset = 0;
+    offset = left_buttons_width;
+    
+    
+    dc.SetClippingRegion(left_buttons_width, 0,
+                 m_rect.GetWidth() - right_buttons_width - left_buttons_width - 2,
+                 m_rect.GetHeight());
+                         
+    // draw the tabs
 
     size_t active = 999;
     int active_offset = 0;
 
     size_t active = 999;
     int active_offset = 0;
-    
+
     int x_extent = 0;
     wxRect rect = m_rect;
     rect.y = 0;
     rect.width = 1000;
     rect.height = m_rect.height;
     int x_extent = 0;
     wxRect rect = m_rect;
     rect.y = 0;
     rect.width = 1000;
     rect.height = m_rect.height;
-        
-    for (i = 0; i < page_count; ++i)
+
+    for (i = m_tab_offset; i < page_count; ++i)
     {
         wxAuiNotebookPage& page = m_pages.Item(i);
     {
         wxAuiNotebookPage& page = m_pages.Item(i);
-           
+
         rect.x = offset;
         rect.x = offset;
-        
-        DrawTab(&dc,
+
+        m_art->DrawTab(&dc, 
                 rect,
                 page.caption,
                 page.active,
                 &page.rect,
                 &x_extent);
                 rect,
                 page.caption,
                 page.active,
                 &page.rect,
                 &x_extent);
-        
+
         if (page.active)
         {
             active = i;
             active_offset = offset;
         }
         if (page.active)
         {
             active = i;
             active_offset = offset;
         }
-                
+
         offset += x_extent;
     }
         offset += x_extent;
     }
-    
+
     // draw the active tab again so it stands in the foreground
     // draw the active tab again so it stands in the foreground
-    if (active < m_pages.GetCount())
+    if (active >= m_tab_offset && active < m_pages.GetCount())
     {
         wxAuiNotebookPage& page = m_pages.Item(active);
 
         rect.x = active_offset;
     {
         wxAuiNotebookPage& page = m_pages.Item(active);
 
         rect.x = active_offset;
-        DrawTab(&dc,
+        m_art->DrawTab(&dc,
                 rect,
                 page.caption,
                 page.active,
                 &page.rect,
                 &x_extent);
     }
                 rect,
                 page.caption,
                 page.active,
                 &page.rect,
                 &x_extent);
     }
+
+    dc.DestroyClippingRegion();
     
     
-    // draw the buttons
-    offset = m_rect.x + m_rect.width;
-    size_t button_count = m_buttons.GetCount();
-    for (i = 0; i < button_count; ++i)
-    {
-        wxAuiTabContainerButton& button = m_buttons.Item(button_count - i - 1);
-        
-        wxRect button_rect(offset - button.bitmap.GetWidth(), 1,
-                           button.bitmap.GetWidth(), button.bitmap.GetHeight());
-        
-        button.rect = button_rect;
-                           
-        DrawButton(dc, button.rect, button.bitmap,
-                   m_bkbrush.GetColour(),
-                   button.cur_state);
-        
-        offset -= button.bitmap.GetWidth();
-    }
-    
-    raw_dc->Blit(m_rect.x, m_rect.y, m_rect.GetWidth(), m_rect.GetHeight(), &dc, 0, 0);
+    raw_dc->Blit(m_rect.x, m_rect.y,
+                 m_rect.GetWidth(), m_rect.GetHeight(),
+                 &dc, 0, 0);
 }
 
 
 }
 
 
@@ -492,21 +797,25 @@ void wxAuiTabContainer::Render(wxDC* raw_dc)
 // true if a tab was hit, otherwise false
 bool wxAuiTabContainer::TabHitTest(int x, int y, wxWindow** hit) const
 {
 // true if a tab was hit, otherwise false
 bool wxAuiTabContainer::TabHitTest(int x, int y, wxWindow** hit) const
 {
-    if (!m_rect.Inside(x,y))
+    if (!m_rect.Contains(x,y))
         return false;
         return false;
-        
+    
+    if (ButtonHitTest(x, y, NULL))
+        return false;
+
     size_t i, page_count = m_pages.GetCount();
     size_t i, page_count = m_pages.GetCount();
-        
-    for (i = 0; i < page_count; ++i)
+
+    for (i = m_tab_offset; i < page_count; ++i)
     {
         wxAuiNotebookPage& page = m_pages.Item(i);
     {
         wxAuiNotebookPage& page = m_pages.Item(i);
-        if (page.rect.Inside(x,y))
+        if (page.rect.Contains(x,y))
         {
         {
-            *hit = page.window;
+            if (hit)
+                *hit = page.window;
             return true;
         }
     }
             return true;
         }
     }
-    
+
     return false;
 }
 
     return false;
 }
 
@@ -515,21 +824,22 @@ bool wxAuiTabContainer::TabHitTest(int x, int y, wxWindow** hit) const
 bool wxAuiTabContainer::ButtonHitTest(int x, int y,
                                       wxAuiTabContainerButton** hit) const
 {
 bool wxAuiTabContainer::ButtonHitTest(int x, int y,
                                       wxAuiTabContainerButton** hit) const
 {
-    if (!m_rect.Inside(x,y))
+    if (!m_rect.Contains(x,y))
         return false;
         return false;
-        
+
     size_t i, button_count = m_buttons.GetCount();
     size_t i, button_count = m_buttons.GetCount();
-        
+
     for (i = 0; i < button_count; ++i)
     {
         wxAuiTabContainerButton& button = m_buttons.Item(i);
     for (i = 0; i < button_count; ++i)
     {
         wxAuiTabContainerButton& button = m_buttons.Item(i);
-        if (button.rect.Inside(x,y))
+        if (button.rect.Contains(x,y))
         {
         {
-            *hit = &button;
+            if (hit)
+                *hit = &button;
             return true;
         }
     }
             return true;
         }
     }
-    
+
     return false;
 }
 
     return false;
 }
 
@@ -586,7 +896,6 @@ void wxAuiTabContainer::DoShowHide()
 // -- wxAuiTabCtrl class implementation --
 
 
 // -- wxAuiTabCtrl class implementation --
 
 
-const int wxAuiButtonClose = 101;
 
 BEGIN_EVENT_TABLE(wxAuiTabCtrl, wxControl)
     EVT_PAINT(wxAuiTabCtrl::OnPaint)
 
 BEGIN_EVENT_TABLE(wxAuiTabCtrl, wxControl)
     EVT_PAINT(wxAuiTabCtrl::OnPaint)
@@ -596,6 +905,7 @@ BEGIN_EVENT_TABLE(wxAuiTabCtrl, wxControl)
     EVT_LEFT_UP(wxAuiTabCtrl::OnLeftUp)
     EVT_MOTION(wxAuiTabCtrl::OnMotion)
     EVT_LEAVE_WINDOW(wxAuiTabCtrl::OnLeaveWindow)
     EVT_LEFT_UP(wxAuiTabCtrl::OnLeftUp)
     EVT_MOTION(wxAuiTabCtrl::OnMotion)
     EVT_LEAVE_WINDOW(wxAuiTabCtrl::OnLeaveWindow)
+    EVT_AUINOTEBOOK_BUTTON(-1, wxAuiTabCtrl::OnButton)
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 
@@ -603,28 +913,20 @@ wxAuiTabCtrl::wxAuiTabCtrl(wxWindow* parent,
                            wxWindowID id,
                            const wxPoint& pos,
                            const wxSize& size,
                            wxWindowID id,
                            const wxPoint& pos,
                            const wxSize& size,
-                           long style) : wxControl(parent, id, pos, size, style)           
+                           long style) : wxControl(parent, id, pos, size, style)
 {
     m_click_pt = wxDefaultPosition;
     m_is_dragging = false;
     m_hover_button = NULL;
 {
     m_click_pt = wxDefaultPosition;
     m_is_dragging = false;
     m_hover_button = NULL;
-    // copied from dockart-- needs to put in a common place   
-    static unsigned char close_bits[]={
-        0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0xfb,0xcf,0xf9,
-        0x9f,0xfc,0x3f,0xfe,0x3f,0xfe,0x9f,0xfc,0xcf,0xf9,0xef,0xfb,
-        0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
-        
-    AddButton(101, BitmapFromBits(close_bits, 16, 16, *wxBLACK));
 }
 
 
 void wxAuiTabCtrl::OnPaint(wxPaintEvent&)
 {
     wxPaintDC dc(this);
 }
 
 
 void wxAuiTabCtrl::OnPaint(wxPaintEvent&)
 {
     wxPaintDC dc(this);
-    
+
     dc.SetFont(GetFont());
     dc.SetFont(GetFont());
-    
+
     if (GetPageCount() > 0)
         Render(&dc);
 }
     if (GetPageCount() > 0)
         Render(&dc);
 }
@@ -646,7 +948,7 @@ void wxAuiTabCtrl::OnLeftDown(wxMouseEvent& evt)
     m_click_pt = wxDefaultPosition;
     m_is_dragging = false;
     m_click_tab = -1;
     m_click_pt = wxDefaultPosition;
     m_is_dragging = false;
     m_click_tab = -1;
-    
+
     wxWindow* wnd;
     if (TabHitTest(evt.m_x, evt.m_y, &wnd))
     {
     wxWindow* wnd;
     if (TabHitTest(evt.m_x, evt.m_y, &wnd))
     {
@@ -655,12 +957,12 @@ void wxAuiTabCtrl::OnLeftDown(wxMouseEvent& evt)
         e.SetOldSelection(GetActivePage());
         e.SetEventObject(this);
         GetEventHandler()->ProcessEvent(e);
         e.SetOldSelection(GetActivePage());
         e.SetEventObject(this);
         GetEventHandler()->ProcessEvent(e);
-        
+
         m_click_pt.x = evt.m_x;
         m_click_pt.y = evt.m_y;
         m_click_tab = e.GetSelection();
     }
         m_click_pt.x = evt.m_x;
         m_click_pt.y = evt.m_y;
         m_click_tab = e.GetSelection();
     }
-    
+
     if (m_hover_button)
     {
         m_hover_button->cur_state = wxAUI_BUTTON_STATE_PRESSED;
     if (m_hover_button)
     {
         m_hover_button->cur_state = wxAUI_BUTTON_STATE_PRESSED;
@@ -673,7 +975,7 @@ void wxAuiTabCtrl::OnLeftUp(wxMouseEvent&)
 {
     if (GetCapture() == this)
         ReleaseMouse();
 {
     if (GetCapture() == this)
         ReleaseMouse();
-    
+
     if (m_is_dragging)
     {
         wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, m_windowId);
     if (m_is_dragging)
     {
         wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, m_windowId);
@@ -683,19 +985,19 @@ void wxAuiTabCtrl::OnLeftUp(wxMouseEvent&)
         GetEventHandler()->ProcessEvent(evt);
         return;
     }
         GetEventHandler()->ProcessEvent(evt);
         return;
     }
-    
+
     if (m_hover_button)
     {
         m_hover_button->cur_state = wxAUI_BUTTON_STATE_HOVER;
         Refresh();
         Update();
     if (m_hover_button)
     {
         m_hover_button->cur_state = wxAUI_BUTTON_STATE_HOVER;
         Refresh();
         Update();
-           
+
         wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, m_windowId);
         evt.SetInt(m_hover_button->id);
         evt.SetEventObject(this);
         GetEventHandler()->ProcessEvent(evt);
     }
         wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, m_windowId);
         evt.SetInt(m_hover_button->id);
         evt.SetEventObject(this);
         GetEventHandler()->ProcessEvent(evt);
     }
-    
+
     m_click_pt = wxDefaultPosition;
     m_is_dragging = false;
     m_click_tab = -1;
     m_click_pt = wxDefaultPosition;
     m_is_dragging = false;
     m_click_tab = -1;
@@ -709,6 +1011,14 @@ void wxAuiTabCtrl::OnMotion(wxMouseEvent& evt)
     wxAuiTabContainerButton* button;
     if (ButtonHitTest(pos.x, pos.y, &button))
     {
     wxAuiTabContainerButton* button;
     if (ButtonHitTest(pos.x, pos.y, &button))
     {
+        if (m_hover_button && button != m_hover_button)
+        {
+            m_hover_button->cur_state = wxAUI_BUTTON_STATE_NORMAL;
+            m_hover_button = NULL;
+            Refresh();
+            Update();
+        }
+        
         if (button->cur_state != wxAUI_BUTTON_STATE_HOVER)
         {
             button->cur_state = wxAUI_BUTTON_STATE_HOVER;
         if (button->cur_state != wxAUI_BUTTON_STATE_HOVER)
         {
             button->cur_state = wxAUI_BUTTON_STATE_HOVER;
@@ -728,11 +1038,11 @@ void wxAuiTabCtrl::OnMotion(wxMouseEvent& evt)
             Update();
         }
     }
             Update();
         }
     }
-    
-    
+
+
     if (!evt.LeftIsDown() || m_click_pt == wxDefaultPosition)
         return;
     if (!evt.LeftIsDown() || m_click_pt == wxDefaultPosition)
         return;
-   
+
     if (m_is_dragging)
     {
         wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, m_windowId);
     if (m_is_dragging)
     {
         wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, m_windowId);
@@ -741,9 +1051,9 @@ void wxAuiTabCtrl::OnMotion(wxMouseEvent& evt)
         evt.SetEventObject(this);
         GetEventHandler()->ProcessEvent(evt);
         return;
         evt.SetEventObject(this);
         GetEventHandler()->ProcessEvent(evt);
         return;
-    }   
-   
-    
+    }
+
+
     int drag_x_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_X);
     int drag_y_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_Y);
 
     int drag_x_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_X);
     int drag_y_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_Y);
 
@@ -755,7 +1065,7 @@ void wxAuiTabCtrl::OnMotion(wxMouseEvent& evt)
         evt.SetOldSelection(m_click_tab);
         evt.SetEventObject(this);
         GetEventHandler()->ProcessEvent(evt);
         evt.SetOldSelection(m_click_tab);
         evt.SetEventObject(this);
         GetEventHandler()->ProcessEvent(evt);
-        
+
         m_is_dragging = true;
     }
 }
         m_is_dragging = true;
     }
 }
@@ -771,6 +1081,33 @@ void wxAuiTabCtrl::OnLeaveWindow(wxMouseEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 
+void wxAuiTabCtrl::OnButton(wxAuiNotebookEvent& event)
+{
+    int button = event.GetInt();
+    
+    if (button == wxAUI_BUTTON_LEFT || button == wxAUI_BUTTON_RIGHT)
+    {
+        if (button == wxAUI_BUTTON_LEFT)
+        {
+            if (GetTabOffset() > 0)
+            {
+                SetTabOffset(GetTabOffset()-1);
+                Refresh();
+                Update();
+            }
+        }
+         else
+        {
+            SetTabOffset(GetTabOffset()+1);
+            Refresh();
+            Update();
+        }
+    }
+     else
+    {
+        event.Skip();
+    }
+}
 
 // wxTabFrame is an interesting case.  It's important that all child pages
 // of the multi-notebook control are all actually children of that control
 
 // wxTabFrame is an interesting case.  It's important that all child pages
 // of the multi-notebook control are all actually children of that control
@@ -790,12 +1127,12 @@ public:
         m_rect = wxRect(0,0,200,200);
         m_tab_ctrl_height = 20;
     }
         m_rect = wxRect(0,0,200,200);
         m_tab_ctrl_height = 20;
     }
-    
+
     void SetTabCtrlHeight(int h)
     {
         m_tab_ctrl_height = h;
     }
     void SetTabCtrlHeight(int h)
     {
         m_tab_ctrl_height = h;
     }
-    
+
     void DoSetSize(int x, int y,
                    int width, int height,
                    int WXUNUSED(sizeFlags = wxSIZE_AUTO))
     void DoSetSize(int x, int y,
                    int width, int height,
                    int WXUNUSED(sizeFlags = wxSIZE_AUTO))
@@ -803,32 +1140,35 @@ public:
         m_rect = wxRect(x, y, width, height);
         DoSizing();
     }
         m_rect = wxRect(x, y, width, height);
         DoSizing();
     }
-    
+
     void DoGetClientSize(int* x, int* y) const
     {
         *x = m_rect.width;
         *y = m_rect.height;
     }
     void DoGetClientSize(int* x, int* y) const
     {
         *x = m_rect.width;
         *y = m_rect.height;
     }
-    
+
+    bool Show( bool WXUNUSED(show = true) ) { return false; }
+
     void DoSizing()
     {
         if (!m_tabs)
             return;
     void DoSizing()
     {
         if (!m_tabs)
             return;
-            
+
         int tab_height = wxMin(m_rect.height, m_tab_ctrl_height);
         m_tab_rect = wxRect(m_rect.x, m_rect.y, m_rect.width, tab_height);
         m_tabs->SetSize(m_rect.x, m_rect.y, m_rect.width, tab_height);
         m_tabs->SetRect(wxRect(0, 0, m_rect.width, tab_height));
         m_tabs->Refresh();
         int tab_height = wxMin(m_rect.height, m_tab_ctrl_height);
         m_tab_rect = wxRect(m_rect.x, m_rect.y, m_rect.width, tab_height);
         m_tabs->SetSize(m_rect.x, m_rect.y, m_rect.width, tab_height);
         m_tabs->SetRect(wxRect(0, 0, m_rect.width, tab_height));
         m_tabs->Refresh();
-        
+        m_tabs->Update();
+
         wxAuiNotebookPageArray& pages = m_tabs->GetPages();
         size_t i, page_count = pages.GetCount();
         wxAuiNotebookPageArray& pages = m_tabs->GetPages();
         size_t i, page_count = pages.GetCount();
-        
+
         for (i = 0; i < page_count; ++i)
         {
             wxAuiNotebookPage& page = pages.Item(i);
             page.window->SetSize(m_rect.x, m_rect.y+tab_height, m_rect.width, m_rect.height-tab_height);
         for (i = 0; i < page_count; ++i)
         {
             wxAuiNotebookPage& page = pages.Item(i);
             page.window->SetSize(m_rect.x, m_rect.y+tab_height, m_rect.width, m_rect.height-tab_height);
-            
+
             if (page.window->IsKindOf(CLASSINFO(wxTabMDIChildFrame)))
             {
                 wxTabMDIChildFrame* wnd = (wxTabMDIChildFrame*)page.window;
             if (page.window->IsKindOf(CLASSINFO(wxTabMDIChildFrame)))
             {
                 wxTabMDIChildFrame* wnd = (wxTabMDIChildFrame*)page.window;
@@ -844,12 +1184,12 @@ public:
         if (y)
             *y = m_rect.GetHeight();
     }
         if (y)
             *y = m_rect.GetHeight();
     }
-    
+
     void Update()
     {
         // does nothing
     }
     void Update()
     {
         // does nothing
     }
-    
+
 public:
 
     wxRect m_rect;
 public:
 
     wxRect m_rect;
@@ -874,10 +1214,10 @@ BEGIN_EVENT_TABLE(wxAuiMultiNotebook, wxControl)
                       wxAuiMultiNotebook::OnTabClicked)
     EVT_COMMAND_RANGE(10000, 10100,
                       wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG,
                       wxAuiMultiNotebook::OnTabClicked)
     EVT_COMMAND_RANGE(10000, 10100,
                       wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG,
-                      wxAuiMultiNotebook::OnTabBeginDrag)                      
+                      wxAuiMultiNotebook::OnTabBeginDrag)
     EVT_COMMAND_RANGE(10000, 10100,
                       wxEVT_COMMAND_AUINOTEBOOK_END_DRAG,
     EVT_COMMAND_RANGE(10000, 10100,
                       wxEVT_COMMAND_AUINOTEBOOK_END_DRAG,
-                      wxAuiMultiNotebook::OnTabEndDrag)                      
+                      wxAuiMultiNotebook::OnTabEndDrag)
     EVT_COMMAND_RANGE(10000, 10100,
                       wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION,
                       wxAuiMultiNotebook::OnTabDragMotion)
     EVT_COMMAND_RANGE(10000, 10100,
                       wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION,
                       wxAuiMultiNotebook::OnTabDragMotion)
@@ -911,9 +1251,9 @@ bool wxAuiMultiNotebook::Create(wxWindow* parent,
 {
     if (!wxControl::Create(parent, id, pos, size, style))
         return false;
 {
     if (!wxControl::Create(parent, id, pos, size, style))
         return false;
-    
+
     InitNotebook();
     InitNotebook();
-    
+
     return true;
 }
 
     return true;
 }
 
@@ -925,27 +1265,27 @@ void wxAuiMultiNotebook::InitNotebook()
     m_tab_id_counter = 10000;
     m_dummy_wnd = NULL;
     m_tab_ctrl_height = 20;
     m_tab_id_counter = 10000;
     m_dummy_wnd = NULL;
     m_tab_ctrl_height = 20;
-    
+
     m_normal_font = *wxNORMAL_FONT;
     m_selected_font = *wxNORMAL_FONT;
     m_selected_font.SetWeight(wxBOLD);
     m_normal_font = *wxNORMAL_FONT;
     m_selected_font = *wxNORMAL_FONT;
     m_selected_font.SetWeight(wxBOLD);
-    
+
     // choose a default for the tab height
     wxClientDC dc(this);
     int tx, ty;
     dc.SetFont(m_selected_font);
     dc.GetTextExtent(wxT("ABCDEFGHhijklm"), &tx, &ty);
     m_tab_ctrl_height = (ty*150)/100;
     // choose a default for the tab height
     wxClientDC dc(this);
     int tx, ty;
     dc.SetFont(m_selected_font);
     dc.GetTextExtent(wxT("ABCDEFGHhijklm"), &tx, &ty);
     m_tab_ctrl_height = (ty*150)/100;
-    
-    m_dummy_wnd = new wxWindow(this, -1, wxPoint(0,0), wxSize(0,0));
+
+    m_dummy_wnd = new wxWindow(this, wxID_ANY, wxPoint(0,0), wxSize(0,0));
     m_dummy_wnd->SetSize(200, 200);
     m_dummy_wnd->Show(false);
     m_dummy_wnd->SetSize(200, 200);
     m_dummy_wnd->Show(false);
-    
+
     m_mgr.SetManagedWindow(this);
     m_mgr.SetManagedWindow(this);
-    
+
     m_mgr.AddPane(m_dummy_wnd,
               wxPaneInfo().Name(wxT("dummy")).Bottom().Show(false));
     m_mgr.AddPane(m_dummy_wnd,
               wxPaneInfo().Name(wxT("dummy")).Bottom().Show(false));
-              
+
     m_mgr.Update();
 }
 
     m_mgr.Update();
 }
 
@@ -954,6 +1294,16 @@ wxAuiMultiNotebook::~wxAuiMultiNotebook()
     m_mgr.UnInit();
 }
 
     m_mgr.UnInit();
 }
 
+void wxAuiMultiNotebook::SetArtProvider(wxTabArt* art)
+{
+    m_tabs.SetArtProvider(art);
+}
+
+wxTabArt* wxAuiMultiNotebook::GetArtProvider()
+{
+    return m_tabs.GetArtProvider();
+}
+
 bool wxAuiMultiNotebook::AddPage(wxWindow* page,
                             const wxString& caption,
                             bool select,
 bool wxAuiMultiNotebook::AddPage(wxWindow* page,
                             const wxString& caption,
                             bool select,
@@ -961,7 +1311,7 @@ bool wxAuiMultiNotebook::AddPage(wxWindow* page,
 {
     return InsertPage(GetPageCount(), page, caption, select, bitmap);
 }
 {
     return InsertPage(GetPageCount(), page, caption, select, bitmap);
 }
-                
+
 bool wxAuiMultiNotebook::InsertPage(size_t page_idx,
                                wxWindow* page,
                                const wxString& caption,
 bool wxAuiMultiNotebook::InsertPage(size_t page_idx,
                                wxWindow* page,
                                const wxString& caption,
@@ -986,18 +1336,18 @@ bool wxAuiMultiNotebook::InsertPage(size_t page_idx,
         active_tabctrl->AddPage(page, info);
          else
         active_tabctrl->InsertPage(page, info, page_idx);
         active_tabctrl->AddPage(page, info);
          else
         active_tabctrl->InsertPage(page, info, page_idx);
+
     DoSizing();
     active_tabctrl->DoShowHide();
     DoSizing();
     active_tabctrl->DoShowHide();
-       
+
     if (select)
     {
         int idx = m_tabs.GetIdxFromWindow(page);
         wxASSERT_MSG(idx != -1, wxT("Invalid Page index returned on wxAuiMultiNotebook::InsertPage()"));
     if (select)
     {
         int idx = m_tabs.GetIdxFromWindow(page);
         wxASSERT_MSG(idx != -1, wxT("Invalid Page index returned on wxAuiMultiNotebook::InsertPage()"));
-        
+
         SetSelection(idx);
     }
         SetSelection(idx);
     }
-    
+
     return true;
 }
 
     return true;
 }
 
@@ -1005,57 +1355,48 @@ bool wxAuiMultiNotebook::InsertPage(size_t page_idx,
 // DeletePage() removes a tab from the multi-notebook,
 // and destroys the window as well
 bool wxAuiMultiNotebook::DeletePage(size_t page_idx)
 // DeletePage() removes a tab from the multi-notebook,
 // and destroys the window as well
 bool wxAuiMultiNotebook::DeletePage(size_t page_idx)
-{
-    wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx);   
-    
-        
+{    
+    wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx);
+    wxWindow* new_active = NULL;
+
     // find out which onscreen tab ctrl owns this tab
     wxAuiTabCtrl* ctrl;
     int ctrl_idx;
     if (!FindTab(wnd, &ctrl, &ctrl_idx))
         return false;
     // find out which onscreen tab ctrl owns this tab
     wxAuiTabCtrl* ctrl;
     int ctrl_idx;
     if (!FindTab(wnd, &ctrl, &ctrl_idx))
         return false;
-    
+
     // find a new page and set it as active
     int new_idx = ctrl_idx+1;
     if (new_idx >= (int)ctrl->GetPageCount())
         new_idx = ctrl_idx-1;
     // find a new page and set it as active
     int new_idx = ctrl_idx+1;
     if (new_idx >= (int)ctrl->GetPageCount())
         new_idx = ctrl_idx-1;
-        
+
     if (new_idx >= 0 && new_idx < (int)ctrl->GetPageCount())
     {
     if (new_idx >= 0 && new_idx < (int)ctrl->GetPageCount())
     {
-        wxWindow* new_wnd = ctrl->GetWindowFromIdx(new_idx);
-        int main_idx = m_tabs.GetIdxFromWindow(new_wnd);
-        wxASSERT(main_idx != -1);
-        SetSelection(main_idx);
+        new_active = ctrl->GetWindowFromIdx(new_idx);
     }
      else
     {
         // set the active page to the first page that
         // isn't the one being deleted
     }
      else
     {
         // set the active page to the first page that
         // isn't the one being deleted
-        bool found = false;
         size_t i, page_count = m_tabs.GetPageCount();
         for (i = 0; i < page_count; ++i)
         {
             wxWindow* w = m_tabs.GetWindowFromIdx(i);
             if (wnd != w)
             {
         size_t i, page_count = m_tabs.GetPageCount();
         for (i = 0; i < page_count; ++i)
         {
             wxWindow* w = m_tabs.GetWindowFromIdx(i);
             if (wnd != w)
             {
-                found = true;
-                SetSelection(i);
+                new_active = m_tabs.GetWindowFromIdx(i);
                 break;
             }
         }
                 break;
             }
         }
-        
-        if (!found)
-            m_curpage = -1;
     }
     }
-    
-    
+
     // remove the tab from main catalog
     if (!m_tabs.RemovePage(wnd))
         return false;
     // remove the tab from main catalog
     if (!m_tabs.RemovePage(wnd))
         return false;
-    
+
     // remove the tab from the onscreen tab ctrl
     ctrl->RemovePage(wnd);
     // remove the tab from the onscreen tab ctrl
     ctrl->RemovePage(wnd);
-    
+
     // actually destroy the window now
     if (wnd->IsKindOf(CLASSINFO(wxTabMDIChildFrame)))
     {
     // actually destroy the window now
     if (wnd->IsKindOf(CLASSINFO(wxTabMDIChildFrame)))
     {
@@ -1068,9 +1409,16 @@ bool wxAuiMultiNotebook::DeletePage(size_t page_idx)
     {
         wnd->Destroy();
     }
     {
         wnd->Destroy();
     }
-    
+
     RemoveEmptyTabFrames();
     RemoveEmptyTabFrames();
-     
+
+    // set new active pane
+    if (new_active)
+    {
+        m_curpage = -1;
+        SetSelection(m_tabs.GetIdxFromWindow(new_active));
+    }
+    
     return true;
 }
 
     return true;
 }
 
@@ -1084,7 +1432,7 @@ bool wxAuiMultiNotebook::RemovePage(size_t page_idx)
     wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx);
     if (!m_tabs.RemovePage(wnd))
         return false;
     wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx);
     if (!m_tabs.RemovePage(wnd))
         return false;
-        
+
     // remove the tab from the onscreen tab ctrl
     wxAuiTabCtrl* ctrl;
     int ctrl_idx;
     // remove the tab from the onscreen tab ctrl
     wxAuiTabCtrl* ctrl;
     int ctrl_idx;
@@ -1093,20 +1441,20 @@ bool wxAuiMultiNotebook::RemovePage(size_t page_idx)
         ctrl->RemovePage(wnd);
         return true;
     }
         ctrl->RemovePage(wnd);
         return true;
     }
-    
+
     return false;
 }
 
 // SetPageText() changes the tab caption of the specified page
 bool wxAuiMultiNotebook::SetPageText(size_t page_idx, const wxString& text)
     return false;
 }
 
 // SetPageText() changes the tab caption of the specified page
 bool wxAuiMultiNotebook::SetPageText(size_t page_idx, const wxString& text)
-{    
+{
     if (page_idx >= m_tabs.GetPageCount())
         return false;
     if (page_idx >= m_tabs.GetPageCount())
         return false;
-    
+
     // update our own tab catalog
     wxAuiNotebookPage& page_info = m_tabs.GetPage(page_idx);
     page_info.caption = text;
     // update our own tab catalog
     wxAuiNotebookPage& page_info = m_tabs.GetPage(page_idx);
     page_info.caption = text;
-    
+
     // update what's on screen
     wxAuiTabCtrl* ctrl;
     int ctrl_idx;
     // update what's on screen
     wxAuiTabCtrl* ctrl;
     int ctrl_idx;
@@ -1115,9 +1463,9 @@ bool wxAuiMultiNotebook::SetPageText(size_t page_idx, const wxString& text)
         wxAuiNotebookPage& info = ctrl->GetPage(ctrl_idx);
         info.caption = text;
         ctrl->Refresh();
         wxAuiNotebookPage& info = ctrl->GetPage(ctrl_idx);
         info.caption = text;
         ctrl->Refresh();
+        ctrl->Update();
     }
     }
-    
-    
+
     return true;
 }
 
     return true;
 }
 
@@ -1133,7 +1481,7 @@ size_t wxAuiMultiNotebook::SetSelection(size_t new_page)
     wxWindow* wnd = m_tabs.GetWindowFromIdx(new_page);
     if (!wnd)
         return m_curpage;
     wxWindow* wnd = m_tabs.GetWindowFromIdx(new_page);
     if (!wnd)
         return m_curpage;
-            
+
     wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
     evt.SetSelection(new_page);
     evt.SetOldSelection(m_curpage);
     wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
     evt.SetSelection(new_page);
     evt.SetOldSelection(m_curpage);
@@ -1149,13 +1497,13 @@ size_t wxAuiMultiNotebook::SetSelection(size_t new_page)
         wxAuiTabCtrl* ctrl;
         int ctrl_idx;
         if (FindTab(wnd, &ctrl, &ctrl_idx))
         wxAuiTabCtrl* ctrl;
         int ctrl_idx;
         if (FindTab(wnd, &ctrl, &ctrl_idx))
-        { 
+        {
             m_tabs.SetActivePage(wnd);
             m_tabs.SetActivePage(wnd);
-            
+
             ctrl->SetActivePage(ctrl_idx);
             DoSizing();
             ctrl->DoShowHide();
             ctrl->SetActivePage(ctrl_idx);
             DoSizing();
             ctrl->DoShowHide();
-            
+
             int old_curpage = m_curpage;
             m_curpage = new_page;
 
             int old_curpage = m_curpage;
             m_curpage = new_page;
 
@@ -1177,7 +1525,7 @@ size_t wxAuiMultiNotebook::SetSelection(size_t new_page)
             }
 
             wnd->SetFocus();
             }
 
             wnd->SetFocus();
-            
+
             return old_curpage;
         }
     }
             return old_curpage;
         }
     }
@@ -1197,7 +1545,7 @@ size_t wxAuiMultiNotebook::GetPageCount() const
 wxWindow* wxAuiMultiNotebook::GetPage(size_t page_idx) const
 {
     wxASSERT(page_idx < m_tabs.GetPageCount());
 wxWindow* wxAuiMultiNotebook::GetPage(size_t page_idx) const
 {
     wxASSERT(page_idx < m_tabs.GetPageCount());
-    
+
     return m_tabs.GetWindowFromIdx(page_idx);
 }
 
     return m_tabs.GetWindowFromIdx(page_idx);
 }
 
@@ -1224,15 +1572,15 @@ wxAuiTabCtrl* wxAuiMultiNotebook::GetActiveTabCtrl()
     {
         wxAuiTabCtrl* ctrl;
         int idx;
     {
         wxAuiTabCtrl* ctrl;
         int idx;
-        
+
         // find the tab ctrl with the current page
         if (FindTab(m_tabs.GetPage(m_curpage).window,
                     &ctrl, &idx))
         // find the tab ctrl with the current page
         if (FindTab(m_tabs.GetPage(m_curpage).window,
                     &ctrl, &idx))
-        {        
+        {
             return ctrl;
         }
     }
             return ctrl;
         }
     }
-    
+
     // no current page, just find the first tab ctrl
     wxPaneInfoArray& all_panes = m_mgr.GetAllPanes();
     size_t i, pane_count = all_panes.GetCount();
     // no current page, just find the first tab ctrl
     wxPaneInfoArray& all_panes = m_mgr.GetAllPanes();
     size_t i, pane_count = all_panes.GetCount();
@@ -1240,11 +1588,11 @@ wxAuiTabCtrl* wxAuiMultiNotebook::GetActiveTabCtrl()
     {
         if (all_panes.Item(i).name == wxT("dummy"))
             continue;
     {
         if (all_panes.Item(i).name == wxT("dummy"))
             continue;
-            
+
         wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window;
         return tabframe->m_tabs;
     }
         wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window;
         return tabframe->m_tabs;
     }
-    
+
     // If there is no tabframe at all, create one
     wxTabFrame* tabframe = new wxTabFrame;
     tabframe->SetTabCtrlHeight(m_tab_ctrl_height);
     // If there is no tabframe at all, create one
     wxTabFrame* tabframe = new wxTabFrame;
     tabframe->SetTabCtrlHeight(m_tab_ctrl_height);
@@ -1254,10 +1602,10 @@ wxAuiTabCtrl* wxAuiMultiNotebook::GetActiveTabCtrl()
                                         wxDefaultSize,
                                         wxNO_BORDER);
     m_mgr.AddPane(tabframe,
                                         wxDefaultSize,
                                         wxNO_BORDER);
     m_mgr.AddPane(tabframe,
-                  wxPaneInfo().Center().CaptionVisible(false));                
-    
+                  wxPaneInfo().Center().CaptionVisible(false));
+
     m_mgr.Update();
     m_mgr.Update();
-    
+
     return tabframe->m_tabs;
 }
 
     return tabframe->m_tabs;
 }
 
@@ -1272,9 +1620,9 @@ bool wxAuiMultiNotebook::FindTab(wxWindow* page, wxAuiTabCtrl** ctrl, int* idx)
     {
         if (all_panes.Item(i).name == wxT("dummy"))
             continue;
     {
         if (all_panes.Item(i).name == wxT("dummy"))
             continue;
-            
+
         wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window;
         wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window;
-        
+
         int page_idx = tabframe->m_tabs->GetIdxFromWindow(page);
         if (page_idx != -1)
         {
         int page_idx = tabframe->m_tabs->GetIdxFromWindow(page);
         if (page_idx != -1)
         {
@@ -1283,7 +1631,7 @@ bool wxAuiMultiNotebook::FindTab(wxWindow* page, wxAuiTabCtrl** ctrl, int* idx)
             return true;
         }
     }
             return true;
         }
     }
-    
+
     return false;
 }
 
     return false;
 }
 
@@ -1299,16 +1647,16 @@ void wxAuiMultiNotebook::OnSize(wxSizeEvent&)
 void wxAuiMultiNotebook::OnTabClicked(wxCommandEvent& command_evt)
 {
     wxAuiNotebookEvent& evt = (wxAuiNotebookEvent&)command_evt;
 void wxAuiMultiNotebook::OnTabClicked(wxCommandEvent& command_evt)
 {
     wxAuiNotebookEvent& evt = (wxAuiNotebookEvent&)command_evt;
-    
+
     wxAuiTabCtrl* ctrl = (wxAuiTabCtrl*)evt.GetEventObject();
     wxASSERT(ctrl != NULL);
     wxAuiTabCtrl* ctrl = (wxAuiTabCtrl*)evt.GetEventObject();
     wxASSERT(ctrl != NULL);
-    
+
     wxWindow* wnd = ctrl->GetWindowFromIdx(evt.GetSelection());
     wxASSERT(wnd != NULL);
     wxWindow* wnd = ctrl->GetWindowFromIdx(evt.GetSelection());
     wxASSERT(wnd != NULL);
-    
+
     int idx = m_tabs.GetIdxFromWindow(wnd);
     wxASSERT(idx != -1);
     int idx = m_tabs.GetIdxFromWindow(wnd);
     wxASSERT(idx != -1);
-    
+
     SetSelection(idx);
 }
 
     SetSelection(idx);
 }
 
@@ -1321,9 +1669,9 @@ void wxAuiMultiNotebook::OnTabDragMotion(wxCommandEvent& evt)
     wxPoint screen_pt = ::wxGetMousePosition();
     wxPoint client_pt = ScreenToClient(screen_pt);
     wxPoint zero(0,0);
     wxPoint screen_pt = ::wxGetMousePosition();
     wxPoint client_pt = ScreenToClient(screen_pt);
     wxPoint zero(0,0);
-    
+
     wxAuiTabCtrl* src_tabs = (wxAuiTabCtrl*)evt.GetEventObject();
     wxAuiTabCtrl* src_tabs = (wxAuiTabCtrl*)evt.GetEventObject();
-    
+
     wxAuiTabCtrl* tab_ctrl = GetTabCtrlFromPoint(client_pt);
     if (tab_ctrl == src_tabs)
     {
     wxAuiTabCtrl* tab_ctrl = GetTabCtrlFromPoint(client_pt);
     if (tab_ctrl == src_tabs)
     {
@@ -1331,7 +1679,7 @@ void wxAuiMultiNotebook::OnTabDragMotion(wxCommandEvent& evt)
         m_mgr.HideHint();
         return;
     }
         m_mgr.HideHint();
         return;
     }
-    
+
     if (tab_ctrl)
     {
         wxRect hint_rect = tab_ctrl->GetRect();
     if (tab_ctrl)
     {
         wxRect hint_rect = tab_ctrl->GetRect();
@@ -1351,7 +1699,7 @@ void wxAuiMultiNotebook::OnTabEndDrag(wxCommandEvent& command_evt)
     wxAuiNotebookEvent& evt = (wxAuiNotebookEvent&)command_evt;
 
     m_mgr.HideHint();
     wxAuiNotebookEvent& evt = (wxAuiNotebookEvent&)command_evt;
 
     m_mgr.HideHint();
-    
+
 
     // get the mouse position, which will be used to determine the drop point
     wxPoint mouse_screen_pt = ::wxGetMousePosition();
 
     // get the mouse position, which will be used to determine the drop point
     wxPoint mouse_screen_pt = ::wxGetMousePosition();
@@ -1361,7 +1709,7 @@ void wxAuiMultiNotebook::OnTabEndDrag(wxCommandEvent& command_evt)
     // the src tab control is the control that fired this event
     wxAuiTabCtrl* src_tabs = (wxAuiTabCtrl*)evt.GetEventObject();
     wxAuiTabCtrl* dest_tabs = NULL;
     // the src tab control is the control that fired this event
     wxAuiTabCtrl* src_tabs = (wxAuiTabCtrl*)evt.GetEventObject();
     wxAuiTabCtrl* dest_tabs = NULL;
-    
+
 
     // If the pointer is in an existing tab frame, do a tab insert
     wxWindow* hit_wnd = ::wxFindWindowAtPoint(mouse_screen_pt);
 
     // If the pointer is in an existing tab frame, do a tab insert
     wxWindow* hit_wnd = ::wxFindWindowAtPoint(mouse_screen_pt);
@@ -1369,7 +1717,7 @@ void wxAuiMultiNotebook::OnTabEndDrag(wxCommandEvent& command_evt)
     if (tab_frame)
     {
         dest_tabs = tab_frame->m_tabs;
     if (tab_frame)
     {
         dest_tabs = tab_frame->m_tabs;
-        
+
         if (dest_tabs == src_tabs)
             return;
     }
         if (dest_tabs == src_tabs)
             return;
     }
@@ -1389,9 +1737,9 @@ void wxAuiMultiNotebook::OnTabEndDrag(wxCommandEvent& command_evt)
         m_mgr.Update();
         dest_tabs = new_tabs->m_tabs;
     }
         m_mgr.Update();
         dest_tabs = new_tabs->m_tabs;
     }
-     
-     
-        
+
+
+
     // remove the page from the source tabs
     wxAuiNotebookPage page_info = src_tabs->GetPage(evt.GetSelection());
     page_info.active = false;
     // remove the page from the source tabs
     wxAuiNotebookPage page_info = src_tabs->GetPage(evt.GetSelection());
     page_info.active = false;
@@ -1403,16 +1751,16 @@ void wxAuiMultiNotebook::OnTabEndDrag(wxCommandEvent& command_evt)
         src_tabs->Refresh();
     }
 
         src_tabs->Refresh();
     }
 
-    
-  
+
+
     // add the page to the destination tabs
     dest_tabs->AddPage(page_info.window, page_info);
     // add the page to the destination tabs
     dest_tabs->AddPage(page_info.window, page_info);
-    
+
     if (src_tabs->GetPageCount() == 0)
     if (src_tabs->GetPageCount() == 0)
-    {    
+    {
         RemoveEmptyTabFrames();
     }
         RemoveEmptyTabFrames();
     }
-    
+
     DoSizing();
     dest_tabs->DoShowHide();
     dest_tabs->Refresh();
     DoSizing();
     dest_tabs->DoShowHide();
     dest_tabs->Refresh();
@@ -1430,12 +1778,12 @@ wxAuiTabCtrl* wxAuiMultiNotebook::GetTabCtrlFromPoint(const wxPoint& pt)
     {
         if (all_panes.Item(i).name == wxT("dummy"))
             continue;
     {
         if (all_panes.Item(i).name == wxT("dummy"))
             continue;
-            
+
         wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window;
         wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window;
-        if (tabframe->m_tab_rect.Inside(pt))
+        if (tabframe->m_tab_rect.Contains(pt))
             return tabframe->m_tabs;
     }
             return tabframe->m_tabs;
     }
-    
+
     return NULL;
 }
 
     return NULL;
 }
 
@@ -1449,21 +1797,19 @@ wxWindow* wxAuiMultiNotebook::GetTabFrameFromTabCtrl(wxWindow* tab_ctrl)
     {
         if (all_panes.Item(i).name == wxT("dummy"))
             continue;
     {
         if (all_panes.Item(i).name == wxT("dummy"))
             continue;
-            
+
         wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window;
         if (tabframe->m_tabs == tab_ctrl)
         {
             return tabframe;
         }
     }
         wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window;
         if (tabframe->m_tabs == tab_ctrl)
         {
             return tabframe;
         }
     }
-    
+
     return NULL;
 }
 
 void wxAuiMultiNotebook::RemoveEmptyTabFrames()
 {
     return NULL;
 }
 
 void wxAuiMultiNotebook::RemoveEmptyTabFrames()
 {
-    bool must_update = false;
-    
     // if we've just removed the last tab from the source
     // tab set, the remove the tab control completely
     wxPaneInfoArray all_panes = m_mgr.GetAllPanes();
     // if we've just removed the last tab from the source
     // tab set, the remove the tab control completely
     wxPaneInfoArray all_panes = m_mgr.GetAllPanes();
@@ -1477,19 +1823,18 @@ void wxAuiMultiNotebook::RemoveEmptyTabFrames()
         if (tab_frame->m_tabs->GetPageCount() == 0)
         {
             m_mgr.DetachPane(tab_frame);
         if (tab_frame->m_tabs->GetPageCount() == 0)
         {
             m_mgr.DetachPane(tab_frame);
-            
+
             // use pending delete because sometimes during
             // window closing, refreshs are pending
             if (!wxPendingDelete.Member(tab_frame->m_tabs))
             // use pending delete because sometimes during
             // window closing, refreshs are pending
             if (!wxPendingDelete.Member(tab_frame->m_tabs))
-                wxPendingDelete.Append(tab_frame->m_tabs);    
+                wxPendingDelete.Append(tab_frame->m_tabs);
             //tab_frame->m_tabs->Destroy();
             //tab_frame->m_tabs->Destroy();
-            
+
             delete tab_frame;
             delete tab_frame;
-            must_update = true;
         }
     }
         }
     }
-    
-    
+
+
     // check to see if there is still a center pane;
     // if there isn't, make a frame the center pane
     wxPaneInfoArray panes = m_mgr.GetAllPanes();
     // check to see if there is still a center pane;
     // if there isn't, make a frame the center pane
     wxPaneInfoArray panes = m_mgr.GetAllPanes();
@@ -1509,10 +1854,9 @@ void wxAuiMultiNotebook::RemoveEmptyTabFrames()
     if (!center_found && first_good)
     {
         m_mgr.GetPane(first_good).Centre();
     if (!center_found && first_good)
     {
         m_mgr.GetPane(first_good).Centre();
-        must_update = true;
     }
 
     }
 
-    m_mgr.Update();            
+    m_mgr.Update();
 }
 
 void wxAuiMultiNotebook::OnChildFocus(wxChildFocusEvent& evt)
 }
 
 void wxAuiMultiNotebook::OnChildFocus(wxChildFocusEvent& evt)
@@ -1520,7 +1864,7 @@ void wxAuiMultiNotebook::OnChildFocus(wxChildFocusEvent& evt)
     int idx = m_tabs.GetIdxFromWindow(evt.GetWindow());
     if (idx != -1 && idx != m_curpage)
     {
     int idx = m_tabs.GetIdxFromWindow(evt.GetWindow());
     if (idx != -1 && idx != m_curpage)
     {
-        SetSelection(idx);       
+        SetSelection(idx);
     }
 }
 
     }
 }
 
@@ -1529,17 +1873,17 @@ void wxAuiMultiNotebook::OnTabButton(wxCommandEvent& command_evt)
 {
     wxAuiNotebookEvent& evt = (wxAuiNotebookEvent&)command_evt;
     wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject();
 {
     wxAuiNotebookEvent& evt = (wxAuiNotebookEvent&)command_evt;
     wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject();
-    
+
     int button_id = evt.GetInt();
     int button_id = evt.GetInt();
-    
-    if (button_id == wxAuiButtonClose)
+
+    if (button_id == wxAUI_BUTTON_CLOSE)
     {
         int selection = tabs->GetActivePage();
     {
         int selection = tabs->GetActivePage();
-        
+
         if (selection != -1)
         {
             wxWindow* close_wnd = tabs->GetWindowFromIdx(selection);
         if (selection != -1)
         {
             wxWindow* close_wnd = tabs->GetWindowFromIdx(selection);
-            
+
             if (close_wnd->IsKindOf(CLASSINFO(wxTabMDIChildFrame)))
             {
                 close_wnd->Close();
             if (close_wnd->IsKindOf(CLASSINFO(wxTabMDIChildFrame)))
             {
                 close_wnd->Close();