added links to Dir/FileName in construction section (part of patch 1617156)

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

diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index f5c8fd2dff34f8a8825ef7a3842611e27254bb0b..87fcc7845443acea9615757eea0405a23f1fc6a5 100644 (file)
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -25,11 +25,11 @@
 #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"

 
 #ifdef __WXMAC__
 #include "wx/mac/carbon/private.h"
 
 #ifdef __WXMAC__
 #include "wx/mac/carbon/private.h"


@@ -201,7 +201,7 @@ wxAuiDefaultTabArt::wxAuiDefaultTabArt()
     {
         base_colour = wxAuiStepColour(base_colour, 92);
     }
     {
         base_colour = wxAuiStepColour(base_colour, 92);
     }

-    
+

     m_base_colour = base_colour;
     wxColor border_colour = wxAuiStepColour(base_colour, 75);
 
     m_base_colour = base_colour;
     wxColor border_colour = wxAuiStepColour(base_colour, 75);
 


@@ -244,7 +244,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)


@@ -381,7 +381,7 @@ 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);
     wxPoint border_points[6];
     border_points[0] = wxPoint(tab_x,             tab_y+tab_height-4);
     border_points[1] = wxPoint(tab_x,             tab_y+2);


@@ -441,15 +441,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;
         wxColor bottom_color = wxAuiStepColour(top_color, 160);
         dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
         // -- draw top gradient fill for glossy look
         wxColor top_color = m_base_colour;
         wxColor bottom_color = wxAuiStepColour(top_color, 160);
         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;


@@ -660,7 +660,7 @@ int wxAuiDefaultTabArt::ShowDropDown(wxWindow* wnd,
                                      const wxAuiNotebookPageArray& pages,
                                      int active_idx)
 {
                                      const wxAuiNotebookPageArray& pages,
                                      int active_idx)
 {

-       wxMenu menuPopup;
+    wxMenu menuPopup;

 
     size_t i, count = pages.GetCount();
     for (i = 0; i < count; ++i)
 
     size_t i, count = pages.GetCount();
     for (i = 0; i < count; ++i)


@@ -710,7 +710,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();


@@ -736,7 +736,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);
     }
 


@@ -1107,7 +1107,7 @@ int wxAuiSimpleTabArt::ShowDropDown(wxWindow* wnd,
                                     const wxAuiNotebookPageArray& pages,
                                     int active_idx)
 {
                                     const wxAuiNotebookPageArray& pages,
                                     int active_idx)
 {

-       wxMenu menuPopup;
+    wxMenu menuPopup;

 
     size_t i, count = pages.GetCount();
     for (i = 0; i < count; ++i)
 
     size_t i, count = pages.GetCount();
     for (i = 0; i < count; ++i)


@@ -1454,6 +1454,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;


@@ -1950,7 +1957,7 @@ BEGIN_EVENT_TABLE(wxAuiTabCtrl, wxControl)
     EVT_LEFT_UP(wxAuiTabCtrl::OnLeftUp)
     EVT_MOTION(wxAuiTabCtrl::OnMotion)
     EVT_LEAVE_WINDOW(wxAuiTabCtrl::OnLeaveWindow)
     EVT_LEFT_UP(wxAuiTabCtrl::OnLeftUp)
     EVT_MOTION(wxAuiTabCtrl::OnMotion)
     EVT_LEAVE_WINDOW(wxAuiTabCtrl::OnLeaveWindow)

-    EVT_AUINOTEBOOK_BUTTON(-1, wxAuiTabCtrl::OnButton)
+    EVT_AUINOTEBOOK_BUTTON(wxID_ANY, wxAuiTabCtrl::OnButton)

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 


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


@@ -2354,7 +2365,7 @@ void wxAuiNotebook::InitNotebook(long style)
     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);


@@ -2397,7 +2408,7 @@ void wxAuiNotebook::SetArtProvider(wxAuiTabArt* art)
 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)
     {


@@ -2416,7 +2427,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)
     {


@@ -2430,7 +2441,7 @@ void 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 (m_tab_ctrl_height != 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)


@@ -2458,7 +2469,7 @@ void wxAuiNotebook::UpdateTabCtrlHeight()
 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())


@@ -2486,7 +2497,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)


@@ -2501,7 +2512,7 @@ wxSize wxAuiNotebook::CalculateNewSplitSize()
         // that needs to be implemented
         new_split_size = wxSize(180,180);
     }
         // that needs to be implemented
         new_split_size = wxSize(180,180);
     }

-    
+

     return new_split_size;
 }
 
     return new_split_size;
 }
 


@@ -2512,7 +2523,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();
 


@@ -2729,6 +2740,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)
 {


@@ -2756,6 +2777,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


@@ -2766,6 +2797,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 ((int)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;


@@ -2925,10 +2960,124 @@ 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);
+    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
+    SetSelection(m_tabs.GetIdxFromWindow(page_info.window));
+    
+    UpdateHintWindowSize();
+}
+
+

 void wxAuiNotebook::OnSize(wxSizeEvent& evt)
 {
     UpdateHintWindowSize();
 void wxAuiNotebook::OnSize(wxSizeEvent& evt)
 {
     UpdateHintWindowSize();

-    
+

     evt.Skip();
 }
 
     evt.Skip();
 }
 


@@ -3275,8 +3424,12 @@ 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));
         SetSelection(m_tabs.GetIdxFromWindow(page_info.window));

-        
+

         UpdateHintWindowSize();
     }
 }
         UpdateHintWindowSize();
     }
 }