[ 1602455 ] [docs] Fix docs for event used by pickers & collapsiblepane

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

diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index c7d18b61d2e2fc2ecda7ded3f6df524ceaa87928..4ecd4c1617fee3c2cc2ef78e6cbff012bca0bd57 100644 (file)
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -299,10 +299,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,


@@ -313,8 +311,8 @@ void wxAuiDefaultTabArt::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);


@@ -326,9 +324,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,12 +336,12 @@ 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);
         textx = selected_textx;
     {
         dc.SetFont(m_selected_font);
         textx = selected_textx;


@@ -397,7 +395,7 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
     int drawn_tab_height = border_points[0].y - 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 active tab
 


@@ -465,7 +463,7 @@ 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);
     {
         wxColor start_color = m_base_colour;
         dc.SetPen(m_base_colour_pen);


@@ -484,17 +482,17 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
     }
 
 
     }
 
 

-    if (bitmap.IsOk())
+    if (page.bitmap.IsOk())

     {
         int bitmap_offset = tab_x + 8;
 
         // draw bitmap
     {
         int bitmap_offset = tab_x + 8;
 
         // 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
     }
      else
         text_offset += 3; // bitmap padding
     }
      else


@@ -598,47 +596,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;
 


@@ -665,16 +656,17 @@ void wxAuiDefaultTabArt::DrawButton(wxDC& dc,
 }
 
 
 }
 
 

-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));
+        const wxAuiNotebookPage& page = pages.Item(i);
+        menuPopup.AppendCheckItem(1000+i, page.caption);

     }
 
     if (active_idx != -1)
     }
 
     if (active_idx != -1)


@@ -703,7 +695,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);


@@ -874,10 +866,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 +878,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 +891,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 +902,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);


@@ -993,7 +983,7 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc,
     if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
     {
         wxBitmap bmp;
     if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
     {
         wxBitmap bmp;

-        if (active)
+        if (page.active)

             bmp = m_active_close_bmp;
              else
             bmp = m_disabled_close_bmp;
             bmp = m_active_close_bmp;
              else
             bmp = m_disabled_close_bmp;


@@ -1054,45 +1044,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())
+    switch (bitmap_id)

     {
     {

-        bmp = bitmap_override;
-    }
-     else
-    {
-        switch (bitmap_id)
-        {
-            case wxAUI_BUTTON_CLOSE:
-                if (button_state & wxAUI_BUTTON_STATE_DISABLED)
-                    bmp = m_disabled_close_bmp;
-                     else
-                    bmp = m_active_close_bmp;
-                break;
-            case wxAUI_BUTTON_LEFT:
-                if (button_state & wxAUI_BUTTON_STATE_DISABLED)
-                    bmp = m_disabled_left_bmp;
-                     else
-                    bmp = m_active_left_bmp;
-                break;
-            case wxAUI_BUTTON_RIGHT:
-                if (button_state & wxAUI_BUTTON_STATE_DISABLED)
-                    bmp = m_disabled_right_bmp;
-                     else
-                    bmp = m_active_right_bmp;
-                break;
-            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())


@@ -1121,16 +1103,17 @@ void wxAuiSimpleTabArt::DrawButton(wxDC& dc,
 }
 
 
 }
 
 

-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)


@@ -1165,7 +1148,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);


@@ -1667,7 +1650,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 +1679,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();


@@ -1775,10 +1756,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,


@@ -1820,10 +1799,8 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
         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,


@@ -2028,7 +2005,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);


@@ -2200,16 +2181,7 @@ void wxAuiTabCtrl::OnButton(wxAuiNotebookEvent& event)
     }
      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)
         {


@@ -2316,7 +2288,7 @@ public:
 };
 
 
 };
 
 

-
+const int wxAuiBaseTabCtrlId = 5380;

 
 
 // -- wxAuiNotebook class implementation --
 
 
 // -- wxAuiNotebook class implementation --


@@ -2324,19 +2296,19 @@ public:
 BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl)
     EVT_SIZE(wxAuiNotebook::OnSize)
     EVT_CHILD_FOCUS(wxAuiNotebook::OnChildFocus)
 BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl)
     EVT_SIZE(wxAuiNotebook::OnSize)
     EVT_CHILD_FOCUS(wxAuiNotebook::OnChildFocus)

-    EVT_COMMAND_RANGE(10000, 10100,
+    EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,

                       wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING,
                       wxAuiNotebook::OnTabClicked)
                       wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING,
                       wxAuiNotebook::OnTabClicked)

-    EVT_COMMAND_RANGE(10000, 10100,
+    EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,

                       wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG,
                       wxAuiNotebook::OnTabBeginDrag)
                       wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG,
                       wxAuiNotebook::OnTabBeginDrag)

-    EVT_COMMAND_RANGE(10000, 10100,
+    EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,

                       wxEVT_COMMAND_AUINOTEBOOK_END_DRAG,
                       wxAuiNotebook::OnTabEndDrag)
                       wxEVT_COMMAND_AUINOTEBOOK_END_DRAG,
                       wxAuiNotebook::OnTabEndDrag)

-    EVT_COMMAND_RANGE(10000, 10100,
+    EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,

                       wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION,
                       wxAuiNotebook::OnTabDragMotion)
                       wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION,
                       wxAuiNotebook::OnTabDragMotion)

-    EVT_COMMAND_RANGE(10000, 10100,
+    EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,

                       wxEVT_COMMAND_AUINOTEBOOK_BUTTON,
                       wxAuiNotebook::OnTabButton)
 END_EVENT_TABLE()
                       wxEVT_COMMAND_AUINOTEBOOK_BUTTON,
                       wxAuiNotebook::OnTabButton)
 END_EVENT_TABLE()


@@ -2344,7 +2316,7 @@ END_EVENT_TABLE()
 wxAuiNotebook::wxAuiNotebook()
 {
     m_curpage = -1;
 wxAuiNotebook::wxAuiNotebook()
 {
     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_dummy_wnd = NULL;
     m_tab_ctrl_height = 20;
     m_requested_bmp_size = wxDefaultSize;


@@ -2382,7 +2354,7 @@ bool wxAuiNotebook::Create(wxWindow* parent,
 void wxAuiNotebook::InitNotebook(long style)
 {
     m_curpage = -1;
 void wxAuiNotebook::InitNotebook(long style)
 {
     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;


@@ -2398,7 +2370,8 @@ void wxAuiNotebook::InitNotebook(long style)
     m_dummy_wnd->Show(false);
 
     m_mgr.SetManagedWindow(this);
     m_dummy_wnd->Show(false);
 
     m_mgr.SetManagedWindow(this);

-    m_mgr.SetFlags(wxAUI_MGR_DEFAULT | (1 << 28) /*wxAUI_MGR_NO_DOCK_SIZE_LIMIT*/);
+    m_mgr.SetFlags(wxAUI_MGR_DEFAULT);
+    m_mgr.SetDockSizeConstraint(1.0, 1.0); // no dock size constraint

 
     m_mgr.AddPane(m_dummy_wnd,
               wxAuiPaneInfo().Name(wxT("dummy")).Bottom().CaptionVisible(false).Show(false));
 
     m_mgr.AddPane(m_dummy_wnd,
               wxAuiPaneInfo().Name(wxT("dummy")).Bottom().CaptionVisible(false).Show(false));


@@ -2797,6 +2770,10 @@ int wxAuiNotebook::GetSelection() const
 // SetSelection() sets the currently active page
 size_t wxAuiNotebook::SetSelection(size_t new_page)
 {
 // SetSelection() sets the currently active page
 size_t wxAuiNotebook::SetSelection(size_t new_page)
 {

+    // don't change the page unless necessary
+    if (new_page == m_curpage)
+        return m_curpage;
+        

     wxWindow* wnd = m_tabs.GetWindowFromIdx(new_page);
     if (!wnd)
         return m_curpage;
     wxWindow* wnd = m_tabs.GetWindowFromIdx(new_page);
     if (!wnd)
         return m_curpage;


@@ -3306,6 +3283,10 @@ void wxAuiNotebook::OnTabEndDrag(wxCommandEvent& command_evt)
         dest_tabs->DoShowHide();
         dest_tabs->Refresh();
 
         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

         SetSelection(m_tabs.GetIdxFromWindow(page_info.window));
         
         UpdateHintWindowSize();
         SetSelection(m_tabs.GetIdxFromWindow(page_info.window));
         
         UpdateHintWindowSize();