Rename wxWebHistoryItem to wxWebViewHistoryItem.

[wxWidgets.git] / src / aui / auibook.cpp
diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp

index 91ce0d969e03f9fbaf29610b7d9e1240060ef096..0b7dfad98be8a1c534dfd1fbe20cc039793bfb63 100644 (file)
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -25,29 +25,38 @@
  #ifndef WX_PRECOMP
      #include "wx/settings.h"
      #include "wx/image.h"
  #ifndef WX_PRECOMP
      #include "wx/settings.h"
      #include "wx/image.h"
+    #include "wx/menu.h"
  #endif
  
  #include "wx/aui/tabmdi.h"
  #include "wx/dcbuffer.h"
  #endif
  
  #include "wx/aui/tabmdi.h"
  #include "wx/dcbuffer.h"
-#include "wx/menu.h"
+
+#include "wx/renderer.h"
  
  #ifdef __WXMAC__
  
  #ifdef __WXMAC__
-#include "wx/mac/carbon/private.h"
+#include "wx/osx/private.h"
  #endif
  
  #include "wx/arrimpl.cpp"
  WX_DEFINE_OBJARRAY(wxAuiNotebookPageArray)
  WX_DEFINE_OBJARRAY(wxAuiTabContainerButtonArray)
  
  #endif
  
  #include "wx/arrimpl.cpp"
  WX_DEFINE_OBJARRAY(wxAuiNotebookPageArray)
  WX_DEFINE_OBJARRAY(wxAuiTabContainerButtonArray)
  
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_BUTTON)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND)
-
+wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_CANCEL_DRAG, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, wxAuiNotebookEvent);
  
  IMPLEMENT_CLASS(wxAuiNotebook, wxControl)
  IMPLEMENT_CLASS(wxAuiTabCtrl, wxControl)
  
  IMPLEMENT_CLASS(wxAuiNotebook, wxControl)
  IMPLEMENT_CLASS(wxAuiTabCtrl, wxControl)
@@ -60,8 +69,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxAuiNotebookEvent, wxEvent)
  // these functions live in dockart.cpp -- they'll eventually
  // be moved to a new utility cpp file
  
  // these functions live in dockart.cpp -- they'll eventually
  // be moved to a new utility cpp file
  
-wxColor wxAuiStepColour(const wxColor& c, int percent);
-
  wxBitmap wxAuiBitmapFromBits(const unsigned char bits[], int w, int h,
                               const wxColour& color);
  
  wxBitmap wxAuiBitmapFromBits(const unsigned char bits[], int w, int h,
                               const wxColour& color);
  
@@ -84,8 +91,8 @@ static void DrawButtons(wxDC& dc,
      if (button_state == wxAUI_BUTTON_STATE_HOVER ||
          button_state == wxAUI_BUTTON_STATE_PRESSED)
      {
      if (button_state == wxAUI_BUTTON_STATE_HOVER ||
          button_state == wxAUI_BUTTON_STATE_PRESSED)
      {
-        dc.SetBrush(wxBrush(wxAuiStepColour(bkcolour, 120)));
-        dc.SetPen(wxPen(wxAuiStepColour(bkcolour, 75)));
+        dc.SetBrush(wxBrush(bkcolour.ChangeLightness(120)));
+        dc.SetPen(wxPen(bkcolour.ChangeLightness(75)));
  
          // draw the background behind the button
          dc.DrawRectangle(rect.x, rect.y, 15, 15);
  
          // draw the background behind the button
          dc.DrawRectangle(rect.x, rect.y, 15, 15);
@@ -137,33 +144,33 @@ private:
  // -- bitmaps --
  
  #if defined( __WXMAC__ )
  // -- bitmaps --
  
  #if defined( __WXMAC__ )
- static unsigned char close_bits[]={
+ static const 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__)
       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[]={
+ static const 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
       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[]={
+ static const unsigned char close_bits[]={
       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xf3, 0xcf, 0xf9,
       0x9f, 0xfc, 0x3f, 0xfe, 0x3f, 0xfe, 0x9f, 0xfc, 0xcf, 0xf9, 0xe7, 0xf3,
       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
  #endif
  
       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xf3, 0xcf, 0xf9,
       0x9f, 0xfc, 0x3f, 0xfe, 0x3f, 0xfe, 0x9f, 0xfc, 0xcf, 0xf9, 0xe7, 0xf3,
       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
  #endif
  
-static unsigned char left_bits[] = {
+static const 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};
  
     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[] = {
+static const 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};
  
     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};
  
-static unsigned char list_bits[] = {
+static const unsigned char list_bits[] = {
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0x0f, 0xf8, 0xff, 0xff, 0x0f, 0xf8, 0x1f, 0xfc, 0x3f, 0xfe, 0x7f, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0x0f, 0xf8, 0xff, 0xff, 0x0f, 0xf8, 0x1f, 0xfc, 0x3f, 0xfe, 0x7f, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
@@ -185,10 +192,8 @@ wxAuiDefaultTabArt::wxAuiDefaultTabArt()
      m_fixed_tab_width = 100;
      m_tab_ctrl_height = 0;
  
      m_fixed_tab_width = 100;
      m_tab_ctrl_height = 0;
  
-#ifdef __WXMAC__
-    wxBrush toolbarbrush;
-    toolbarbrush.MacSetTheme( kThemeBrushToolbarBackground );
-    wxColor base_colour = toolbarbrush.GetColour();
+#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
+    wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));
  #else
      wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
  #endif
  #else
      wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
  #endif
@@ -199,11 +204,12 @@ wxAuiDefaultTabArt::wxAuiDefaultTabArt()
          (255-base_colour.Green()) +
          (255-base_colour.Blue()) < 60)
      {
          (255-base_colour.Green()) +
          (255-base_colour.Blue()) < 60)
      {
-        base_colour = wxAuiStepColour(base_colour, 92);
+        base_colour = base_colour.ChangeLightness(92);
      }
      }
-    
+
+    m_active_colour = base_colour;
      m_base_colour = base_colour;
      m_base_colour = base_colour;
-    wxColor border_colour = wxAuiStepColour(base_colour, 75);
+    wxColor border_colour = base_colour.ChangeLightness(75);
  
      m_border_pen = wxPen(border_colour);
      m_base_colour_pen = wxPen(m_base_colour);
  
      m_border_pen = wxPen(border_colour);
      m_base_colour_pen = wxPen(m_base_colour);
@@ -230,7 +236,7 @@ wxAuiDefaultTabArt::~wxAuiDefaultTabArt()
  
  wxAuiTabArt* wxAuiDefaultTabArt::Clone()
  {
  
  wxAuiTabArt* wxAuiDefaultTabArt::Clone()
  {
-    return static_cast<wxAuiTabArt*>(new wxAuiDefaultTabArt);
+    return new wxAuiDefaultTabArt(*this);
  }
  
  void wxAuiDefaultTabArt::SetFlags(unsigned int flags)
  }
  
  void wxAuiDefaultTabArt::SetFlags(unsigned int flags)
@@ -244,7 +250,7 @@ void wxAuiDefaultTabArt::SetSizingInfo(const wxSize& tab_ctrl_size,
      m_fixed_tab_width = 100;
  
      int tot_width = (int)tab_ctrl_size.x - GetIndentSize() - 4;
      m_fixed_tab_width = 100;
  
      int tot_width = (int)tab_ctrl_size.x - GetIndentSize() - 4;
-    
+
      if (m_flags & wxAUI_NB_CLOSE_BUTTON)
          tot_width -= m_active_close_bmp.GetWidth();
      if (m_flags & wxAUI_NB_WINDOWLIST_BUTTON)
      if (m_flags & wxAUI_NB_CLOSE_BUTTON)
          tot_width -= m_active_close_bmp.GetWidth();
      if (m_flags & wxAUI_NB_WINDOWLIST_BUTTON)
@@ -274,17 +280,39 @@ void wxAuiDefaultTabArt::DrawBackground(wxDC& dc,
                                          const wxRect& rect)
  {
      // draw background
                                          const wxRect& rect)
  {
      // draw background
-    wxRect r(rect.x, rect.y, rect.width+2, rect.height-3);
-    wxColor top_color = wxAuiStepColour(m_base_colour, 90);
-    wxColor bottom_color = wxAuiStepColour(m_base_colour, 170);
+
+    wxColor top_color       = m_base_colour.ChangeLightness(90);
+    wxColor bottom_color   = m_base_colour.ChangeLightness(170);
+    wxRect r;
+
+   if (m_flags &wxAUI_NB_BOTTOM)
+       r = wxRect(rect.x, rect.y, rect.width+2, rect.height);
+   // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
+   // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
+   else //for wxAUI_NB_TOP
+       r = wxRect(rect.x, rect.y, rect.width+2, rect.height-3);
+
      dc.GradientFillLinear(r, top_color, bottom_color, wxSOUTH);
  
      dc.GradientFillLinear(r, top_color, bottom_color, wxSOUTH);
  
-    // draw base lines
-    int y = rect.GetHeight();
-    int w = rect.GetWidth();
-    dc.SetPen(m_border_pen);
-    dc.SetBrush(m_base_colour_brush);
-    dc.DrawRectangle(-1, y-4, w+2, 4);
+
+   // draw base lines
+
+   dc.SetPen(m_border_pen);
+   int y = rect.GetHeight();
+   int w = rect.GetWidth();
+
+   if (m_flags &wxAUI_NB_BOTTOM)
+   {
+       dc.SetBrush(wxBrush(bottom_color));
+       dc.DrawRectangle(-1, 0, w+2, 4);
+   }
+   // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
+   // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
+   else //for wxAUI_NB_TOP
+   {
+       dc.SetBrush(m_base_colour_brush);
+       dc.DrawRectangle(-1, y-4, w+2, 4);
+   }
  }
  
  
  }
  
  
@@ -299,10 +327,8 @@ void wxAuiDefaultTabArt::DrawBackground(wxDC& dc,
  
  void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
                                   wxWindow* wnd,
  
  void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
                                   wxWindow* wnd,
+                                 const wxAuiNotebookPage& page,
                                   const wxRect& in_rect,
                                   const wxRect& in_rect,
-                                 const wxString& caption_text,
-                                 const wxBitmap& bitmap,
-                                 bool active,
                                   int close_button_state,
                                   wxRect* out_tab_rect,
                                   wxRect* out_button_rect,
                                   int close_button_state,
                                   wxRect* out_tab_rect,
                                   wxRect* out_button_rect,
@@ -310,11 +336,11 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
  {
      wxCoord normal_textx, normal_texty;
      wxCoord selected_textx, selected_texty;
  {
      wxCoord normal_textx, normal_texty;
      wxCoord selected_textx, selected_texty;
-    wxCoord textx, texty;
+    wxCoord texty;
  
      // if the caption is empty, measure some temporary text
  
      // if the caption is empty, measure some temporary text
-    wxString caption = caption_text;
-    if (caption_text.empty())
+    wxString caption = page.caption;
+    if (caption.empty())
          caption = wxT("Xj");
  
      dc.SetFont(m_selected_font);
          caption = wxT("Xj");
  
      dc.SetFont(m_selected_font);
@@ -326,9 +352,9 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
      // figure out the size of the tab
      wxSize tab_size = GetTabSize(dc,
                                   wnd,
      // figure out the size of the tab
      wxSize tab_size = GetTabSize(dc,
                                   wnd,
-                                 caption,
-                                 bitmap,
-                                 active,
+                                 page.caption,
+                                 page.bitmap,
+                                 page.active,
                                   close_button_state,
                                   x_extent);
  
                                   close_button_state,
                                   x_extent);
  
@@ -338,21 +364,19 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
      wxCoord tab_y = in_rect.y + in_rect.height - tab_height;
  
  
      wxCoord tab_y = in_rect.y + in_rect.height - tab_height;
  
  
-    caption = caption_text;
+    caption = page.caption;
  
  
      // select pen, brush and font for the tab to be drawn
  
  
  
      // select pen, brush and font for the tab to be drawn
  
-    if (active)
+    if (page.active)
      {
          dc.SetFont(m_selected_font);
      {
          dc.SetFont(m_selected_font);
-        textx = selected_textx;
          texty = selected_texty;
      }
          texty = selected_texty;
      }
-     else
+    else
      {
          dc.SetFont(m_normal_font);
      {
          dc.SetFont(m_normal_font);
-        textx = normal_textx;
          texty = normal_texty;
      }
  
          texty = normal_texty;
      }
  
@@ -383,28 +407,41 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
      // we'll just use a rectangle for the clipping region for now --
      dc.SetClippingRegion(tab_x, tab_y, clip_width+1, tab_height-3);
  
      // we'll just use a rectangle for the clipping region for now --
      dc.SetClippingRegion(tab_x, tab_y, clip_width+1, tab_height-3);
  
-    
-    wxPoint border_points[6];
-    border_points[0] = wxPoint(tab_x,             tab_y+tab_height-4);
-    border_points[1] = wxPoint(tab_x,             tab_y+2);
-    border_points[2] = wxPoint(tab_x+2,           tab_y);
-    border_points[3] = wxPoint(tab_x+tab_width-2, tab_y);
-    border_points[4] = wxPoint(tab_x+tab_width,   tab_y+2);
-    border_points[5] = wxPoint(tab_x+tab_width,   tab_y+tab_height-4);
  
  
+    wxPoint border_points[6];
+    if (m_flags &wxAUI_NB_BOTTOM)
+    {
+        border_points[0] = wxPoint(tab_x,             tab_y);
+        border_points[1] = wxPoint(tab_x,             tab_y+tab_height-6);
+        border_points[2] = wxPoint(tab_x+2,           tab_y+tab_height-4);
+        border_points[3] = wxPoint(tab_x+tab_width-2, tab_y+tab_height-4);
+        border_points[4] = wxPoint(tab_x+tab_width,   tab_y+tab_height-6);
+        border_points[5] = wxPoint(tab_x+tab_width,   tab_y);
+    }
+    else //if (m_flags & wxAUI_NB_TOP) {}
+    {
+        border_points[0] = wxPoint(tab_x,             tab_y+tab_height-4);
+        border_points[1] = wxPoint(tab_x,             tab_y+2);
+        border_points[2] = wxPoint(tab_x+2,           tab_y);
+        border_points[3] = wxPoint(tab_x+tab_width-2, tab_y);
+        border_points[4] = wxPoint(tab_x+tab_width,   tab_y+2);
+        border_points[5] = wxPoint(tab_x+tab_width,   tab_y+tab_height-4);
+    }
+    // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
+    // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
  
      int drawn_tab_yoff = border_points[1].y;
      int drawn_tab_height = border_points[0].y - border_points[1].y;
  
  
  
      int drawn_tab_yoff = border_points[1].y;
      int drawn_tab_height = border_points[0].y - border_points[1].y;
  
  
-    if (active)
+    if (page.active)
      {
          // draw active tab
  
          // draw base background color
          wxRect r(tab_x, tab_y, tab_width, tab_height);
      {
          // draw active tab
  
          // draw base background color
          wxRect r(tab_x, tab_y, tab_width, tab_height);
-        dc.SetPen(m_base_colour_pen);
-        dc.SetBrush(m_base_colour_brush);
+        dc.SetPen(wxPen(m_active_colour));
+        dc.SetBrush(wxBrush(m_active_colour));
          dc.DrawRectangle(r.x+1, r.y+1, r.width-1, r.height-4);
  
          // this white helps fill out the gradient at the top of the tab
          dc.DrawRectangle(r.x+1, r.y+1, r.width-1, r.height-4);
  
          // this white helps fill out the gradient at the top of the tab
@@ -413,23 +450,23 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
          dc.DrawRectangle(r.x+2, r.y+1, r.width-3, r.height-4);
  
          // these two points help the rounded corners appear more antialiased
          dc.DrawRectangle(r.x+2, r.y+1, r.width-3, r.height-4);
  
          // these two points help the rounded corners appear more antialiased
-        dc.SetPen(m_base_colour_pen);
+        dc.SetPen(wxPen(m_active_colour));
          dc.DrawPoint(r.x+2, r.y+1);
          dc.DrawPoint(r.x+r.width-2, r.y+1);
  
          // set rectangle down a bit for gradient drawing
          r.SetHeight(r.GetHeight()/2);
          r.x += 2;
          dc.DrawPoint(r.x+2, r.y+1);
          dc.DrawPoint(r.x+r.width-2, r.y+1);
  
          // set rectangle down a bit for gradient drawing
          r.SetHeight(r.GetHeight()/2);
          r.x += 2;
-        r.width -= 2;
+        r.width -= 3;
          r.y += r.height;
          r.y -= 2;
  
          // draw gradient background
          wxColor top_color = *wxWHITE;
          r.y += r.height;
          r.y -= 2;
  
          // draw gradient background
          wxColor top_color = *wxWHITE;
-        wxColor bottom_color = m_base_colour;
+        wxColor bottom_color = m_active_colour;
          dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
      }
          dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
      }
-     else
+    else
      {
          // draw inactive tab
  
      {
          // draw inactive tab
  
@@ -443,15 +480,15 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
          r.width -= 4;
          r.height /= 2;
          r.height--;
          r.width -= 4;
          r.height /= 2;
          r.height--;
-        
+
          // -- draw top gradient fill for glossy look
          wxColor top_color = m_base_colour;
          // -- draw top gradient fill for glossy look
          wxColor top_color = m_base_colour;
-        wxColor bottom_color = wxAuiStepColour(top_color, 160);
+        wxColor bottom_color = top_color.ChangeLightness(160);
          dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
          dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
-        
+
          r.y += r.height;
          r.y--;
          r.y += r.height;
          r.y--;
-        
+
          // -- draw bottom fill for glossy look
          top_color = m_base_colour;
          bottom_color = m_base_colour;
          // -- draw bottom fill for glossy look
          top_color = m_base_colour;
          bottom_color = m_base_colour;
@@ -465,10 +502,14 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
  
      // there are two horizontal grey lines at the bottom of the tab control,
      // this gets rid of the top one of those lines in the tab control
  
      // there are two horizontal grey lines at the bottom of the tab control,
      // this gets rid of the top one of those lines in the tab control
-    if (active)
+    if (page.active)
      {
      {
-        wxColor start_color = m_base_colour;
-        dc.SetPen(m_base_colour_pen);
+        if (m_flags &wxAUI_NB_BOTTOM)
+            dc.SetPen(wxPen(m_base_colour.ChangeLightness(170)));
+        // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
+        // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
+        else //for wxAUI_NB_TOP
+            dc.SetPen(m_base_colour_pen);
          dc.DrawLine(border_points[0].x+1,
                      border_points[0].y,
                      border_points[5].x,
          dc.DrawLine(border_points[0].x+1,
                      border_points[0].y,
                      border_points[5].x,
@@ -483,21 +524,22 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
          close_button_width = m_active_close_bmp.GetWidth();
      }
  
          close_button_width = m_active_close_bmp.GetWidth();
      }
  
-
-    if (bitmap.IsOk())
+    int bitmap_offset = 0;
+    if (page.bitmap.IsOk())
      {
      {
-        int bitmap_offset = tab_x + 8;
+        bitmap_offset = tab_x + 8;
  
          // draw bitmap
  
          // draw bitmap
-        dc.DrawBitmap(bitmap,
+        dc.DrawBitmap(page.bitmap,
                        bitmap_offset,
                        bitmap_offset,
-                      drawn_tab_yoff + (drawn_tab_height/2) - (bitmap.GetHeight()/2),
+                      drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2),
                        true);
  
                        true);
  
-        text_offset = bitmap_offset + bitmap.GetWidth();
+        text_offset = bitmap_offset + page.bitmap.GetWidth();
          text_offset += 3; // bitmap padding
          text_offset += 3; // bitmap padding
+
      }
      }
-     else
+    else
      {
          text_offset = tab_x + 8;
      }
      {
          text_offset = tab_x + 8;
      }
@@ -512,8 +554,30 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
                  text_offset,
                  drawn_tab_yoff + (drawn_tab_height)/2 - (texty/2) - 1);
  
                  text_offset,
                  drawn_tab_yoff + (drawn_tab_height)/2 - (texty/2) - 1);
  
+    // draw focus rectangle
+    if (page.active && (wnd->FindFocus() == wnd))
+    {
+        wxRect focusRectText(text_offset, (drawn_tab_yoff + (drawn_tab_height)/2 - (texty/2) - 1),
+            selected_textx, selected_texty);
+
+        wxRect focusRect;
+        wxRect focusRectBitmap;
  
  
+        if (page.bitmap.IsOk())
+            focusRectBitmap = wxRect(bitmap_offset, drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2),
+                                            page.bitmap.GetWidth(), page.bitmap.GetHeight());
  
  
+        if (page.bitmap.IsOk() && draw_text.IsEmpty())
+            focusRect = focusRectBitmap;
+        else if (!page.bitmap.IsOk() && !draw_text.IsEmpty())
+            focusRect = focusRectText;
+        else if (page.bitmap.IsOk() && !draw_text.IsEmpty())
+            focusRect = focusRectText.Union(focusRectBitmap);
+
+        focusRect.Inflate(2, 2);
+
+        wxRendererNative::Get().DrawFocusRect(wnd, dc, focusRect, 0);
+    }
  
      // draw close button if necessary
      if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
  
      // draw close button if necessary
      if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
@@ -526,10 +590,15 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
              bmp = m_active_close_bmp;
          }
  
              bmp = m_active_close_bmp;
          }
  
+        int offsetY = tab_y-1;
+        if (m_flags & wxAUI_NB_BOTTOM)
+            offsetY = 1;
+
          wxRect rect(tab_x + tab_width - close_button_width - 1,
          wxRect rect(tab_x + tab_width - close_button_width - 1,
-                    tab_y + (tab_height/2) - (bmp.GetHeight()/2),
+                    offsetY + (tab_height/2) - (bmp.GetHeight()/2),
                      close_button_width,
                      tab_height);
                      close_button_width,
                      tab_height);
+
          IndentPressedBitmap(&rect, close_button_state);
          dc.DrawBitmap(bmp, rect.x, rect.y, true);
  
          IndentPressedBitmap(&rect, close_button_state);
          dc.DrawBitmap(bmp, rect.x, rect.y, true);
  
@@ -598,47 +667,40 @@ void wxAuiDefaultTabArt::DrawButton(wxDC& dc,
                                      int bitmap_id,
                                      int button_state,
                                      int orientation,
                                      int bitmap_id,
                                      int button_state,
                                      int orientation,
-                                    const wxBitmap& bitmap_override,
                                      wxRect* out_rect)
  {
      wxBitmap bmp;
      wxRect rect;
  
                                      wxRect* out_rect)
  {
      wxBitmap bmp;
      wxRect rect;
  
-    if (bitmap_override.IsOk())
-    {
-        bmp = bitmap_override;
-    }
-     else
+    switch (bitmap_id)
      {
      {
-        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;
-            case wxAUI_BUTTON_WINDOWLIST:
-                if (button_state & wxAUI_BUTTON_STATE_DISABLED)
-                    bmp = m_disabled_windowlist_bmp;
-                     else
-                    bmp = m_active_windowlist_bmp;
-                break;
-        }
+        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;
+        case wxAUI_BUTTON_WINDOWLIST:
+            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+                bmp = m_disabled_windowlist_bmp;
+            else
+                bmp = m_active_windowlist_bmp;
+            break;
      }
  
      }
  
+
      if (!bmp.IsOk())
          return;
  
      if (!bmp.IsOk())
          return;
  
@@ -651,7 +713,7 @@ void wxAuiDefaultTabArt::DrawButton(wxDC& dc,
          rect.SetWidth(bmp.GetWidth());
          rect.SetHeight(bmp.GetHeight());
      }
          rect.SetWidth(bmp.GetWidth());
          rect.SetHeight(bmp.GetHeight());
      }
-     else
+    else
      {
          rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(),
                        ((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2),
      {
          rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(),
                        ((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2),
@@ -664,22 +726,27 @@ void wxAuiDefaultTabArt::DrawButton(wxDC& dc,
      *out_rect = rect;
  }
  
      *out_rect = rect;
  }
  
-
-int wxAuiDefaultTabArt::ShowWindowList(wxWindow* wnd,
-                                       const wxArrayString& items,
-                                       int active_idx)
+int wxAuiDefaultTabArt::ShowDropDown(wxWindow* wnd,
+                                     const wxAuiNotebookPageArray& pages,
+                                     int /*active_idx*/)
  {
  {
-       wxMenu menuPopup;
+    wxMenu menuPopup;
  
  
-    size_t i, count = items.GetCount();
+    size_t i, count = pages.GetCount();
      for (i = 0; i < count; ++i)
      {
      for (i = 0; i < count; ++i)
      {
-        menuPopup.AppendCheckItem(1000+i, items.Item(i));
-    }
-
-    if (active_idx != -1)
-    {
-        menuPopup.Check(1000+active_idx, true);
+        const wxAuiNotebookPage& page = pages.Item(i);
+        wxString caption = page.caption;
+
+        // if there is no caption, make it a space.  This will prevent
+        // an assert in the menu code.
+        if (caption.IsEmpty())
+            caption = wxT(" ");
+
+        wxMenuItem* item = new wxMenuItem(NULL, 1000+i, caption);
+        if (page.bitmap.IsOk())
+            item->SetBitmap(page.bitmap);
+        menuPopup.Append(item);
      }
  
      // find out where to put the popup menu of window items
      }
  
      // find out where to put the popup menu of window items
@@ -703,7 +770,7 @@ int wxAuiDefaultTabArt::ShowWindowList(wxWindow* wnd,
  }
  
  int wxAuiDefaultTabArt::GetBestTabCtrlSize(wxWindow* wnd,
  }
  
  int wxAuiDefaultTabArt::GetBestTabCtrlSize(wxWindow* wnd,
-                                           wxAuiNotebookPageArray& pages,
+                                           const wxAuiNotebookPageArray& pages,
                                             const wxSize& required_bmp_size)
  {
      wxClientDC dc(wnd);
                                             const wxSize& required_bmp_size)
  {
      wxClientDC dc(wnd);
@@ -718,7 +785,7 @@ int wxAuiDefaultTabArt::GetBestTabCtrlSize(wxWindow* wnd,
          measure_bmp.Create(required_bmp_size.x,
                             required_bmp_size.y);
      }
          measure_bmp.Create(required_bmp_size.x,
                             required_bmp_size.y);
      }
-    
+
  
      int max_y = 0;
      size_t i, page_count = pages.GetCount();
  
      int max_y = 0;
      size_t i, page_count = pages.GetCount();
@@ -729,7 +796,7 @@ int wxAuiDefaultTabArt::GetBestTabCtrlSize(wxWindow* wnd,
          wxBitmap bmp;
          if (measure_bmp.IsOk())
              bmp = measure_bmp;
          wxBitmap bmp;
          if (measure_bmp.IsOk())
              bmp = measure_bmp;
-             else
+        else
              bmp = page.bitmap;
  
          // we don't use the caption text because we don't
              bmp = page.bitmap;
  
          // we don't use the caption text because we don't
@@ -744,7 +811,7 @@ int wxAuiDefaultTabArt::GetBestTabCtrlSize(wxWindow* wnd,
                                true,
                                wxAUI_BUTTON_STATE_HIDDEN,
                                &x_ext);
                                true,
                                wxAUI_BUTTON_STATE_HIDDEN,
                                &x_ext);
-                              
+
          max_y = wxMax(max_y, s.y);
      }
  
          max_y = wxMax(max_y, s.y);
      }
  
@@ -766,6 +833,18 @@ void wxAuiDefaultTabArt::SetMeasuringFont(const wxFont& font)
      m_measuring_font = font;
  }
  
      m_measuring_font = font;
  }
  
+void wxAuiDefaultTabArt::SetColour(const wxColour& colour)
+{
+    m_base_colour = colour;
+    m_border_pen = wxPen(m_base_colour.ChangeLightness(75));
+    m_base_colour_pen = wxPen(m_base_colour);
+    m_base_colour_brush = wxBrush(m_base_colour);
+}
+
+void wxAuiDefaultTabArt::SetActiveColour(const wxColour& colour)
+{
+    m_active_colour = colour;
+}
  
  // -- wxAuiSimpleTabArt class implementation --
  
  
  // -- wxAuiSimpleTabArt class implementation --
  
@@ -811,10 +890,9 @@ wxAuiSimpleTabArt::~wxAuiSimpleTabArt()
  
  wxAuiTabArt* wxAuiSimpleTabArt::Clone()
  {
  
  wxAuiTabArt* wxAuiSimpleTabArt::Clone()
  {
-    return static_cast<wxAuiTabArt*>(new wxAuiSimpleTabArt);
+    return new wxAuiSimpleTabArt(*this);
  }
  
  }
  
-
  void wxAuiSimpleTabArt::SetFlags(unsigned int flags)
  {
      m_flags = flags;
  void wxAuiSimpleTabArt::SetFlags(unsigned int flags)
  {
      m_flags = flags;
@@ -848,6 +926,19 @@ void wxAuiSimpleTabArt::SetSizingInfo(const wxSize& tab_ctrl_size,
          m_fixed_tab_width = 220;
  }
  
          m_fixed_tab_width = 220;
  }
  
+void wxAuiSimpleTabArt::SetColour(const wxColour& colour)
+{
+    m_bkbrush = wxBrush(colour);
+    m_normal_bkbrush = wxBrush(colour);
+    m_normal_bkpen = wxPen(colour);
+}
+
+void wxAuiSimpleTabArt::SetActiveColour(const wxColour& colour)
+{
+    m_selected_bkbrush = wxBrush(colour);
+    m_selected_bkpen = wxPen(colour);
+}
+
  void wxAuiSimpleTabArt::DrawBackground(wxDC& dc,
                                         wxWindow* WXUNUSED(wnd),
                                         const wxRect& rect)
  void wxAuiSimpleTabArt::DrawBackground(wxDC& dc,
                                         wxWindow* WXUNUSED(wnd),
                                         const wxRect& rect)
@@ -874,10 +965,8 @@ void wxAuiSimpleTabArt::DrawBackground(wxDC& dc,
  
  void wxAuiSimpleTabArt::DrawTab(wxDC& dc,
                                  wxWindow* wnd,
  
  void wxAuiSimpleTabArt::DrawTab(wxDC& dc,
                                  wxWindow* wnd,
+                                const wxAuiNotebookPage& page,
                                  const wxRect& in_rect,
                                  const wxRect& in_rect,
-                                const wxString& caption_text,
-                                const wxBitmap& bitmap,
-                                bool active,
                                  int close_button_state,
                                  wxRect* out_tab_rect,
                                  wxRect* out_button_rect,
                                  int close_button_state,
                                  wxRect* out_tab_rect,
                                  wxRect* out_button_rect,
@@ -888,8 +977,8 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc,
      wxCoord textx, texty;
  
      // if the caption is empty, measure some temporary text
      wxCoord textx, texty;
  
      // if the caption is empty, measure some temporary text
-    wxString caption = caption_text;
-    if (caption_text.empty())
+    wxString caption = page.caption;
+    if (caption.empty())
          caption = wxT("Xj");
  
      dc.SetFont(m_selected_font);
          caption = wxT("Xj");
  
      dc.SetFont(m_selected_font);
@@ -901,9 +990,9 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc,
      // figure out the size of the tab
      wxSize tab_size = GetTabSize(dc,
                                   wnd,
      // figure out the size of the tab
      wxSize tab_size = GetTabSize(dc,
                                   wnd,
-                                 caption,
-                                 bitmap,
-                                 active,
+                                 page.caption,
+                                 page.bitmap,
+                                 page.active,
                                   close_button_state,
                                   x_extent);
  
                                   close_button_state,
                                   x_extent);
  
@@ -912,11 +1001,11 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc,
      wxCoord tab_x = in_rect.x;
      wxCoord tab_y = in_rect.y + in_rect.height - tab_height;
  
      wxCoord tab_x = in_rect.x;
      wxCoord tab_y = in_rect.y + in_rect.height - tab_height;
  
-    caption = caption_text;
+    caption = page.caption;
  
      // select pen, brush and font for the tab to be drawn
  
  
      // select pen, brush and font for the tab to be drawn
  
-    if (active)
+    if (page.active)
      {
          dc.SetPen(m_selected_bkpen);
          dc.SetBrush(m_selected_bkbrush);
      {
          dc.SetPen(m_selected_bkpen);
          dc.SetBrush(m_selected_bkbrush);
@@ -924,7 +1013,7 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc,
          textx = selected_textx;
          texty = selected_texty;
      }
          textx = selected_textx;
          texty = selected_texty;
      }
-     else
+    else
      {
          dc.SetPen(m_normal_bkpen);
          dc.SetBrush(m_normal_bkbrush);
      {
          dc.SetPen(m_normal_bkpen);
          dc.SetBrush(m_normal_bkbrush);
@@ -969,7 +1058,7 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc,
          close_button_width = m_active_close_bmp.GetWidth();
          text_offset = tab_x + (tab_height/2) + ((tab_width-close_button_width)/2) - (textx/2);
      }
          close_button_width = m_active_close_bmp.GetWidth();
          text_offset = tab_x + (tab_height/2) + ((tab_width-close_button_width)/2) - (textx/2);
      }
-     else
+    else
      {
          text_offset = tab_x + (tab_height/3) + (tab_width/2) - (textx/2);
      }
      {
          text_offset = tab_x + (tab_height/3) + (tab_width/2) - (textx/2);
      }
@@ -989,13 +1078,24 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc,
                   (tab_y + tab_height)/2 - (texty/2) + 1);
  
  
                   (tab_y + tab_height)/2 - (texty/2) + 1);
  
  
+    // draw focus rectangle
+    if (page.active && (wnd->FindFocus() == wnd))
+    {
+        wxRect focusRect(text_offset, ((tab_y + tab_height)/2 - (texty/2) + 1),
+            selected_textx, selected_texty);
+
+        focusRect.Inflate(2, 2);
+
+        wxRendererNative::Get().DrawFocusRect(wnd, dc, focusRect, 0);
+    }
+
      // draw close button if necessary
      if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
      {
          wxBitmap bmp;
      // draw close button if necessary
      if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
      {
          wxBitmap bmp;
-        if (active)
+        if (page.active)
              bmp = m_active_close_bmp;
              bmp = m_active_close_bmp;
-             else
+        else
              bmp = m_disabled_close_bmp;
  
          wxRect rect(tab_x + tab_width - close_button_width - 1,
              bmp = m_disabled_close_bmp;
  
          wxRect rect(tab_x + tab_width - close_button_width - 1,
@@ -1054,45 +1154,37 @@ void wxAuiSimpleTabArt::DrawButton(wxDC& dc,
                                     int bitmap_id,
                                     int button_state,
                                     int orientation,
                                     int bitmap_id,
                                     int button_state,
                                     int orientation,
-                                   const wxBitmap& bitmap_override,
                                     wxRect* out_rect)
  {
      wxBitmap bmp;
      wxRect rect;
  
                                     wxRect* out_rect)
  {
      wxBitmap bmp;
      wxRect rect;
  
-    if (bitmap_override.IsOk())
-    {
-        bmp = bitmap_override;
-    }
-     else
+    switch (bitmap_id)
      {
      {
-        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;
-            case wxAUI_BUTTON_WINDOWLIST:
-                if (button_state & wxAUI_BUTTON_STATE_DISABLED)
-                    bmp = m_disabled_windowlist_bmp;
-                     else
-                    bmp = m_active_windowlist_bmp;
-                break;
-        }
+        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;
+        case wxAUI_BUTTON_WINDOWLIST:
+            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+                bmp = m_disabled_windowlist_bmp;
+            else
+                bmp = m_active_windowlist_bmp;
+            break;
      }
  
      if (!bmp.IsOk())
      }
  
      if (!bmp.IsOk())
@@ -1107,7 +1199,7 @@ void wxAuiSimpleTabArt::DrawButton(wxDC& dc,
          rect.SetWidth(bmp.GetWidth());
          rect.SetHeight(bmp.GetHeight());
      }
          rect.SetWidth(bmp.GetWidth());
          rect.SetHeight(bmp.GetHeight());
      }
-     else
+    else
      {
          rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(),
                        ((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2),
      {
          rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(),
                        ((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2),
@@ -1120,17 +1212,17 @@ void wxAuiSimpleTabArt::DrawButton(wxDC& dc,
      *out_rect = rect;
  }
  
      *out_rect = rect;
  }
  
-
-int wxAuiSimpleTabArt::ShowWindowList(wxWindow* wnd,
-                                      const wxArrayString& items,
-                                      int active_idx)
+int wxAuiSimpleTabArt::ShowDropDown(wxWindow* wnd,
+                                    const wxAuiNotebookPageArray& pages,
+                                    int active_idx)
  {
  {
-       wxMenu menuPopup;
+    wxMenu menuPopup;
  
  
-    size_t i, count = items.GetCount();
+    size_t i, count = pages.GetCount();
      for (i = 0; i < count; ++i)
      {
      for (i = 0; i < count; ++i)
      {
-        menuPopup.AppendCheckItem(1000+i, items.Item(i));
+        const wxAuiNotebookPage& page = pages.Item(i);
+        menuPopup.AppendCheckItem(1000+i, page.caption);
      }
  
      if (active_idx != -1)
      }
  
      if (active_idx != -1)
@@ -1145,7 +1237,7 @@ int wxAuiSimpleTabArt::ShowWindowList(wxWindow* wnd,
      pt = wnd->ScreenToClient(pt);
      if (pt.x < 100)
          pt.x = 0;
      pt = wnd->ScreenToClient(pt);
      if (pt.x < 100)
          pt.x = 0;
-         else
+    else
          pt.x -= 100;
  
      // find out the screen coordinate at the bottom of the tab ctrl
          pt.x -= 100;
  
      // find out the screen coordinate at the bottom of the tab ctrl
@@ -1165,7 +1257,7 @@ int wxAuiSimpleTabArt::ShowWindowList(wxWindow* wnd,
  }
  
  int wxAuiSimpleTabArt::GetBestTabCtrlSize(wxWindow* wnd,
  }
  
  int wxAuiSimpleTabArt::GetBestTabCtrlSize(wxWindow* wnd,
-                                          wxAuiNotebookPageArray& WXUNUSED(pages),
+                                          const wxAuiNotebookPageArray& WXUNUSED(pages),
                                            const wxSize& WXUNUSED(required_bmp_size))
  {
      wxClientDC dc(wnd);
                                            const wxSize& WXUNUSED(required_bmp_size))
  {
      wxClientDC dc(wnd);
@@ -1299,6 +1391,16 @@ void wxAuiTabContainer::SetMeasuringFont(const wxFont& font)
      m_art->SetMeasuringFont(font);
  }
  
      m_art->SetMeasuringFont(font);
  }
  
+void wxAuiTabContainer::SetColour(const wxColour& colour)
+{
+    m_art->SetColour(colour);
+}
+
+void wxAuiTabContainer::SetActiveColour(const wxColour& colour)
+{
+    m_art->SetActiveColour(colour);
+}
+
  void wxAuiTabContainer::SetRect(const wxRect& rect)
  {
      m_rect = rect;
  void wxAuiTabContainer::SetRect(const wxRect& rect)
  {
      m_rect = rect;
@@ -1337,7 +1439,7 @@ bool wxAuiTabContainer::InsertPage(wxWindow* page,
  
      if (idx >= m_pages.GetCount())
          m_pages.Add(page_info);
  
      if (idx >= m_pages.GetCount())
          m_pages.Add(page_info);
-         else
+    else
          m_pages.Insert(page_info, idx);
  
      // let the art provider know how many pages we have
          m_pages.Insert(page_info, idx);
  
      // let the art provider know how many pages we have
@@ -1404,7 +1506,7 @@ bool wxAuiTabContainer::SetActivePage(wxWindow* wnd)
              page.active = true;
              found = true;
          }
              page.active = true;
              found = true;
          }
-         else
+        else
          {
              page.active = false;
          }
          {
              page.active = false;
          }
@@ -1454,14 +1556,14 @@ wxWindow* wxAuiTabContainer::GetWindowFromIdx(size_t idx) const
  
  int wxAuiTabContainer::GetIdxFromWindow(wxWindow* wnd) const
  {
  
  int wxAuiTabContainer::GetIdxFromWindow(wxWindow* wnd) const
  {
-    size_t i, page_count = m_pages.GetCount();
-    for (i = 0; i < page_count; ++i)
+    const size_t page_count = m_pages.GetCount();
+    for ( size_t i = 0; i < page_count; ++i )
      {
          wxAuiNotebookPage& page = m_pages.Item(i);
          if (page.window == wnd)
              return i;
      }
      {
          wxAuiNotebookPage& page = m_pages.Item(i);
          if (page.window == wnd)
              return i;
      }
-    return -1;
+    return wxNOT_FOUND;
  }
  
  wxAuiNotebookPage& wxAuiTabContainer::GetPage(size_t idx)
  }
  
  wxAuiNotebookPage& wxAuiTabContainer::GetPage(size_t idx)
@@ -1471,6 +1573,13 @@ wxAuiNotebookPage& wxAuiTabContainer::GetPage(size_t idx)
      return m_pages[idx];
  }
  
      return m_pages[idx];
  }
  
+const wxAuiNotebookPage& wxAuiTabContainer::GetPage(size_t idx) const
+{
+    wxASSERT_MSG(idx < m_pages.GetCount(), wxT("Invalid Page index"));
+
+    return m_pages[idx];
+}
+
  wxAuiNotebookPageArray& wxAuiTabContainer::GetPages()
  {
      return m_pages;
  wxAuiNotebookPageArray& wxAuiTabContainer::GetPages()
  {
      return m_pages;
@@ -1534,6 +1643,11 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
          return;
  
      wxMemoryDC dc;
          return;
  
      wxMemoryDC dc;
+
+    // use the same layout direction as the window DC uses to ensure that the
+    // text is rendered correctly
+    dc.SetLayoutDirection(raw_dc->GetLayoutDirection());
+
      wxBitmap bmp;
      size_t i;
      size_t page_count = m_pages.GetCount();
      wxBitmap bmp;
      size_t i;
      size_t page_count = m_pages.GetCount();
@@ -1576,14 +1690,14 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
  
          if (i+1 < page_count)
              total_width += x_extent;
  
          if (i+1 < page_count)
              total_width += x_extent;
-             else
+        else
              total_width += size.x;
  
          if (i >= m_tab_offset)
          {
              if (i+1 < page_count)
                  visible_width += x_extent;
              total_width += size.x;
  
          if (i >= m_tab_offset)
          {
              if (i+1 < page_count)
                  visible_width += x_extent;
-                 else
+            else
                  visible_width += size.x;
          }
      }
                  visible_width += size.x;
          }
      }
@@ -1601,7 +1715,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
              }
          }
      }
              }
          }
      }
-     else
+    else
      {
          // hide left/right buttons
          for (i = 0; i < button_count; ++i)
      {
          // hide left/right buttons
          for (i = 0; i < button_count; ++i)
@@ -1623,14 +1737,14 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
          {
              if (m_tab_offset == 0)
                  button.cur_state |= wxAUI_BUTTON_STATE_DISABLED;
          {
              if (m_tab_offset == 0)
                  button.cur_state |= wxAUI_BUTTON_STATE_DISABLED;
-                 else
+            else
                  button.cur_state &= ~wxAUI_BUTTON_STATE_DISABLED;
          }
          if (button.id == wxAUI_BUTTON_RIGHT)
          {
              if (visible_width < m_rect.GetWidth() - ((int)button_count*16))
                  button.cur_state |= wxAUI_BUTTON_STATE_DISABLED;
                  button.cur_state &= ~wxAUI_BUTTON_STATE_DISABLED;
          }
          if (button.id == wxAUI_BUTTON_RIGHT)
          {
              if (visible_width < m_rect.GetWidth() - ((int)button_count*16))
                  button.cur_state |= wxAUI_BUTTON_STATE_DISABLED;
-                 else
+            else
                  button.cur_state &= ~wxAUI_BUTTON_STATE_DISABLED;
          }
      }
                  button.cur_state &= ~wxAUI_BUTTON_STATE_DISABLED;
          }
      }
@@ -1667,7 +1781,6 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
                            button.id,
                            button.cur_state,
                            wxRIGHT,
                            button.id,
                            button.cur_state,
                            wxRIGHT,
-                          wxNullBitmap,
                            &button.rect);
  
          offset -= button.rect.GetWidth();
                            &button.rect);
  
          offset -= button.rect.GetWidth();
@@ -1697,7 +1810,6 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
                            button.id,
                            button.cur_state,
                            wxLEFT,
                            button.id,
                            button.cur_state,
                            wxLEFT,
-                          wxNullBitmap,
                            &button.rect);
  
          offset += button.rect.GetWidth();
                            &button.rect);
  
          offset += button.rect.GetWidth();
@@ -1750,11 +1862,9 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
          wxAuiTabContainerButton& tab_button = m_tab_close_buttons.Item(i);
  
          // determine if a close button is on this tab
          wxAuiTabContainerButton& tab_button = m_tab_close_buttons.Item(i);
  
          // determine if a close button is on this tab
-        bool close_button = false;
          if ((m_flags & wxAUI_NB_CLOSE_ON_ALL_TABS) != 0 ||
              ((m_flags & wxAUI_NB_CLOSE_ON_ACTIVE_TAB) != 0 && page.active))
          {
          if ((m_flags & wxAUI_NB_CLOSE_ON_ALL_TABS) != 0 ||
              ((m_flags & wxAUI_NB_CLOSE_ON_ACTIVE_TAB) != 0 && page.active))
          {
-            close_button = true;
              if (tab_button.cur_state == wxAUI_BUTTON_STATE_HIDDEN)
              {
                  tab_button.id = wxAUI_BUTTON_CLOSE;
              if (tab_button.cur_state == wxAUI_BUTTON_STATE_HIDDEN)
              {
                  tab_button.id = wxAUI_BUTTON_CLOSE;
@@ -1762,7 +1872,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
                  tab_button.location = wxCENTER;
              }
          }
                  tab_button.location = wxCENTER;
              }
          }
-         else
+        else
          {
              tab_button.cur_state = wxAUI_BUTTON_STATE_HIDDEN;
          }
          {
              tab_button.cur_state = wxAUI_BUTTON_STATE_HIDDEN;
          }
@@ -1775,10 +1885,8 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
  
          m_art->DrawTab(dc,
                         wnd,
  
          m_art->DrawTab(dc,
                         wnd,
+                       page,
                         rect,
                         rect,
-                       page.caption,
-                       page.bitmap,
-                       page.active,
                         tab_button.cur_state,
                         &page.rect,
                         &tab_button.rect,
                         tab_button.cur_state,
                         &page.rect,
                         &tab_button.rect,
@@ -1809,21 +1917,11 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
  
          wxAuiTabContainerButton& tab_button = m_tab_close_buttons.Item(active);
  
  
          wxAuiTabContainerButton& tab_button = m_tab_close_buttons.Item(active);
  
-        // determine if a close button is on this tab
-        bool close_button = false;
-        if ((m_flags & wxAUI_NB_CLOSE_ON_ALL_TABS) != 0 ||
-            ((m_flags & wxAUI_NB_CLOSE_ON_ACTIVE_TAB) != 0 && page.active))
-        {
-            close_button = true;
-        }
-
          rect.x = active_offset;
          m_art->DrawTab(dc,
                         wnd,
          rect.x = active_offset;
          m_art->DrawTab(dc,
                         wnd,
+                       page,
                         active_rect,
                         active_rect,
-                       page.caption,
-                       page.bitmap,
-                       page.active,
                         tab_button.cur_state,
                         &page.rect,
                         &tab_button.rect,
                         tab_button.cur_state,
                         &page.rect,
                         &tab_button.rect,
@@ -1836,6 +1934,147 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
                   &dc, 0, 0);
  }
  
                   &dc, 0, 0);
  }
  
+// Is the tab visible?
+bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* wnd)
+{
+    if (!dc || !dc->IsOk())
+        return false;
+
+    size_t i;
+    size_t page_count = m_pages.GetCount();
+    size_t button_count = m_buttons.GetCount();
+
+    // Hasn't been rendered yet; assume it's visible
+    if (m_tab_close_buttons.GetCount() < page_count)
+        return true;
+
+    // First check if both buttons are disabled - if so, there's no need to
+    // check further for visibility.
+    int arrowButtonVisibleCount = 0;
+    for (i = 0; i < button_count; ++i)
+    {
+        wxAuiTabContainerButton& button = m_buttons.Item(i);
+        if (button.id == wxAUI_BUTTON_LEFT ||
+            button.id == wxAUI_BUTTON_RIGHT)
+        {
+            if ((button.cur_state & wxAUI_BUTTON_STATE_HIDDEN) == 0)
+                arrowButtonVisibleCount ++;
+        }
+    }
+
+    // Tab must be visible
+    if (arrowButtonVisibleCount == 0)
+        return true;
+
+    // If tab is less than the given offset, it must be invisible by definition
+    if (tabPage < tabOffset)
+        return false;
+
+    // draw buttons
+    int left_buttons_width = 0;
+    int right_buttons_width = 0;
+
+    int offset = 0;
+
+    // calculate size of 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;
+
+        offset -= button.rect.GetWidth();
+        right_buttons_width += button.rect.GetWidth();
+    }
+
+    offset = 0;
+
+    // calculate size of 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;
+
+        offset += button.rect.GetWidth();
+        left_buttons_width += button.rect.GetWidth();
+    }
+
+    offset = left_buttons_width;
+
+    if (offset == 0)
+        offset += m_art->GetIndentSize();
+
+    wxRect active_rect;
+
+    wxRect rect = m_rect;
+    rect.y = 0;
+    rect.height = m_rect.height;
+
+    // See if the given page is visible at the given tab offset (effectively scroll position)
+    for (i = tabOffset; i < page_count; ++i)
+    {
+        wxAuiNotebookPage& page = m_pages.Item(i);
+        wxAuiTabContainerButton& tab_button = m_tab_close_buttons.Item(i);
+
+        rect.x = offset;
+        rect.width = m_rect.width - right_buttons_width - offset - 2;
+
+        if (rect.width <= 0)
+            return false; // haven't found the tab, and we've run out of space, so return false
+
+        int x_extent = 0;
+        wxSize size = m_art->GetTabSize(*dc,
+                            wnd,
+                            page.caption,
+                            page.bitmap,
+                            page.active,
+                            tab_button.cur_state,
+                            &x_extent);
+
+        offset += x_extent;
+
+        if (i == (size_t) tabPage)
+        {
+            // If not all of the tab is visible, and supposing there's space to display it all,
+            // we could do better so we return false.
+            if (((m_rect.width - right_buttons_width - offset - 2) <= 0) && ((m_rect.width - right_buttons_width - left_buttons_width) > x_extent))
+                return false;
+            else
+                return true;
+        }
+    }
+
+    // Shouldn't really get here, but if it does, assume the tab is visible to prevent
+    // further looping in calling code.
+    return true;
+}
+
+// Make the tab visible if it wasn't already
+void wxAuiTabContainer::MakeTabVisible(int tabPage, wxWindow* win)
+{
+    wxClientDC dc(win);
+    if (!IsTabVisible(tabPage, GetTabOffset(), & dc, win))
+    {
+        int i;
+        for (i = 0; i < (int) m_pages.GetCount(); i++)
+        {
+            if (IsTabVisible(tabPage, i, & dc, win))
+            {
+                SetTabOffset(i);
+                win->Refresh();
+                return;
+            }
+        }
+    }
+}
  
  // TabHitTest() tests if a tab was hit, passing the window pointer
  // back if that condition was fulfilled.  The function returns
  
  // TabHitTest() tests if a tab was hit, passing the window pointer
  // back if that condition was fulfilled.  The function returns
@@ -1846,7 +2085,7 @@ bool wxAuiTabContainer::TabHitTest(int x, int y, wxWindow** hit) const
          return false;
  
      wxAuiTabContainerButton* btn = NULL;
          return false;
  
      wxAuiTabContainerButton* btn = NULL;
-    if (ButtonHitTest(x, y, &btn))
+    if (ButtonHitTest(x, y, &btn) && !(btn->cur_state & wxAUI_BUTTON_STATE_DISABLED))
      {
          if (m_buttons.Index(*btn) != wxNOT_FOUND)
              return false;
      {
          if (m_buttons.Index(*btn) != wxNOT_FOUND)
              return false;
@@ -1884,8 +2123,7 @@ bool wxAuiTabContainer::ButtonHitTest(int x, int y,
      {
          wxAuiTabContainerButton& button = m_buttons.Item(i);
          if (button.rect.Contains(x,y) &&
      {
          wxAuiTabContainerButton& button = m_buttons.Item(i);
          if (button.rect.Contains(x,y) &&
-            !(button.cur_state & (wxAUI_BUTTON_STATE_HIDDEN |
-                                   wxAUI_BUTTON_STATE_DISABLED)))
+            !(button.cur_state & wxAUI_BUTTON_STATE_HIDDEN ))
          {
              if (hit)
                  *hit = &button;
          {
              if (hit)
                  *hit = &button;
@@ -1917,12 +2155,14 @@ bool wxAuiTabContainer::ButtonHitTest(int x, int y,
  // as the Show() method on this class is "unplugged"
  static void ShowWnd(wxWindow* wnd, bool show)
  {
  // as the Show() method on this class is "unplugged"
  static void ShowWnd(wxWindow* wnd, bool show)
  {
+#if wxUSE_MDI
      if (wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
      {
          wxAuiMDIChildFrame* cf = (wxAuiMDIChildFrame*)wnd;
          cf->DoShow(show);
      }
      if (wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
      {
          wxAuiMDIChildFrame* cf = (wxAuiMDIChildFrame*)wnd;
          cf->DoShow(show);
      }
-     else
+    else
+#endif
      {
          wnd->Show(show);
      }
      {
          wnd->Show(show);
      }
@@ -1951,7 +2191,8 @@ void wxAuiTabContainer::DoShowHide()
      for (i = 0; i < page_count; ++i)
      {
          wxAuiNotebookPage& page = pages.Item(i);
      for (i = 0; i < page_count; ++i)
      {
          wxAuiNotebookPage& page = pages.Item(i);
-        ShowWnd(page.window, page.active);
+        if (!page.active)
+            ShowWnd(page.window, false);
      }
  }
  
      }
  }
  
@@ -1969,11 +2210,19 @@ BEGIN_EVENT_TABLE(wxAuiTabCtrl, wxControl)
      EVT_ERASE_BACKGROUND(wxAuiTabCtrl::OnEraseBackground)
      EVT_SIZE(wxAuiTabCtrl::OnSize)
      EVT_LEFT_DOWN(wxAuiTabCtrl::OnLeftDown)
      EVT_ERASE_BACKGROUND(wxAuiTabCtrl::OnEraseBackground)
      EVT_SIZE(wxAuiTabCtrl::OnSize)
      EVT_LEFT_DOWN(wxAuiTabCtrl::OnLeftDown)
-    EVT_LEFT_DCLICK(wxAuiTabCtrl::OnLeftDown)
+    EVT_LEFT_DCLICK(wxAuiTabCtrl::OnLeftDClick)
      EVT_LEFT_UP(wxAuiTabCtrl::OnLeftUp)
      EVT_LEFT_UP(wxAuiTabCtrl::OnLeftUp)
+    EVT_MIDDLE_DOWN(wxAuiTabCtrl::OnMiddleDown)
+    EVT_MIDDLE_UP(wxAuiTabCtrl::OnMiddleUp)
+    EVT_RIGHT_DOWN(wxAuiTabCtrl::OnRightDown)
+    EVT_RIGHT_UP(wxAuiTabCtrl::OnRightUp)
      EVT_MOTION(wxAuiTabCtrl::OnMotion)
      EVT_LEAVE_WINDOW(wxAuiTabCtrl::OnLeaveWindow)
      EVT_MOTION(wxAuiTabCtrl::OnMotion)
      EVT_LEAVE_WINDOW(wxAuiTabCtrl::OnLeaveWindow)
-    EVT_AUINOTEBOOK_BUTTON(-1, wxAuiTabCtrl::OnButton)
+    EVT_AUINOTEBOOK_BUTTON(wxID_ANY, wxAuiTabCtrl::OnButton)
+    EVT_SET_FOCUS(wxAuiTabCtrl::OnSetFocus)
+    EVT_KILL_FOCUS(wxAuiTabCtrl::OnKillFocus)
+    EVT_CHAR(wxAuiTabCtrl::OnChar)
+    EVT_MOUSE_CAPTURE_LOST(wxAuiTabCtrl::OnCaptureLost)
  END_EVENT_TABLE()
  
  
  END_EVENT_TABLE()
  
  
@@ -1983,6 +2232,7 @@ wxAuiTabCtrl::wxAuiTabCtrl(wxWindow* parent,
                             const wxSize& size,
                             long style) : wxControl(parent, id, pos, size, style)
  {
                             const wxSize& size,
                             long style) : wxControl(parent, id, pos, size, style)
  {
+    SetName(wxT("wxAuiTabCtrl"));
      m_click_pt = wxDefaultPosition;
      m_is_dragging = false;
      m_hover_button = NULL;
      m_click_pt = wxDefaultPosition;
      m_is_dragging = false;
      m_hover_button = NULL;
@@ -2028,7 +2278,11 @@ void wxAuiTabCtrl::OnLeftDown(wxMouseEvent& evt)
      {
          int new_selection = GetIdxFromWindow(wnd);
  
      {
          int new_selection = GetIdxFromWindow(wnd);
  
-        if (new_selection != GetActivePage())
+        // wxAuiNotebooks always want to receive this event
+        // even if the tab is already active, because they may
+        // have multiple tab controls
+        if (new_selection != GetActivePage() ||
+            GetParent()->IsKindOf(CLASSINFO(wxAuiNotebook)))
          {
              wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
              e.SetSelection(new_selection);
          {
              wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
              e.SetSelection(new_selection);
@@ -2051,6 +2305,20 @@ void wxAuiTabCtrl::OnLeftDown(wxMouseEvent& evt)
      }
  }
  
      }
  }
  
+void wxAuiTabCtrl::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
+{
+    if (m_is_dragging)
+    {
+        m_is_dragging = false;
+
+        wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_CANCEL_DRAG, m_windowId);
+        evt.SetSelection(GetIdxFromWindow(m_click_tab));
+        evt.SetOldSelection(evt.GetSelection());
+        evt.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(evt);
+    }
+}
+
  void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt)
  {
      if (GetCapture() == this)
  void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt)
  {
      if (GetCapture() == this)
@@ -2058,11 +2326,14 @@ void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt)
  
      if (m_is_dragging)
      {
  
      if (m_is_dragging)
      {
+        m_is_dragging = false;
+
          wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, m_windowId);
          evt.SetSelection(GetIdxFromWindow(m_click_tab));
          evt.SetOldSelection(evt.GetSelection());
          evt.SetEventObject(this);
          GetEventHandler()->ProcessEvent(evt);
          wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, m_windowId);
          evt.SetSelection(GetIdxFromWindow(m_click_tab));
          evt.SetOldSelection(evt.GetSelection());
          evt.SetEventObject(this);
          GetEventHandler()->ProcessEvent(evt);
+
          return;
      }
  
          return;
      }
  
@@ -2070,7 +2341,8 @@ void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt)
      {
          // make sure we're still clicking the button
          wxAuiTabContainerButton* button = NULL;
      {
          // make sure we're still clicking the button
          wxAuiTabContainerButton* button = NULL;
-        if (!ButtonHitTest(evt.m_x, evt.m_y, &button))
+        if (!ButtonHitTest(evt.m_x, evt.m_y, &button) ||
+            button->cur_state & wxAUI_BUTTON_STATE_DISABLED)
              return;
  
          if (button != m_pressed_button)
              return;
  
          if (button != m_pressed_button)
@@ -2085,6 +2357,7 @@ void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt)
          if (!(m_pressed_button->cur_state & wxAUI_BUTTON_STATE_DISABLED))
          {
              wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, m_windowId);
          if (!(m_pressed_button->cur_state & wxAUI_BUTTON_STATE_DISABLED))
          {
              wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, m_windowId);
+            evt.SetSelection(GetIdxFromWindow(m_click_tab));
              evt.SetInt(m_pressed_button->id);
              evt.SetEventObject(this);
              GetEventHandler()->ProcessEvent(evt);
              evt.SetInt(m_pressed_button->id);
              evt.SetEventObject(this);
              GetEventHandler()->ProcessEvent(evt);
@@ -2098,17 +2371,77 @@ void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt)
      m_click_tab = NULL;
  }
  
      m_click_tab = NULL;
  }
  
-void wxAuiTabCtrl::OnMotion(wxMouseEvent& evt)
+void wxAuiTabCtrl::OnMiddleUp(wxMouseEvent& evt)
  {
  {
-    wxPoint pos = evt.GetPosition();
+    wxWindow* wnd = NULL;
+    if (!TabHitTest(evt.m_x, evt.m_y, &wnd))
+        return;
  
  
-    // check if the mouse is hovering above a button
+    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, m_windowId);
+    e.SetEventObject(this);
+    e.SetSelection(GetIdxFromWindow(wnd));
+    GetEventHandler()->ProcessEvent(e);
+}
+
+void wxAuiTabCtrl::OnMiddleDown(wxMouseEvent& evt)
+{
+    wxWindow* wnd = NULL;
+    if (!TabHitTest(evt.m_x, evt.m_y, &wnd))
+        return;
+
+    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, m_windowId);
+    e.SetEventObject(this);
+    e.SetSelection(GetIdxFromWindow(wnd));
+    GetEventHandler()->ProcessEvent(e);
+}
+
+void wxAuiTabCtrl::OnRightUp(wxMouseEvent& evt)
+{
+    wxWindow* wnd = NULL;
+    if (!TabHitTest(evt.m_x, evt.m_y, &wnd))
+        return;
+
+    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, m_windowId);
+    e.SetEventObject(this);
+    e.SetSelection(GetIdxFromWindow(wnd));
+    GetEventHandler()->ProcessEvent(e);
+}
+
+void wxAuiTabCtrl::OnRightDown(wxMouseEvent& evt)
+{
+    wxWindow* wnd = NULL;
+    if (!TabHitTest(evt.m_x, evt.m_y, &wnd))
+        return;
+
+    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, m_windowId);
+    e.SetEventObject(this);
+    e.SetSelection(GetIdxFromWindow(wnd));
+    GetEventHandler()->ProcessEvent(e);
+}
+
+void wxAuiTabCtrl::OnLeftDClick(wxMouseEvent& evt)
+{
+    wxWindow* wnd;
      wxAuiTabContainerButton* button;
      wxAuiTabContainerButton* button;
-    if (ButtonHitTest(pos.x, pos.y, &button))
+    if (!TabHitTest(evt.m_x, evt.m_y, &wnd) && !ButtonHitTest(evt.m_x, evt.m_y, &button))
      {
      {
-        if (m_hover_button && button != m_hover_button)
-        {
-            m_hover_button->cur_state = wxAUI_BUTTON_STATE_NORMAL;
+        wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, m_windowId);
+        e.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(e);
+    }
+}
+
+void wxAuiTabCtrl::OnMotion(wxMouseEvent& evt)
+{
+    wxPoint pos = evt.GetPosition();
+
+    // check if the mouse is hovering above a button
+    wxAuiTabContainerButton* button;
+    if (ButtonHitTest(pos.x, pos.y, &button) && !(button->cur_state & wxAUI_BUTTON_STATE_DISABLED))
+    {
+        if (m_hover_button && button != m_hover_button)
+        {
+            m_hover_button->cur_state = wxAUI_BUTTON_STATE_NORMAL;
              m_hover_button = NULL;
              Refresh();
              Update();
              m_hover_button = NULL;
              Refresh();
              Update();
@@ -2123,7 +2456,7 @@ void wxAuiTabCtrl::OnMotion(wxMouseEvent& evt)
              return;
          }
      }
              return;
          }
      }
-     else
+    else
      {
          if (m_hover_button)
          {
      {
          if (m_hover_button)
          {
@@ -2191,25 +2524,16 @@ void wxAuiTabCtrl::OnButton(wxAuiNotebookEvent& event)
                  Update();
              }
          }
                  Update();
              }
          }
-         else
+        else
          {
              SetTabOffset(GetTabOffset()+1);
              Refresh();
              Update();
          }
      }
          {
              SetTabOffset(GetTabOffset()+1);
              Refresh();
              Update();
          }
      }
-     else if (button == wxAUI_BUTTON_WINDOWLIST)
+    else if (button == wxAUI_BUTTON_WINDOWLIST)
      {
      {
-        wxArrayString as;
-
-        size_t i, page_count = m_pages.GetCount();
-        for (i = 0; i < page_count; ++i)
-        {
-            wxAuiNotebookPage& page = m_pages.Item(i);
-            as.Add(page.caption);
-        }
-
-        int idx = GetArtProvider()->ShowWindowList(this, as, GetActivePage());
+        int idx = GetArtProvider()->ShowDropDown(this, m_pages, GetActivePage());
  
          if (idx != -1)
          {
  
          if (idx != -1)
          {
@@ -2220,12 +2544,145 @@ void wxAuiTabCtrl::OnButton(wxAuiNotebookEvent& event)
              GetEventHandler()->ProcessEvent(e);
          }
      }
              GetEventHandler()->ProcessEvent(e);
          }
      }
-     else
+    else
      {
          event.Skip();
      }
  }
  
      {
          event.Skip();
      }
  }
  
+void wxAuiTabCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event))
+{
+    Refresh();
+}
+
+void wxAuiTabCtrl::OnKillFocus(wxFocusEvent& WXUNUSED(event))
+{
+    Refresh();
+}
+
+void wxAuiTabCtrl::OnChar(wxKeyEvent& event)
+{
+    if (GetActivePage() == -1)
+    {
+        event.Skip();
+        return;
+    }
+
+    // We can't leave tab processing to the system; on Windows, tabs and keys
+    // get eaten by the system and not processed properly if we specify both
+    // wxTAB_TRAVERSAL and wxWANTS_CHARS. And if we specify just wxTAB_TRAVERSAL,
+    // we don't key arrow key events.
+
+    int key = event.GetKeyCode();
+
+    if (key == WXK_NUMPAD_PAGEUP)
+        key = WXK_PAGEUP;
+    if (key == WXK_NUMPAD_PAGEDOWN)
+        key = WXK_PAGEDOWN;
+    if (key == WXK_NUMPAD_HOME)
+        key = WXK_HOME;
+    if (key == WXK_NUMPAD_END)
+        key = WXK_END;
+    if (key == WXK_NUMPAD_LEFT)
+        key = WXK_LEFT;
+    if (key == WXK_NUMPAD_RIGHT)
+        key = WXK_RIGHT;
+
+    if (key == WXK_TAB || key == WXK_PAGEUP || key == WXK_PAGEDOWN)
+    {
+        bool bCtrlDown = event.ControlDown();
+        bool bShiftDown = event.ShiftDown();
+
+        bool bForward = (key == WXK_TAB && !bShiftDown) || (key == WXK_PAGEDOWN);
+        bool bWindowChange = (key == WXK_PAGEUP) || (key == WXK_PAGEDOWN) || bCtrlDown;
+        bool bFromTab = (key == WXK_TAB);
+
+        wxAuiNotebook* nb = wxDynamicCast(GetParent(), wxAuiNotebook);
+        if (!nb)
+        {
+            event.Skip();
+            return;
+        }
+
+        wxNavigationKeyEvent keyEvent;
+        keyEvent.SetDirection(bForward);
+        keyEvent.SetWindowChange(bWindowChange);
+        keyEvent.SetFromTab(bFromTab);
+        keyEvent.SetEventObject(nb);
+
+        if (!nb->GetEventHandler()->ProcessEvent(keyEvent))
+        {
+            // Not processed? Do an explicit tab into the page.
+            wxWindow* win = GetWindowFromIdx(GetActivePage());
+            if (win)
+                win->SetFocus();
+        }
+        return;
+    }
+
+    if (m_pages.GetCount() < 2)
+    {
+        event.Skip();
+        return;
+    }
+
+    int newPage = -1;
+
+    int forwardKey, backwardKey;
+    if (GetLayoutDirection() == wxLayout_RightToLeft)
+    {
+        forwardKey = WXK_LEFT;
+        backwardKey = WXK_RIGHT;
+    }
+    else
+     {
+        forwardKey = WXK_RIGHT;
+        backwardKey = WXK_LEFT;
+    }
+
+    if (key == forwardKey)
+    {
+        if (m_pages.GetCount() > 1)
+        {
+            if (GetActivePage() == -1)
+                newPage = 0;
+            else if (GetActivePage() < (int) (m_pages.GetCount() - 1))
+                newPage = GetActivePage() + 1;
+        }
+    }
+    else if (key == backwardKey)
+    {
+        if (m_pages.GetCount() > 1)
+        {
+            if (GetActivePage() == -1)
+                newPage = (int) (m_pages.GetCount() - 1);
+            else if (GetActivePage() > 0)
+                newPage = GetActivePage() - 1;
+        }
+    }
+    else if (key == WXK_HOME)
+    {
+        newPage = 0;
+    }
+    else if (key == WXK_END)
+    {
+        newPage = (int) (m_pages.GetCount() - 1);
+    }
+    else
+        event.Skip();
+
+    if (newPage != -1)
+    {
+        wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
+        e.SetSelection(newPage);
+        e.SetOldSelection(newPage);
+        e.SetEventObject(this);
+        this->GetEventHandler()->ProcessEvent(e);
+    }
+    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
  // (and not grandchildren).  wxTabFrame facilitates this.  There is one
  // wxTabFrame is an interesting case.  It's important that all child pages
  // of the multi-notebook control are all actually children of that control
  // (and not grandchildren).  wxTabFrame facilitates this.  There is one
@@ -2245,11 +2702,17 @@ public:
          m_tab_ctrl_height = 20;
      }
  
          m_tab_ctrl_height = 20;
      }
  
+    ~wxTabFrame()
+    {
+        wxDELETE(m_tabs);
+    }
+
      void SetTabCtrlHeight(int h)
      {
          m_tab_ctrl_height = h;
      }
  
      void SetTabCtrlHeight(int h)
      {
          m_tab_ctrl_height = h;
      }
  
+protected:
      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))
@@ -2264,6 +2727,7 @@ public:
          *y = m_rect.height;
      }
  
          *y = m_rect.height;
      }
  
+public:
      bool Show( bool WXUNUSED(show = true) ) { return false; }
  
      void DoSizing()
      bool Show( bool WXUNUSED(show = true) ) { return false; }
  
      void DoSizing()
@@ -2271,9 +2735,25 @@ public:
          if (!m_tabs)
              return;
  
          if (!m_tabs)
              return;
  
+        if (m_tabs->IsFrozen() || m_tabs->GetParent()->IsFrozen())
+            return;
+
          m_tab_rect = wxRect(m_rect.x, m_rect.y, m_rect.width, m_tab_ctrl_height);
          m_tab_rect = wxRect(m_rect.x, m_rect.y, m_rect.width, m_tab_ctrl_height);
-        m_tabs->SetSize(m_rect.x, m_rect.y, m_rect.width, m_tab_ctrl_height);
-        m_tabs->SetRect(wxRect(0, 0, m_rect.width, m_tab_ctrl_height));
+        if (m_tabs->GetFlags() & wxAUI_NB_BOTTOM)
+        {
+            m_tab_rect = wxRect (m_rect.x, m_rect.y + m_rect.height - m_tab_ctrl_height, m_rect.width, m_tab_ctrl_height);
+            m_tabs->SetSize     (m_rect.x, m_rect.y + m_rect.height - m_tab_ctrl_height, m_rect.width, m_tab_ctrl_height);
+            m_tabs->SetRect     (wxRect(0, 0, m_rect.width, m_tab_ctrl_height));
+        }
+        else //TODO: if (GetFlags() & wxAUI_NB_TOP)
+        {
+            m_tab_rect = wxRect (m_rect.x, m_rect.y, m_rect.width, m_tab_ctrl_height);
+            m_tabs->SetSize     (m_rect.x, m_rect.y, m_rect.width, m_tab_ctrl_height);
+            m_tabs->SetRect     (wxRect(0, 0,        m_rect.width, m_tab_ctrl_height));
+        }
+        // TODO: else if (GetFlags() & wxAUI_NB_LEFT){}
+        // TODO: else if (GetFlags() & wxAUI_NB_RIGHT){}
+
          m_tabs->Refresh();
          m_tabs->Update();
  
          m_tabs->Refresh();
          m_tabs->Update();
  
@@ -2282,18 +2762,38 @@ public:
  
          for (i = 0; i < page_count; ++i)
          {
  
          for (i = 0; i < page_count; ++i)
          {
+            int height = m_rect.height - m_tab_ctrl_height;
+            if ( height < 0 )
+            {
+                // avoid passing negative height to wxWindow::SetSize(), this
+                // results in assert failures/GTK+ warnings
+                height = 0;
+            }
+
              wxAuiNotebookPage& page = pages.Item(i);
              wxAuiNotebookPage& page = pages.Item(i);
-            page.window->SetSize(m_rect.x, m_rect.y + m_tab_ctrl_height,
-                                 m_rect.width, m_rect.height - m_tab_ctrl_height);
+            if (m_tabs->GetFlags() & wxAUI_NB_BOTTOM)
+            {
+                page.window->SetSize(m_rect.x, m_rect.y, m_rect.width, height);
+            }
+            else //TODO: if (GetFlags() & wxAUI_NB_TOP)
+            {
+                page.window->SetSize(m_rect.x, m_rect.y + m_tab_ctrl_height,
+                                     m_rect.width, height);
+            }
+            // TODO: else if (GetFlags() & wxAUI_NB_LEFT){}
+            // TODO: else if (GetFlags() & wxAUI_NB_RIGHT){}
  
  
+#if wxUSE_MDI
              if (page.window->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
              {
                  wxAuiMDIChildFrame* wnd = (wxAuiMDIChildFrame*)page.window;
                  wnd->ApplyMDIChildFrameRect();
              }
              if (page.window->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
              {
                  wxAuiMDIChildFrame* wnd = (wxAuiMDIChildFrame*)page.window;
                  wnd->ApplyMDIChildFrameRect();
              }
+#endif
          }
      }
  
          }
      }
  
+protected:
      void DoGetSize(int* x, int* y) const
      {
          if (x)
      void DoGetSize(int* x, int* y) const
      {
          if (x)
@@ -2302,13 +2802,12 @@ public:
              *y = m_rect.GetHeight();
      }
  
              *y = m_rect.GetHeight();
      }
  
+public:
      void Update()
      {
          // does nothing
      }
  
      void Update()
      {
          // does nothing
      }
  
-public:
-
      wxRect m_rect;
      wxRect m_tab_rect;
      wxAuiTabCtrl* m_tabs;
      wxRect m_rect;
      wxRect m_tab_rect;
      wxAuiTabCtrl* m_tabs;
@@ -2316,53 +2815,63 @@ public:
  };
  
  
  };
  
  
-
+const int wxAuiBaseTabCtrlId = 5380;
  
  
  // -- wxAuiNotebook class implementation --
  
  
  
  // -- wxAuiNotebook class implementation --
  
+#define EVT_AUI_RANGE(id1, id2, event, func) \
+    wx__DECLARE_EVT2(event, id1, id2, wxAuiNotebookEventHandler(func))
+
  BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl)
      EVT_SIZE(wxAuiNotebook::OnSize)
  BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl)
      EVT_SIZE(wxAuiNotebook::OnSize)
-    EVT_CHILD_FOCUS(wxAuiNotebook::OnChildFocus)
-    EVT_COMMAND_RANGE(10000, 10100,
+    EVT_CHILD_FOCUS(wxAuiNotebook::OnChildFocusNotebook)
+    EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
                        wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING,
                        wxAuiNotebook::OnTabClicked)
                        wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING,
                        wxAuiNotebook::OnTabClicked)
-    EVT_COMMAND_RANGE(10000, 10100,
+    EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
                        wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG,
                        wxAuiNotebook::OnTabBeginDrag)
                        wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG,
                        wxAuiNotebook::OnTabBeginDrag)
-    EVT_COMMAND_RANGE(10000, 10100,
+    EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
                        wxEVT_COMMAND_AUINOTEBOOK_END_DRAG,
                        wxAuiNotebook::OnTabEndDrag)
                        wxEVT_COMMAND_AUINOTEBOOK_END_DRAG,
                        wxAuiNotebook::OnTabEndDrag)
-    EVT_COMMAND_RANGE(10000, 10100,
+    EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
+                      wxEVT_COMMAND_AUINOTEBOOK_CANCEL_DRAG,
+                      wxAuiNotebook::OnTabCancelDrag)
+    EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
                        wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION,
                        wxAuiNotebook::OnTabDragMotion)
                        wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION,
                        wxAuiNotebook::OnTabDragMotion)
-    EVT_COMMAND_RANGE(10000, 10100,
+    EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
                        wxEVT_COMMAND_AUINOTEBOOK_BUTTON,
                        wxAuiNotebook::OnTabButton)
                        wxEVT_COMMAND_AUINOTEBOOK_BUTTON,
                        wxAuiNotebook::OnTabButton)
+    EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
+                      wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN,
+                      wxAuiNotebook::OnTabMiddleDown)
+    EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
+                      wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP,
+                      wxAuiNotebook::OnTabMiddleUp)
+    EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
+                      wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN,
+                      wxAuiNotebook::OnTabRightDown)
+    EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
+                      wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP,
+                      wxAuiNotebook::OnTabRightUp)
+    EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
+                      wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK,
+                      wxAuiNotebook::OnTabBgDClick)
+    EVT_NAVIGATION_KEY(wxAuiNotebook::OnNavigationKeyNotebook)
  END_EVENT_TABLE()
  
  END_EVENT_TABLE()
  
-wxAuiNotebook::wxAuiNotebook()
+void wxAuiNotebook::Init()
  {
      m_curpage = -1;
  {
      m_curpage = -1;
-    m_tab_id_counter = 10000;
+    m_tab_id_counter = wxAuiBaseTabCtrlId;
      m_dummy_wnd = NULL;
      m_tab_ctrl_height = 20;
      m_requested_bmp_size = wxDefaultSize;
      m_requested_tabctrl_height = -1;
  }
  
      m_dummy_wnd = NULL;
      m_tab_ctrl_height = 20;
      m_requested_bmp_size = wxDefaultSize;
      m_requested_tabctrl_height = -1;
  }
  
-wxAuiNotebook::wxAuiNotebook(wxWindow *parent,
-                             wxWindowID id,
-                             const wxPoint& pos,
-                             const wxSize& size,
-                             long style) : wxControl(parent, id, pos, size, style)
-{
-    m_dummy_wnd = NULL;
-    m_requested_bmp_size = wxDefaultSize;
-    m_requested_tabctrl_height = -1;
-    InitNotebook(style);
-}
-
  bool wxAuiNotebook::Create(wxWindow* parent,
                             wxWindowID id,
                             const wxPoint& pos,
  bool wxAuiNotebook::Create(wxWindow* parent,
                             wxWindowID id,
                             const wxPoint& pos,
@@ -2381,12 +2890,13 @@ bool wxAuiNotebook::Create(wxWindow* parent,
  // code called by all constructors
  void wxAuiNotebook::InitNotebook(long style)
  {
  // code called by all constructors
  void wxAuiNotebook::InitNotebook(long style)
  {
+    SetName(wxT("wxAuiNotebook"));
      m_curpage = -1;
      m_curpage = -1;
-    m_tab_id_counter = 10000;
+    m_tab_id_counter = wxAuiBaseTabCtrlId;
      m_dummy_wnd = NULL;
      m_flags = (unsigned int)style;
      m_tab_ctrl_height = 20;
      m_dummy_wnd = NULL;
      m_flags = (unsigned int)style;
      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);
@@ -2409,6 +2919,12 @@ void wxAuiNotebook::InitNotebook(long style)
  
  wxAuiNotebook::~wxAuiNotebook()
  {
  
  wxAuiNotebook::~wxAuiNotebook()
  {
+    // Indicate we're deleting pages
+    SendDestroyEvent();
+
+    while ( GetPageCount() > 0 )
+        DeletePage(0);
+
      m_mgr.UnInit();
  }
  
      m_mgr.UnInit();
  }
  
@@ -2416,7 +2932,23 @@ void wxAuiNotebook::SetArtProvider(wxAuiTabArt* art)
  {
      m_tabs.SetArtProvider(art);
  
  {
      m_tabs.SetArtProvider(art);
  
-    UpdateTabCtrlHeight();
+    // Update the height and do nothing else if it did something but otherwise
+    // (i.e. if the new art provider uses the same height as the old one) we
+    // need to manually set the art provider for all tabs ourselves.
+    if ( !UpdateTabCtrlHeight() )
+    {
+        wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes();
+        const size_t pane_count = all_panes.GetCount();
+        for (size_t i = 0; i < pane_count; ++i)
+        {
+            wxAuiPaneInfo& pane = all_panes.Item(i);
+            if (pane.name == wxT("dummy"))
+                continue;
+            wxTabFrame* tab_frame = (wxTabFrame*)pane.window;
+            wxAuiTabCtrl* tabctrl = tab_frame->m_tabs;
+            tabctrl->SetArtProvider(art->Clone());
+        }
+    }
  }
  
  // SetTabCtrlHeight() is the highest-level override of the
  }
  
  // SetTabCtrlHeight() is the highest-level override of the
@@ -2424,12 +2956,12 @@ void wxAuiNotebook::SetArtProvider(wxAuiTabArt* art)
  // specified tab ctrl height, overriding all other considerations,
  // such as text or bitmap height.  It overrides any call to
  // SetUniformBitmapSize().  Specifying a height of -1 reverts
  // specified tab ctrl height, overriding all other considerations,
  // such as text or bitmap height.  It overrides any call to
  // SetUniformBitmapSize().  Specifying a height of -1 reverts
-// any previous call and returns to the default behavior
+// any previous call and returns to the default behaviour
  
  void wxAuiNotebook::SetTabCtrlHeight(int height)
  {
      m_requested_tabctrl_height = height;
  
  void wxAuiNotebook::SetTabCtrlHeight(int height)
  {
      m_requested_tabctrl_height = height;
-    
+
      // if window is already initialized, recalculate the tab height
      if (m_dummy_wnd)
      {
      // if window is already initialized, recalculate the tab height
      if (m_dummy_wnd)
      {
@@ -2448,7 +2980,7 @@ void wxAuiNotebook::SetTabCtrlHeight(int height)
  void wxAuiNotebook::SetUniformBitmapSize(const wxSize& size)
  {
      m_requested_bmp_size = size;
  void wxAuiNotebook::SetUniformBitmapSize(const wxSize& size)
  {
      m_requested_bmp_size = size;
-    
+
      // if window is already initialized, recalculate the tab height
      if (m_dummy_wnd)
      {
      // if window is already initialized, recalculate the tab height
      if (m_dummy_wnd)
      {
@@ -2457,40 +2989,42 @@ void wxAuiNotebook::SetUniformBitmapSize(const wxSize& size)
  }
  
  // UpdateTabCtrlHeight() does the actual tab resizing. It's meant
  }
  
  // UpdateTabCtrlHeight() does the actual tab resizing. It's meant
-// to be used interally
-void wxAuiNotebook::UpdateTabCtrlHeight()
+// to be used internally
+bool wxAuiNotebook::UpdateTabCtrlHeight()
  {
      // get the tab ctrl height we will use
      int height = CalculateTabCtrlHeight();
  {
      // get the tab ctrl height we will use
      int height = CalculateTabCtrlHeight();
-    
+
      // if the tab control height needs to change, update
      // all of our tab controls with the new height
      // if the tab control height needs to change, update
      // all of our tab controls with the new height
-    if (m_tab_ctrl_height != height)
-    {
-        wxAuiTabArt* art = m_tabs.GetArtProvider();
+    if (m_tab_ctrl_height == height)
+        return false;
  
  
-        m_tab_ctrl_height = height;
+    wxAuiTabArt* art = m_tabs.GetArtProvider();
  
  
-        wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes();
-        size_t i, pane_count = all_panes.GetCount();
-        for (i = 0; i < pane_count; ++i)
-        {
-            wxAuiPaneInfo& pane = all_panes.Item(i);
-            if (pane.name == wxT("dummy"))
-                continue;
-            wxTabFrame* tab_frame = (wxTabFrame*)pane.window;
-            wxAuiTabCtrl* tabctrl = tab_frame->m_tabs;
-            tab_frame->SetTabCtrlHeight(m_tab_ctrl_height);
-            tabctrl->SetArtProvider(art->Clone());
-            tab_frame->DoSizing();
-        }
+    m_tab_ctrl_height = height;
+
+    wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes();
+    size_t i, pane_count = all_panes.GetCount();
+    for (i = 0; i < pane_count; ++i)
+    {
+        wxAuiPaneInfo& pane = all_panes.Item(i);
+        if (pane.name == wxT("dummy"))
+            continue;
+        wxTabFrame* tab_frame = (wxTabFrame*)pane.window;
+        wxAuiTabCtrl* tabctrl = tab_frame->m_tabs;
+        tab_frame->SetTabCtrlHeight(m_tab_ctrl_height);
+        tabctrl->SetArtProvider(art->Clone());
+        tab_frame->DoSizing();
      }
      }
+
+    return true;
  }
  
  void wxAuiNotebook::UpdateHintWindowSize()
  {
      wxSize size = CalculateNewSplitSize();
  }
  
  void wxAuiNotebook::UpdateHintWindowSize()
  {
      wxSize size = CalculateNewSplitSize();
-    
+
      // the placeholder hint window should be set to this size
      wxAuiPaneInfo& info = m_mgr.GetPane(wxT("dummy"));
      if (info.IsOk())
      // the placeholder hint window should be set to this size
      wxAuiPaneInfo& info = m_mgr.GetPane(wxT("dummy"));
      if (info.IsOk())
@@ -2518,7 +3052,7 @@ wxSize wxAuiNotebook::CalculateNewSplitSize()
      }
  
      wxSize new_split_size;
      }
  
      wxSize new_split_size;
-    
+
      // if there is only one tab control, the first split
      // should happen around the middle
      if (tab_ctrl_count < 2)
      // if there is only one tab control, the first split
      // should happen around the middle
      if (tab_ctrl_count < 2)
@@ -2527,13 +3061,13 @@ wxSize wxAuiNotebook::CalculateNewSplitSize()
          new_split_size.x /= 2;
          new_split_size.y /= 2;
      }
          new_split_size.x /= 2;
          new_split_size.y /= 2;
      }
-     else
+    else
      {
          // this is in place of a more complicated calculation
          // that needs to be implemented
          new_split_size = wxSize(180,180);
      }
      {
          // this is in place of a more complicated calculation
          // that needs to be implemented
          new_split_size = wxSize(180,180);
      }
-    
+
      return new_split_size;
  }
  
      return new_split_size;
  }
  
@@ -2544,7 +3078,7 @@ int wxAuiNotebook::CalculateTabCtrlHeight()
      // tab height
      if (m_requested_tabctrl_height != -1)
          return m_requested_tabctrl_height;
      // tab height
      if (m_requested_tabctrl_height != -1)
          return m_requested_tabctrl_height;
-        
+
      // find out new best tab height
      wxAuiTabArt* art = m_tabs.GetArtProvider();
  
      // find out new best tab height
      wxAuiTabArt* art = m_tabs.GetArtProvider();
  
@@ -2602,6 +3136,12 @@ bool wxAuiNotebook::InsertPage(size_t page_idx,
                                 bool select,
                                 const wxBitmap& bitmap)
  {
                                 bool select,
                                 const wxBitmap& bitmap)
  {
+    wxASSERT_MSG(page, wxT("page pointer must be non-NULL"));
+    if (!page)
+        return false;
+
+    page->Reparent(this);
+
      wxAuiNotebookPage info;
      info.window = page;
      info.caption = caption;
      wxAuiNotebookPage info;
      info.window = page;
      info.caption = caption;
@@ -2619,24 +3159,26 @@ bool wxAuiNotebook::InsertPage(size_t page_idx,
      // select is false, it must become the "current page"
      // (though no select events will be fired)
      if (!select && m_tabs.GetPageCount() == 1)
      // select is false, it must become the "current page"
      // (though no select events will be fired)
      if (!select && m_tabs.GetPageCount() == 1)
-        m_curpage = GetPageIndex(page);
+        select = true;
+        //m_curpage = GetPageIndex(page);
  
      wxAuiTabCtrl* active_tabctrl = GetActiveTabCtrl();
      if (page_idx >= active_tabctrl->GetPageCount())
          active_tabctrl->AddPage(page, info);
  
      wxAuiTabCtrl* active_tabctrl = GetActiveTabCtrl();
      if (page_idx >= active_tabctrl->GetPageCount())
          active_tabctrl->AddPage(page, info);
-         else
+    else
          active_tabctrl->InsertPage(page, info, page_idx);
  
      UpdateTabCtrlHeight();
      DoSizing();
      active_tabctrl->DoShowHide();
  
          active_tabctrl->InsertPage(page, info, page_idx);
  
      UpdateTabCtrlHeight();
      DoSizing();
      active_tabctrl->DoShowHide();
  
+    // adjust selected index
+    if(m_curpage >= (int) page_idx)
+        m_curpage++;
+
      if (select)
      {
      if (select)
      {
-        int idx = m_tabs.GetIdxFromWindow(page);
-        wxASSERT_MSG(idx != -1, wxT("Invalid Page index returned on wxAuiNotebook::InsertPage()"));
-
-        SetSelection(idx);
+        SetSelectionToWindow(page);
      }
  
      return true;
      }
  
      return true;
@@ -2647,11 +3189,19 @@ bool wxAuiNotebook::InsertPage(size_t page_idx,
  // and destroys the window as well
  bool wxAuiNotebook::DeletePage(size_t page_idx)
  {
  // and destroys the window as well
  bool wxAuiNotebook::DeletePage(size_t page_idx)
  {
+    if (page_idx >= m_tabs.GetPageCount())
+        return false;
+
      wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx);
  
      wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx);
  
+    // hide the window in advance, as this will
+    // prevent flicker
+    ShowWnd(wnd, false);
+
      if (!RemovePage(page_idx))
          return false;
  
      if (!RemovePage(page_idx))
          return false;
  
+#if wxUSE_MDI
      // actually destroy the window now
      if (wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
      {
      // actually destroy the window now
      if (wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
      {
@@ -2660,7 +3210,8 @@ bool wxAuiNotebook::DeletePage(size_t page_idx)
          if (!wxPendingDelete.Member(wnd))
              wxPendingDelete.Append(wnd);
      }
          if (!wxPendingDelete.Member(wnd))
              wxPendingDelete.Append(wnd);
      }
-     else
+    else
+#endif
      {
          wnd->Destroy();
      }
      {
          wnd->Destroy();
      }
@@ -2674,39 +3225,28 @@ bool wxAuiNotebook::DeletePage(size_t page_idx)
  // but does not destroy the window
  bool wxAuiNotebook::RemovePage(size_t page_idx)
  {
  // but does not destroy the window
  bool wxAuiNotebook::RemovePage(size_t page_idx)
  {
+    // save active window pointer
+    wxWindow* active_wnd = NULL;
+    if (m_curpage >= 0)
+        active_wnd = m_tabs.GetWindowFromIdx(m_curpage);
+
+    // save pointer of window being deleted
      wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx);
      wxWindow* new_active = NULL;
  
      wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx);
      wxWindow* new_active = NULL;
  
+    // make sure we found the page
+    if (!wnd)
+        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 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;
+    bool is_curpage = (m_curpage == (int)page_idx);
+    bool is_active_in_split = ctrl->GetPage(ctrl_idx).active;
  
  
-    if (new_idx >= 0 && new_idx < (int)ctrl->GetPageCount())
-    {
-        new_active = ctrl->GetWindowFromIdx(new_idx);
-    }
-     else
-    {
-        // set the active page to the first page that
-        // isn't the one being deleted
-        size_t i, page_count = m_tabs.GetPageCount();
-        for (i = 0; i < page_count; ++i)
-        {
-            wxWindow* w = m_tabs.GetWindowFromIdx(i);
-            if (wnd != w)
-            {
-                new_active = m_tabs.GetWindowFromIdx(i);
-                break;
-            }
-        }
-    }
  
      // remove the tab from main catalog
      if (!m_tabs.RemovePage(wnd))
  
      // remove the tab from main catalog
      if (!m_tabs.RemovePage(wnd))
@@ -2715,16 +3255,60 @@ bool wxAuiNotebook::RemovePage(size_t page_idx)
      // remove the tab from the onscreen tab ctrl
      ctrl->RemovePage(wnd);
  
      // remove the tab from the onscreen tab ctrl
      ctrl->RemovePage(wnd);
  
+    if (is_active_in_split)
+    {
+        int ctrl_new_page_count = (int)ctrl->GetPageCount();
  
  
-    RemoveEmptyTabFrames();
+        if (ctrl_idx >= ctrl_new_page_count)
+            ctrl_idx = ctrl_new_page_count-1;
  
  
-    // set new active pane
-    if (new_active)
+        if (ctrl_idx >= 0 && ctrl_idx < (int)ctrl->GetPageCount())
+        {
+            // set new page as active in the tab split
+            ctrl->SetActivePage(ctrl_idx);
+
+            // if the page deleted was the current page for the
+            // entire tab control, then record the window
+            // pointer of the new active page for activation
+            if (is_curpage)
+            {
+                new_active = ctrl->GetWindowFromIdx(ctrl_idx);
+            }
+        }
+    }
+    else
      {
      {
-        m_curpage = -1;
-        SetSelection(m_tabs.GetIdxFromWindow(new_active));
+        // we are not deleting the active page, so keep it the same
+        new_active = active_wnd;
+    }
+
+
+    if (!new_active)
+    {
+        // we haven't yet found a new page to active,
+        // so select the next page from the main tab
+        // catalogue
+
+        if (page_idx < m_tabs.GetPageCount())
+        {
+            new_active = m_tabs.GetPage(page_idx).window;
+        }
+
+        if (!new_active && m_tabs.GetPageCount() > 0)
+        {
+            new_active = m_tabs.GetPage(0).window;
+        }
      }
  
      }
  
+
+    RemoveEmptyTabFrames();
+
+    m_curpage = wxNOT_FOUND;
+
+    // set new active pane unless we're being destroyed anyhow
+    if (new_active && !m_isBeingDeleted)
+        SetSelectionToWindow(new_active);
+
      return true;
  }
  
      return true;
  }
  
@@ -2761,6 +3345,16 @@ bool wxAuiNotebook::SetPageText(size_t page_idx, const wxString& text)
      return true;
  }
  
      return true;
  }
  
+// returns the page caption
+wxString wxAuiNotebook::GetPageText(size_t page_idx) const
+{
+    if (page_idx >= m_tabs.GetPageCount())
+        return wxEmptyString;
+
+    // update our own tab catalog
+    const wxAuiNotebookPage& page_info = m_tabs.GetPage(page_idx);
+    return page_info.caption;
+}
  
  bool wxAuiNotebook::SetPageBitmap(size_t page_idx, const wxBitmap& bitmap)
  {
  
  bool wxAuiNotebook::SetPageBitmap(size_t page_idx, const wxBitmap& bitmap)
  {
@@ -2788,6 +3382,16 @@ bool wxAuiNotebook::SetPageBitmap(size_t page_idx, const wxBitmap& bitmap)
      return true;
  }
  
      return true;
  }
  
+// returns the page bitmap
+wxBitmap wxAuiNotebook::GetPageBitmap(size_t page_idx) const
+{
+    if (page_idx >= m_tabs.GetPageCount())
+        return wxBitmap();
+
+    // update our own tab catalog
+    const wxAuiNotebookPage& page_info = m_tabs.GetPage(page_idx);
+    return page_info.bitmap;
+}
  
  // GetSelection() returns the index of the currently active page
  int wxAuiNotebook::GetSelection() const
  
  // GetSelection() returns the index of the currently active page
  int wxAuiNotebook::GetSelection() const
@@ -2802,6 +3406,20 @@ size_t wxAuiNotebook::SetSelection(size_t new_page)
      if (!wnd)
          return m_curpage;
  
      if (!wnd)
          return m_curpage;
  
+    // don't change the page unless necessary;
+    // however, clicking again on a tab should give it the focus.
+    if ((int)new_page == m_curpage)
+    {
+        wxAuiTabCtrl* ctrl;
+        int ctrl_idx;
+        if (FindTab(wnd, &ctrl, &ctrl_idx))
+        {
+            if (FindFocus() != ctrl)
+                ctrl->SetFocus();
+        }
+        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);
@@ -2826,7 +3444,7 @@ size_t wxAuiNotebook::SetSelection(size_t new_page)
              DoSizing();
              ctrl->DoShowHide();
  
              DoSizing();
              ctrl->DoShowHide();
  
-
+            ctrl->MakeTabVisible(ctrl_idx, ctrl);
  
              // set fonts
              wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes();
  
              // set fonts
              wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes();
@@ -2839,12 +3457,15 @@ size_t wxAuiNotebook::SetSelection(size_t new_page)
                  wxAuiTabCtrl* tabctrl = ((wxTabFrame*)pane.window)->m_tabs;
                  if (tabctrl != ctrl)
                      tabctrl->SetSelectedFont(m_normal_font);
                  wxAuiTabCtrl* tabctrl = ((wxTabFrame*)pane.window)->m_tabs;
                  if (tabctrl != ctrl)
                      tabctrl->SetSelectedFont(m_normal_font);
-                     else
+                else
                      tabctrl->SetSelectedFont(m_selected_font);
                  tabctrl->Refresh();
              }
  
                      tabctrl->SetSelectedFont(m_selected_font);
                  tabctrl->Refresh();
              }
  
-            wnd->SetFocus();
+            // Set the focus to the page if we're not currently focused on the tab.
+            // This is Firefox-like behaviour.
+            if (wnd->IsShownOnScreen() && FindFocus() != ctrl)
+                wnd->SetFocus();
  
              return old_curpage;
          }
  
              return old_curpage;
          }
@@ -2853,6 +3474,29 @@ size_t wxAuiNotebook::SetSelection(size_t new_page)
      return m_curpage;
  }
  
      return m_curpage;
  }
  
+void wxAuiNotebook::SetSelectionToWindow(wxWindow *win)
+{
+    const int idx = m_tabs.GetIdxFromWindow(win);
+    wxCHECK_RET( idx != wxNOT_FOUND, wxT("invalid notebook page") );
+
+
+    // since a tab was clicked, let the parent know that we received
+    // the focus, even if we will assign that focus immediately
+    // to the child tab in the SetSelection call below
+    // (the child focus event will also let wxAuiManager, if any,
+    // know that the notebook control has been activated)
+
+    wxWindow* parent = GetParent();
+    if (parent)
+    {
+        wxChildFocusEvent eventFocus(this);
+        parent->GetEventHandler()->ProcessEvent(eventFocus);
+    }
+
+
+    SetSelection(idx);
+}
+
  // GetPageCount() returns the total number of
  // pages managed by the multi-notebook
  size_t wxAuiNotebook::GetPageCount() const
  // GetPageCount() returns the total number of
  // pages managed by the multi-notebook
  size_t wxAuiNotebook::GetPageCount() const
@@ -2920,7 +3564,7 @@ wxAuiTabCtrl* wxAuiNotebook::GetActiveTabCtrl()
                                          m_tab_id_counter++,
                                          wxDefaultPosition,
                                          wxDefaultSize,
                                          m_tab_id_counter++,
                                          wxDefaultPosition,
                                          wxDefaultSize,
-                                        wxNO_BORDER);
+                                        wxNO_BORDER|wxWANTS_CHARS);
      tabframe->m_tabs->SetFlags(m_flags);
      tabframe->m_tabs->SetArtProvider(m_tabs.GetArtProvider()->Clone());
      m_mgr.AddPane(tabframe,
      tabframe->m_tabs->SetFlags(m_flags);
      tabframe->m_tabs->SetArtProvider(m_tabs.GetArtProvider()->Clone());
      m_mgr.AddPane(tabframe,
@@ -2957,35 +3601,152 @@ bool wxAuiNotebook::FindTab(wxWindow* page, wxAuiTabCtrl** ctrl, int* idx)
      return false;
  }
  
      return false;
  }
  
+void wxAuiNotebook::Split(size_t page, int direction)
+{
+    wxSize cli_size = GetClientSize();
+
+    // get the page's window pointer
+    wxWindow* wnd = GetPage(page);
+    if (!wnd)
+        return;
+
+    // notebooks with 1 or less pages can't be split
+    if (GetPageCount() < 2)
+        return;
+
+    // find out which tab control the page currently belongs to
+    wxAuiTabCtrl *src_tabs, *dest_tabs;
+    int src_idx = -1;
+    src_tabs = NULL;
+    if (!FindTab(wnd, &src_tabs, &src_idx))
+        return;
+    if (!src_tabs || src_idx == -1)
+        return;
+
+    // choose a split size
+    wxSize split_size;
+    if (GetPageCount() > 2)
+    {
+        split_size = CalculateNewSplitSize();
+    }
+    else
+    {
+        // because there are two panes, always split them
+        // equally
+        split_size = GetClientSize();
+        split_size.x /= 2;
+        split_size.y /= 2;
+    }
+
+
+    // create a new tab frame
+    wxTabFrame* new_tabs = new wxTabFrame;
+    new_tabs->m_rect = wxRect(wxPoint(0,0), split_size);
+    new_tabs->SetTabCtrlHeight(m_tab_ctrl_height);
+    new_tabs->m_tabs = new wxAuiTabCtrl(this,
+                                        m_tab_id_counter++,
+                                        wxDefaultPosition,
+                                        wxDefaultSize,
+                                        wxNO_BORDER|wxWANTS_CHARS);
+    new_tabs->m_tabs->SetArtProvider(m_tabs.GetArtProvider()->Clone());
+    new_tabs->m_tabs->SetFlags(m_flags);
+    dest_tabs = new_tabs->m_tabs;
+
+    // create a pane info structure with the information
+    // about where the pane should be added
+    wxAuiPaneInfo pane_info = wxAuiPaneInfo().Bottom().CaptionVisible(false);
+    wxPoint mouse_pt;
+
+    if (direction == wxLEFT)
+    {
+        pane_info.Left();
+        mouse_pt = wxPoint(0, cli_size.y/2);
+    }
+    else if (direction == wxRIGHT)
+    {
+        pane_info.Right();
+        mouse_pt = wxPoint(cli_size.x, cli_size.y/2);
+    }
+    else if (direction == wxTOP)
+    {
+        pane_info.Top();
+        mouse_pt = wxPoint(cli_size.x/2, 0);
+    }
+    else if (direction == wxBOTTOM)
+    {
+        pane_info.Bottom();
+        mouse_pt = wxPoint(cli_size.x/2, cli_size.y);
+    }
+
+    m_mgr.AddPane(new_tabs, pane_info, mouse_pt);
+    m_mgr.Update();
+
+    // remove the page from the source tabs
+    wxAuiNotebookPage page_info = src_tabs->GetPage(src_idx);
+    page_info.active = false;
+    src_tabs->RemovePage(page_info.window);
+    if (src_tabs->GetPageCount() > 0)
+    {
+        src_tabs->SetActivePage((size_t)0);
+        src_tabs->DoShowHide();
+        src_tabs->Refresh();
+    }
+
+
+    // add the page to the destination tabs
+    dest_tabs->InsertPage(page_info.window, page_info, 0);
+
+    if (src_tabs->GetPageCount() == 0)
+    {
+        RemoveEmptyTabFrames();
+    }
+
+    DoSizing();
+    dest_tabs->DoShowHide();
+    dest_tabs->Refresh();
+
+    // force the set selection function reset the selection
+    m_curpage = -1;
+
+    // set the active page to the one we just split off
+    SetSelectionToPage(page_info);
+
+    UpdateHintWindowSize();
+}
+
+
  void wxAuiNotebook::OnSize(wxSizeEvent& evt)
  {
      UpdateHintWindowSize();
  void wxAuiNotebook::OnSize(wxSizeEvent& evt)
  {
      UpdateHintWindowSize();
-    
+
      evt.Skip();
  }
  
      evt.Skip();
  }
  
-void wxAuiNotebook::OnTabClicked(wxCommandEvent& command_evt)
+void wxAuiNotebook::OnTabClicked(wxAuiNotebookEvent& evt)
  {
  {
-    wxAuiNotebookEvent& evt = (wxAuiNotebookEvent&)command_evt;
-
      wxAuiTabCtrl* ctrl = (wxAuiTabCtrl*)evt.GetEventObject();
      wxASSERT(ctrl != NULL);
  
      wxWindow* wnd = ctrl->GetWindowFromIdx(evt.GetSelection());
      wxASSERT(wnd != NULL);
  
      wxAuiTabCtrl* ctrl = (wxAuiTabCtrl*)evt.GetEventObject();
      wxASSERT(ctrl != NULL);
  
      wxWindow* wnd = ctrl->GetWindowFromIdx(evt.GetSelection());
      wxASSERT(wnd != NULL);
  
-    int idx = m_tabs.GetIdxFromWindow(wnd);
-    wxASSERT(idx != -1);
+    SetSelectionToWindow(wnd);
+}
  
  
-    SetSelection(idx);
+void wxAuiNotebook::OnTabBgDClick(wxAuiNotebookEvent& WXUNUSED(evt))
+{
+    // notify owner that the tabbar background has been double-clicked
+    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, m_windowId);
+    e.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(e);
  }
  
  }
  
-void wxAuiNotebook::OnTabBeginDrag(wxCommandEvent&)
+void wxAuiNotebook::OnTabBeginDrag(wxAuiNotebookEvent&)
  {
      m_last_drag_x = 0;
  }
  
  {
      m_last_drag_x = 0;
  }
  
-void wxAuiNotebook::OnTabDragMotion(wxCommandEvent& evt)
+void wxAuiNotebook::OnTabDragMotion(wxAuiNotebookEvent& evt)
  {
      wxPoint screen_pt = ::wxGetMousePosition();
      wxPoint client_pt = ScreenToClient(screen_pt);
  {
      wxPoint screen_pt = ::wxGetMousePosition();
      wxPoint client_pt = ScreenToClient(screen_pt);
@@ -3075,7 +3836,7 @@ void wxAuiNotebook::OnTabDragMotion(wxCommandEvent& evt)
                  }
              }
          }
                  }
              }
          }
-         else
+        else
          {
              if (!dest_tabs)
              {
          {
              if (!dest_tabs)
              {
@@ -3108,7 +3869,7 @@ void wxAuiNotebook::OnTabDragMotion(wxCommandEvent& evt)
          ClientToScreen(&hint_rect.x, &hint_rect.y);
          m_mgr.ShowHint(hint_rect);
      }
          ClientToScreen(&hint_rect.x, &hint_rect.y);
          m_mgr.ShowHint(hint_rect);
      }
-     else
+    else
      {
          m_mgr.DrawHintRect(m_dummy_wnd, client_pt, zero);
      }
      {
          m_mgr.DrawHintRect(m_dummy_wnd, client_pt, zero);
      }
@@ -3116,20 +3877,15 @@ void wxAuiNotebook::OnTabDragMotion(wxCommandEvent& evt)
  
  
  
  
  
  
-void wxAuiNotebook::OnTabEndDrag(wxCommandEvent& command_evt)
+void wxAuiNotebook::OnTabEndDrag(wxAuiNotebookEvent& evt)
  {
  {
-    wxAuiNotebookEvent& evt = (wxAuiNotebookEvent&)command_evt;
-
      m_mgr.HideHint();
  
  
      wxAuiTabCtrl* src_tabs = (wxAuiTabCtrl*)evt.GetEventObject();
      m_mgr.HideHint();
  
  
      wxAuiTabCtrl* src_tabs = (wxAuiTabCtrl*)evt.GetEventObject();
-    wxAuiTabCtrl* dest_tabs = NULL;
-    if (src_tabs)
-    {
-        // set cursor back to an arrow
-        src_tabs->SetCursor(wxCursor(wxCURSOR_ARROW));
-    }
+    wxCHECK_RET( src_tabs, wxT("no source object?") );
+
+    src_tabs->SetCursor(wxCursor(wxCURSOR_ARROW));
  
      // 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();
@@ -3177,11 +3933,24 @@ void wxAuiNotebook::OnTabEndDrag(wxCommandEvent& command_evt)
                  int src_idx = evt.GetSelection();
                  wxWindow* src_page = src_tabs->GetWindowFromIdx(src_idx);
  
                  int src_idx = evt.GetSelection();
                  wxWindow* src_page = src_tabs->GetWindowFromIdx(src_idx);
  
+                // Check that it's not an impossible parent relationship
+                wxWindow* p = nb;
+                while (p && !p->IsTopLevel())
+                {
+                    if (p == src_page)
+                    {
+                        return;
+                    }
+                    p = p->GetParent();
+                }
+
                  // get main index of the page
                  int main_idx = m_tabs.GetIdxFromWindow(src_page);
                  // get main index of the page
                  int main_idx = m_tabs.GetIdxFromWindow(src_page);
+                wxCHECK_RET( main_idx != wxNOT_FOUND, wxT("no source page?") );
+
  
                  // make a copy of the page info
  
                  // make a copy of the page info
-                wxAuiNotebookPage page_info = m_tabs.GetPage((size_t)main_idx);
+                wxAuiNotebookPage page_info = m_tabs.GetPage(main_idx);
  
                  // remove the page from the source notebook
                  RemovePage(main_idx);
  
                  // remove the page from the source notebook
                  RemovePage(main_idx);
@@ -3214,7 +3983,14 @@ void wxAuiNotebook::OnTabEndDrag(wxCommandEvent& command_evt)
                  dest_tabs->Refresh();
  
                  // set the selection in the destination tab control
                  dest_tabs->Refresh();
  
                  // set the selection in the destination tab control
-                nb->SetSelection(nb->m_tabs.GetIdxFromWindow(page_info.window));
+                nb->SetSelectionToPage(page_info);
+
+                // notify owner that the tab has been dragged
+                wxAuiNotebookEvent e2(wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, m_windowId);
+                e2.SetSelection(evt.GetSelection());
+                e2.SetOldSelection(evt.GetSelection());
+                e2.SetEventObject(this);
+                GetEventHandler()->ProcessEvent(e2);
  
                  return;
              }
  
                  return;
              }
@@ -3225,6 +4001,8 @@ void wxAuiNotebook::OnTabEndDrag(wxCommandEvent& command_evt)
  
  
      // only perform a tab split if it's allowed
  
  
      // only perform a tab split if it's allowed
+    wxAuiTabCtrl* dest_tabs = NULL;
+
      if ((m_flags & wxAUI_NB_TAB_SPLIT) && m_tabs.GetPageCount() >= 2)
      {
          // If the pointer is in an existing tab frame, do a tab insert
      if ((m_flags & wxAUI_NB_TAB_SPLIT) && m_tabs.GetPageCount() >= 2)
      {
          // If the pointer is in an existing tab frame, do a tab insert
@@ -3247,7 +4025,7 @@ void wxAuiNotebook::OnTabEndDrag(wxCommandEvent& command_evt)
                  insert_idx = dest_tabs->GetIdxFromWindow(target);
              }
          }
                  insert_idx = dest_tabs->GetIdxFromWindow(target);
              }
          }
-         else
+        else
          {
              wxPoint zero(0,0);
              wxRect rect = m_mgr.CalculateHintRect(m_dummy_wnd,
          {
              wxPoint zero(0,0);
              wxRect rect = m_mgr.CalculateHintRect(m_dummy_wnd,
@@ -3267,7 +4045,7 @@ void wxAuiNotebook::OnTabEndDrag(wxCommandEvent& command_evt)
                                                  m_tab_id_counter++,
                                                  wxDefaultPosition,
                                                  wxDefaultSize,
                                                  m_tab_id_counter++,
                                                  wxDefaultPosition,
                                                  wxDefaultSize,
-                                                wxNO_BORDER);
+                                                wxNO_BORDER|wxWANTS_CHARS);
              new_tabs->m_tabs->SetArtProvider(m_tabs.GetArtProvider()->Clone());
              new_tabs->m_tabs->SetFlags(m_flags);
  
              new_tabs->m_tabs->SetArtProvider(m_tabs.GetArtProvider()->Clone());
              new_tabs->m_tabs->SetFlags(m_flags);
  
@@ -3307,14 +4085,37 @@ void wxAuiNotebook::OnTabEndDrag(wxCommandEvent& command_evt)
          dest_tabs->DoShowHide();
          dest_tabs->Refresh();
  
          dest_tabs->DoShowHide();
          dest_tabs->Refresh();
  
-        SetSelection(m_tabs.GetIdxFromWindow(page_info.window));
-        
+        // force the set selection function reset the selection
+        m_curpage = -1;
+
+        // set the active page to the one we just split off
+        SetSelectionToPage(page_info);
+
          UpdateHintWindowSize();
      }
          UpdateHintWindowSize();
      }
+
+    // notify owner that the tab has been dragged
+    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, m_windowId);
+    e.SetSelection(evt.GetSelection());
+    e.SetOldSelection(evt.GetSelection());
+    e.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(e);
  }
  
  
  
  }
  
  
  
+void wxAuiNotebook::OnTabCancelDrag(wxAuiNotebookEvent& command_evt)
+{
+    wxAuiNotebookEvent& evt = (wxAuiNotebookEvent&)command_evt;
+
+    m_mgr.HideHint();
+
+    wxAuiTabCtrl* src_tabs = (wxAuiTabCtrl*)evt.GetEventObject();
+    wxCHECK_RET( src_tabs, _T("no source object?") );
+
+    src_tabs->SetCursor(wxCursor(wxCURSOR_ARROW));
+}
+
  wxAuiTabCtrl* wxAuiNotebook::GetTabCtrlFromPoint(const wxPoint& pt)
  {
      // if we've just removed the last tab from the source
  wxAuiTabCtrl* wxAuiNotebook::GetTabCtrlFromPoint(const wxPoint& pt)
  {
      // if we've just removed the last tab from the source
@@ -3375,7 +4176,8 @@ void wxAuiNotebook::RemoveEmptyTabFrames()
              // window closing, refreshs are pending
              if (!wxPendingDelete.Member(tab_frame->m_tabs))
                  wxPendingDelete.Append(tab_frame->m_tabs);
              // window closing, refreshs are pending
              if (!wxPendingDelete.Member(tab_frame->m_tabs))
                  wxPendingDelete.Append(tab_frame->m_tabs);
-            //tab_frame->m_tabs->Destroy();
+
+            tab_frame->m_tabs = NULL;
  
              delete tab_frame;
          }
  
              delete tab_frame;
          }
@@ -3403,11 +4205,35 @@ void wxAuiNotebook::RemoveEmptyTabFrames()
          m_mgr.GetPane(first_good).Centre();
      }
  
          m_mgr.GetPane(first_good).Centre();
      }
  
-    m_mgr.Update();
+    if (!m_isBeingDeleted)
+        m_mgr.Update();
  }
  
  }
  
-void wxAuiNotebook::OnChildFocus(wxChildFocusEvent& evt)
+void wxAuiNotebook::OnChildFocusNotebook(wxChildFocusEvent& evt)
  {
  {
+    evt.Skip();
+
+    // if we're dragging a tab, don't change the current selection.
+    // This code prevents a bug that used to happen when the hint window
+    // was hidden.  In the bug, the focus would return to the notebook
+    // child, which would then enter this handler and call
+    // SetSelection, which is not desired turn tab dragging.
+
+    wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes();
+    size_t i, pane_count = all_panes.GetCount();
+    for (i = 0; i < pane_count; ++i)
+    {
+        wxAuiPaneInfo& pane = all_panes.Item(i);
+        if (pane.name == wxT("dummy"))
+            continue;
+        wxTabFrame* tabframe = (wxTabFrame*)pane.window;
+        if (tabframe->m_tabs->IsDragging())
+            return;
+    }
+
+
+    // change the tab selection to the child
+    // which was focused
      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)
      {
@@ -3415,26 +4241,107 @@ void wxAuiNotebook::OnChildFocus(wxChildFocusEvent& evt)
      }
  }
  
      }
  }
  
+void wxAuiNotebook::OnNavigationKeyNotebook(wxNavigationKeyEvent& event)
+{
+    if ( event.IsWindowChange() ) {
+        // change pages
+        // FIXME: the problem with this is that if we have a split notebook,
+        // we selection may go all over the place.
+        AdvanceSelection(event.GetDirection());
+    }
+    else {
+        // we get this event in 3 cases
+        //
+        // a) one of our pages might have generated it because the user TABbed
+        // out from it in which case we should propagate the event upwards and
+        // our parent will take care of setting the focus to prev/next sibling
+        //
+        // or
+        //
+        // b) the parent panel wants to give the focus to us so that we
+        // forward it to our selected page. We can't deal with this in
+        // OnSetFocus() because we don't know which direction the focus came
+        // from in this case and so can't choose between setting the focus to
+        // first or last panel child
+        //
+        // or
+        //
+        // c) we ourselves (see MSWTranslateMessage) generated the event
+        //
+        wxWindow * const parent = GetParent();
+
+        // the wxObject* casts are required to avoid MinGW GCC 2.95.3 ICE
+        const bool isFromParent = event.GetEventObject() == (wxObject*) parent;
+        const bool isFromSelf = event.GetEventObject() == (wxObject*) this;
+
+        if ( isFromParent || isFromSelf )
+        {
+            // no, it doesn't come from child, case (b) or (c): forward to a
+            // page but only if direction is backwards (TAB) or from ourselves,
+            if ( GetSelection() != wxNOT_FOUND &&
+                    (!event.GetDirection() || isFromSelf) )
+            {
+                // so that the page knows that the event comes from it's parent
+                // and is being propagated downwards
+                event.SetEventObject(this);
  
  
-void wxAuiNotebook::OnTabButton(wxCommandEvent& command_evt)
+                wxWindow *page = GetPage(GetSelection());
+                if ( !page->GetEventHandler()->ProcessEvent(event) )
+                {
+                    page->SetFocus();
+                }
+                //else: page manages focus inside it itself
+            }
+            else // otherwise set the focus to the notebook itself
+            {
+                SetFocus();
+            }
+        }
+        else
+        {
+            // it comes from our child, case (a), pass to the parent, but only
+            // if the direction is forwards. Otherwise set the focus to the
+            // notebook itself. The notebook is always the 'first' control of a
+            // page.
+            if ( !event.GetDirection() )
+            {
+                SetFocus();
+            }
+            else if ( parent )
+            {
+                event.SetCurrentFocus(this);
+                parent->GetEventHandler()->ProcessEvent(event);
+            }
+        }
+    }
+}
+
+void wxAuiNotebook::OnTabButton(wxAuiNotebookEvent& evt)
  {
  {
-    wxAuiNotebookEvent& evt = (wxAuiNotebookEvent&)command_evt;
      wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject();
  
      int button_id = evt.GetInt();
  
      if (button_id == wxAUI_BUTTON_CLOSE)
      {
      wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject();
  
      int button_id = evt.GetInt();
  
      if (button_id == wxAUI_BUTTON_CLOSE)
      {
-        int selection = tabs->GetActivePage();
+        int selection = evt.GetSelection();
+
+        if (selection == -1)
+        {
+            // if the close button is to the right, use the active
+            // page selection to determine which page to close
+            selection = tabs->GetActivePage();
+        }
  
          if (selection != -1)
          {
              wxWindow* close_wnd = tabs->GetWindowFromIdx(selection);
  
  
          if (selection != -1)
          {
              wxWindow* close_wnd = tabs->GetWindowFromIdx(selection);
  
-
              // ask owner if it's ok to close the tab
              wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, m_windowId);
              e.SetSelection(m_tabs.GetIdxFromWindow(close_wnd));
              // ask owner if it's ok to close the tab
              wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, m_windowId);
              e.SetSelection(m_tabs.GetIdxFromWindow(close_wnd));
+            const int idx = m_tabs.GetIdxFromWindow(close_wnd);
+            e.SetSelection(idx);
              e.SetOldSelection(evt.GetSelection());
              e.SetEventObject(this);
              GetEventHandler()->ProcessEvent(e);
              e.SetOldSelection(evt.GetSelection());
              e.SetEventObject(this);
              GetEventHandler()->ProcessEvent(e);
@@ -3442,20 +4349,199 @@ void wxAuiNotebook::OnTabButton(wxCommandEvent& command_evt)
                  return;
  
  
                  return;
  
  
+#if wxUSE_MDI
              if (close_wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
              {
                  close_wnd->Close();
              }
              if (close_wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
              {
                  close_wnd->Close();
              }
-             else
+            else
+#endif
              {
                  int main_idx = m_tabs.GetIdxFromWindow(close_wnd);
              {
                  int main_idx = m_tabs.GetIdxFromWindow(close_wnd);
+                wxCHECK_RET( main_idx != wxNOT_FOUND, wxT("no page to delete?") );
+
                  DeletePage(main_idx);
              }
                  DeletePage(main_idx);
              }
+
+            // notify owner that the tab has been closed
+            wxAuiNotebookEvent e2(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, m_windowId);
+            e2.SetSelection(idx);
+            e2.SetEventObject(this);
+            GetEventHandler()->ProcessEvent(e2);
          }
      }
  }
  
  
          }
      }
  }
  
  
+void wxAuiNotebook::OnTabMiddleDown(wxAuiNotebookEvent& evt)
+{
+    // patch event through to owner
+    wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject();
+    wxWindow* wnd = tabs->GetWindowFromIdx(evt.GetSelection());
+
+    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, m_windowId);
+    e.SetSelection(m_tabs.GetIdxFromWindow(wnd));
+    e.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(e);
+}
+
+void wxAuiNotebook::OnTabMiddleUp(wxAuiNotebookEvent& evt)
+{
+    // if the wxAUI_NB_MIDDLE_CLICK_CLOSE is specified, middle
+    // click should act like a tab close action.  However, first
+    // give the owner an opportunity to handle the middle up event
+    // for custom action
+
+    wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject();
+    wxWindow* wnd = tabs->GetWindowFromIdx(evt.GetSelection());
+
+    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, m_windowId);
+    e.SetSelection(m_tabs.GetIdxFromWindow(wnd));
+    e.SetEventObject(this);
+    if (GetEventHandler()->ProcessEvent(e))
+        return;
+    if (!e.IsAllowed())
+        return;
+
+    // check if we are supposed to close on middle-up
+    if ((m_flags & wxAUI_NB_MIDDLE_CLICK_CLOSE) == 0)
+        return;
+
+    // simulate the user pressing the close button on the tab
+    evt.SetInt(wxAUI_BUTTON_CLOSE);
+    OnTabButton(evt);
+}
+
+void wxAuiNotebook::OnTabRightDown(wxAuiNotebookEvent& evt)
+{
+    // patch event through to owner
+    wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject();
+    wxWindow* wnd = tabs->GetWindowFromIdx(evt.GetSelection());
+
+    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, m_windowId);
+    e.SetSelection(m_tabs.GetIdxFromWindow(wnd));
+    e.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(e);
+}
+
+void wxAuiNotebook::OnTabRightUp(wxAuiNotebookEvent& evt)
+{
+    // patch event through to owner
+    wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject();
+    wxWindow* wnd = tabs->GetWindowFromIdx(evt.GetSelection());
+
+    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, m_windowId);
+    e.SetSelection(m_tabs.GetIdxFromWindow(wnd));
+    e.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(e);
+}
+
+// Sets the normal font
+void wxAuiNotebook::SetNormalFont(const wxFont& font)
+{
+    m_normal_font = font;
+    GetArtProvider()->SetNormalFont(font);
+}
+
+// Sets the selected tab font
+void wxAuiNotebook::SetSelectedFont(const wxFont& font)
+{
+    m_selected_font = font;
+    GetArtProvider()->SetSelectedFont(font);
+}
+
+// Sets the measuring font
+void wxAuiNotebook::SetMeasuringFont(const wxFont& font)
+{
+    GetArtProvider()->SetMeasuringFont(font);
+}
+
+// Sets the tab font
+bool wxAuiNotebook::SetFont(const wxFont& font)
+{
+    wxControl::SetFont(font);
+
+    wxFont normalFont(font);
+    wxFont selectedFont(normalFont);
+    selectedFont.SetWeight(wxBOLD);
+
+    SetNormalFont(normalFont);
+    SetSelectedFont(selectedFont);
+    SetMeasuringFont(selectedFont);
+
+    return true;
+}
+
+// Gets the tab control height
+int wxAuiNotebook::GetTabCtrlHeight() const
+{
+    return m_tab_ctrl_height;
+}
+
+// Gets the height of the notebook for a given page height
+int wxAuiNotebook::GetHeightForPageHeight(int pageHeight)
+{
+    UpdateTabCtrlHeight();
+
+    int tabCtrlHeight = GetTabCtrlHeight();
+    int decorHeight = 2;
+    return tabCtrlHeight + pageHeight + decorHeight;
+}
+
+// Advances the selection, generation page selection events
+void wxAuiNotebook::AdvanceSelection(bool forward)
+{
+    if (GetPageCount() <= 1)
+        return;
+
+    int currentSelection = GetSelection();
+
+    if (forward)
+    {
+        if (currentSelection == (int) (GetPageCount() - 1))
+            return;
+        else if (currentSelection == -1)
+            currentSelection = 0;
+        else
+            currentSelection ++;
+    }
+    else
+    {
+        if (currentSelection <= 0)
+            return;
+        else
+            currentSelection --;
+    }
+
+    SetSelection(currentSelection);
+}
+
+// Shows the window menu
+bool wxAuiNotebook::ShowWindowMenu()
+{
+    wxAuiTabCtrl* tabCtrl = GetActiveTabCtrl();
+
+    int idx = tabCtrl->GetArtProvider()->ShowDropDown(tabCtrl, tabCtrl->GetPages(), tabCtrl->GetActivePage());
  
  
+    if (idx != -1)
+    {
+        wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, tabCtrl->GetId());
+        e.SetSelection(idx);
+        e.SetOldSelection(tabCtrl->GetActivePage());
+        e.SetEventObject(tabCtrl);
+        GetEventHandler()->ProcessEvent(e);
+
+        return true;
+    }
+    else
+        return false;
+}
+
+void wxAuiNotebook::Thaw()
+{
+    DoSizing();
+
+    wxControl::Thaw();
+}
  
  #endif // wxUSE_AUI
  
  #endif // wxUSE_AUI