wxaui notebook style flags added

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/aui/auibook.h b/include/wx/aui/auibook.h
index 438887920b1d582a0a67f41d85fd063856f8af49..6123463fb820a88766076bfe24f0ac9e80d72adf 100644 (file)
--- a/include/wx/aui/auibook.h
+++ b/include/wx/aui/auibook.h
@@ -27,9 +27,34 @@
 #include "wx/control.h"
 
 
-// tab art class
+
+enum wxAuiNotebookOption
+{
+    wxAUI_NB_TOP                 = 1 << 0,
+    wxAUI_NB_LEFT                = 1 << 1,  // not implemented yet
+    wxAUI_NB_RIGHT               = 1 << 2,  // not implemented yet
+    wxAUI_NB_BOTTOM              = 1 << 3,  // not implemented yet
+    wxAUI_NB_TAB_SPLIT           = 1 << 4,
+    wxAUI_NB_TAB_MOVE            = 1 << 5,
+    wxAUI_NB_SCROLL_BUTTONS      = 1 << 6,
+    wxAUI_NB_CLOSE_BUTTON        = 1 << 7,
+    wxAUI_NB_PAGELIST_BUTTON     = 1 << 8,
+    wxAUI_NB_CLOSE_ON_ACTIVE_TAB = 1 << 9,
+    wxAUI_NB_CLOSE_ON_ALL_TABS   = 1 << 10,
+    
+    wxAUI_NB_DEFAULT_STYLE = wxAUI_NB_TOP |
+                             wxAUI_NB_TAB_SPLIT |
+                             wxAUI_NB_TAB_MOVE |
+                             wxAUI_NB_SCROLL_BUTTONS// |
+                             //wxAUI_NB_CLOSE_ON_ALL_TABS
+};
+
 
 
+
+
+// tab art class
+
 class WXDLLIMPEXP_AUI wxTabArt
 {
 public:
@@ -49,6 +74,7 @@ public:
                          const wxRect& in_rect,
                          const wxString& caption,
                          bool active,
+                         bool with_close_button,
                          wxRect* out_rect,
                          int* x_extent) = 0;     
     
@@ -65,6 +91,7 @@ public:
                          wxDC* dc,
                          const wxString& caption,
                          bool active,
+                         bool with_close_button,
                          int* x_extent) = 0;
                          
     virtual int GetBestTabCtrlSize(wxWindow* wnd) = 0;      
@@ -91,6 +118,7 @@ public:
                  const wxRect& in_rect,
                  const wxString& caption,
                  bool active,
+                 bool with_close_button,
                  wxRect* out_rect,
                  int* x_extent);
     
@@ -107,6 +135,7 @@ public:
                  wxDC* dc,
                  const wxString& caption,
                  bool active,
+                 bool with_close_button,
                  int* x_extent);
     
     int GetBestTabCtrlSize(wxWindow* wnd);
@@ -207,6 +236,9 @@ public:
     void SetArtProvider(wxTabArt* art);
     wxTabArt* GetArtProvider();
 
+    void SetFlags(unsigned int flags);
+    unsigned int GetFlags() const;
+
     bool AddPage(wxWindow* page, const wxAuiNotebookPage& info);
     bool InsertPage(wxWindow* page, const wxAuiNotebookPage& info, size_t idx);
     bool MovePage(wxWindow* page, size_t new_idx);
@@ -246,6 +278,7 @@ private:
     wxAuiTabContainerButtonArray m_buttons;
     wxRect m_rect;
     size_t m_tab_offset;
+    unsigned int m_flags;
 };
 
 
@@ -301,7 +334,7 @@ public:
                        wxWindowID id = wxID_ANY,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
-                       long style = 0);
+                       long style = wxAUI_NB_DEFAULT_STYLE);
 
     virtual ~wxAuiMultiNotebook();
 
@@ -345,7 +378,7 @@ protected:
 protected:
 
     void DoSizing();
-    void InitNotebook();
+    void InitNotebook(long style);
 
     void OnChildFocus(wxChildFocusEvent& evt);
     void OnRender(wxFrameManagerEvent& evt);
@@ -370,6 +403,7 @@ protected:
     int m_tab_ctrl_height;
     
     int m_last_drag_x;
+    unsigned int m_flags;
 
 #ifndef SWIG
     DECLARE_EVENT_TABLE()

diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp
index 9e3988b4430b29362610281abf48fdc05b894b5e..de7776def204be825fefa1dea01be5b5549e8807 100644 (file)
--- a/samples/aui/auidemo.cpp
+++ b/samples/aui/auidemo.cpp
@@ -1234,7 +1234,8 @@ wxHtmlWindow* MyFrame::CreateHTMLCtrl(wxWindow* parent)
 wxAuiMultiNotebook* MyFrame::CreateNotebook()
 {
    wxAuiMultiNotebook* ctrl = new wxAuiMultiNotebook( this, wxID_ANY,
-                                    wxDefaultPosition, wxSize(400,300), wxNO_BORDER );
+                                    wxDefaultPosition, wxSize(400,300),
+                                    wxAUI_NB_DEFAULT_STYLE | wxNO_BORDER );
                                     
    ctrl->AddPage(CreateHTMLCtrl(ctrl), wxT("Welcome"));
                                     

diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index 6de8fcede51a6c4a571f680f33291f7a26c69d1f..e99cbd7822d8ec2107bbc8e9e41b7a21b403ab39 100644 (file)
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -193,6 +193,7 @@ void wxDefaultTabArt::DrawTab(wxDC* dc,
                               const wxRect& in_rect,
                               const wxString& caption_text,
                               bool active,
+                              bool with_close_button,
                               wxRect* out_rect,
                               int* x_extent)
 {
@@ -212,7 +213,7 @@ void wxDefaultTabArt::DrawTab(wxDC* dc,
     dc->GetTextExtent(caption, &normal_textx, &normal_texty);
         
     // figure out the size of the tab
-    wxSize tab_size = GetTabSize(dc, caption, active, x_extent);
+    wxSize tab_size = GetTabSize(dc, caption, active, with_close_button, x_extent);
 
     wxCoord tab_height = tab_size.y;
     wxCoord tab_width = tab_size.x;
@@ -264,12 +265,42 @@ void wxDefaultTabArt::DrawTab(wxDC* dc,
     //dc->DrawLines(active ? 6 : 7, points);
     dc->DrawLines(7, points);
 
-    // -- draw text --
 
+    int text_offset;
+
+    int close_button_width = 0;
+    if (with_close_button)
+    {
+        close_button_width = m_active_close_bmp.GetWidth();
+        text_offset = tab_x + (tab_height/2) + ((tab_width-close_button_width)/2) - (textx/2);
+    }
+     else
+    {
+        text_offset = tab_x + (tab_height/3) + (tab_width/2) - (textx/2);
+    }
+    
+
+    // draw tab text
     dc->DrawText(caption,
-                 tab_x + (tab_height/3) + (tab_width/2) - (textx/2),
+                 text_offset,
                  (tab_y + tab_height)/2 - (texty/2) + 1);
 
+
+    // draw close button if necessary
+    if (with_close_button)
+    {
+        wxBitmap bmp;
+        if (active)
+            bmp = m_active_close_bmp;
+             else
+            bmp = m_disabled_close_bmp;
+            
+        wxRect rect(tab_x + tab_width - close_button_width - 1, tab_y + 1,
+                    close_button_width, tab_height - 1);
+        DrawButtonS(*dc, rect, bmp, *wxWHITE, wxAUI_BUTTON_STATE_NORMAL);
+    }
+
+
     *out_rect = wxRect(tab_x, tab_y, tab_width, tab_height);
 }
 
@@ -277,6 +308,7 @@ void wxDefaultTabArt::DrawTab(wxDC* dc,
 wxSize wxDefaultTabArt::GetTabSize(wxDC* dc,
                                    const wxString& caption,
                                    bool WXUNUSED(active),
+                                   bool with_close_button,
                                    int* x_extent)
 {
     wxCoord measured_textx, measured_texty;
@@ -287,6 +319,9 @@ wxSize wxDefaultTabArt::GetTabSize(wxDC* dc,
     wxCoord tab_height = measured_texty + 4;
     wxCoord tab_width = measured_textx + tab_height + 5;
 
+    if (with_close_button)
+        tab_width += m_active_close_bmp.GetWidth();
+
     *x_extent = tab_width - (tab_height/2) - 1;
 
     return wxSize(tab_width, tab_height);
@@ -366,7 +401,7 @@ int wxDefaultTabArt::GetBestTabCtrlSize(wxWindow* wnd)
     wxClientDC dc(wnd);
     dc.SetFont(m_measuring_font);
     int x_ext = 0;
-    wxSize s = GetTabSize(&dc, wxT("ABCDEFGHIj"), true, &x_ext);
+    wxSize s = GetTabSize(&dc, wxT("ABCDEFGHIj"), true, false, &x_ext);
     return s.y+3;
 }
 
@@ -406,6 +441,7 @@ void wxDefaultTabArt::SetMeasuringFont(const wxFont& font)
 wxAuiTabContainer::wxAuiTabContainer()
 {
     m_tab_offset = 0;
+    m_flags = 0;
     m_art = new wxDefaultTabArt;
     
     AddButton(wxAUI_BUTTON_LEFT, wxLEFT);       
@@ -429,6 +465,17 @@ wxTabArt* wxAuiTabContainer::GetArtProvider()
     return m_art;
 }
 
+void wxAuiTabContainer::SetFlags(unsigned int flags)
+{
+    m_flags = flags;
+}
+
+unsigned int wxAuiTabContainer::GetFlags() const
+{
+    return m_flags;
+}
+
+
 void wxAuiTabContainer::SetNormalFont(const wxFont& font)
 {
     m_art->SetNormalFont(font);
@@ -650,8 +697,18 @@ void wxAuiTabContainer::Render(wxDC* raw_dc)
     for (i = 0; i < page_count; ++i)
     {
         wxAuiNotebookPage& page = m_pages.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))
+        {
+            close_button = true;
+        }
+        
+    
         int x_extent = 0;
-        wxSize size = m_art->GetTabSize(&dc, page.caption, page.active, &x_extent);
+        wxSize size = m_art->GetTabSize(&dc, page.caption, page.active, close_button, &x_extent);
         
         if (i+1 < page_count)
             total_width += x_extent;
@@ -783,10 +840,12 @@ void wxAuiTabContainer::Render(wxDC* raw_dc)
 
     offset = left_buttons_width;
     
-    
+    // set a clipping region to the tabs don't draw over the buttons
     dc.SetClippingRegion(left_buttons_width, 0,
                  m_rect.GetWidth() - right_buttons_width - left_buttons_width - 2,
                  m_rect.GetHeight());
+           
+           
                          
     // draw the tabs
 
@@ -803,12 +862,21 @@ void wxAuiTabContainer::Render(wxDC* raw_dc)
     {
         wxAuiNotebookPage& page = m_pages.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))
+        {
+            close_button = true;
+        }
+
         rect.x = offset;
 
         m_art->DrawTab(&dc, 
                 rect,
                 page.caption,
                 page.active,
+                close_button,
                 &page.rect,
                 &x_extent);
 
@@ -826,11 +894,20 @@ void wxAuiTabContainer::Render(wxDC* raw_dc)
     {
         wxAuiNotebookPage& page = m_pages.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,
                 rect,
                 page.caption,
                 page.active,
+                close_button,
                 &page.rect,
                 &x_extent);
     }
@@ -1297,7 +1374,7 @@ wxAuiMultiNotebook::wxAuiMultiNotebook(wxWindow *parent,
                              const wxSize& size,
                              long style) : wxControl(parent, id, pos, size, style)
 {
-    InitNotebook();
+    InitNotebook(style);
 }
 
 bool wxAuiMultiNotebook::Create(wxWindow* parent,
@@ -1309,20 +1386,21 @@ bool wxAuiMultiNotebook::Create(wxWindow* parent,
     if (!wxControl::Create(parent, id, pos, size, style))
         return false;
 
-    InitNotebook();
+    InitNotebook(style);
 
     return true;
 }
 
 // InitNotebook() contains common initialization
 // code called by all constructors
-void wxAuiMultiNotebook::InitNotebook()
+void wxAuiMultiNotebook::InitNotebook(long style)
 {
     m_curpage = -1;
     m_tab_id_counter = 10000;
     m_dummy_wnd = NULL;
     m_tab_ctrl_height = 20;
-
+    m_flags = (unsigned int)style;
+    
     m_normal_font = *wxNORMAL_FONT;
     m_selected_font = *wxNORMAL_FONT;
     m_selected_font.SetWeight(wxBOLD);
@@ -1654,6 +1732,7 @@ wxAuiTabCtrl* wxAuiMultiNotebook::GetActiveTabCtrl()
                                         wxDefaultPosition,
                                         wxDefaultSize,
                                         wxNO_BORDER);
+    tabframe->m_tabs->SetFlags(m_flags);
     m_mgr.AddPane(tabframe,
                   wxPaneInfo().Center().CaptionVisible(false));
 
@@ -1824,6 +1903,8 @@ void wxAuiMultiNotebook::OnTabEndDrag(wxCommandEvent& command_evt)
                                             wxDefaultPosition,
                                             wxDefaultSize,
                                             wxNO_BORDER);
+        new_tabs->m_tabs->SetFlags(m_flags);
+
         m_mgr.AddPane(new_tabs,
                       wxPaneInfo().Bottom().CaptionVisible(false),
                       mouse_client_pt);