IMPLEMENT_DYNAMIC_CLASS(wxAuiNotebookEvent, wxEvent)
-// -- wxAuiTabContainer class implementation --
-
-// wxAuiTabContainer is a class which contains information about each
-// tab. It also can render an entire tab control to a specified DC.
-// It's not a window class itself, because this code will be used by
-// the wxFrameMananger, where it is disadvantageous to have separate
-// windows for each tab control in the case of "docked tabs"
-// A derived class, wxAuiTabCtrl, is an actual wxWindow-derived window
-// which can be used as a tab control in the normal sense.
// This functions are here for this proof of concept
return wxBitmap(img);
}
-static void DrawButton(wxDC& dc,
+static void DrawButtonS(wxDC& dc,
const wxRect& _rect,
const wxBitmap& bmp,
const wxColour& bkcolour,
-wxAuiTabContainer::wxAuiTabContainer()
+
+// -- wxDefaultTabArt class implementation --
+
+wxDefaultTabArt::wxDefaultTabArt()
{
m_normal_font = *wxNORMAL_FONT;
m_selected_font = *wxNORMAL_FONT;
m_normal_bkpen = wxPen(normaltab_colour);
m_selected_bkbrush = wxBrush(selectedtab_colour);
m_selected_bkpen = wxPen(selectedtab_colour);
+
+
+#if defined( __WXMAC__ )
+ static unsigned char close_bits[]={
+ 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0xFE, 0x03, 0xF8, 0x01, 0xF0, 0x19, 0xF3,
+ 0xB8, 0xE3, 0xF0, 0xE1, 0xE0, 0xE0, 0xF0, 0xE1, 0xB8, 0xE3, 0x19, 0xF3,
+ 0x01, 0xF0, 0x03, 0xF8, 0x0F, 0xFE, 0xFF, 0xFF };
+#elif defined( __WXGTK__)
+ static unsigned char close_bits[]={
+ 0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xfb, 0xef, 0xdb, 0xed, 0x8b, 0xe8,
+ 0x1b, 0xec, 0x3b, 0xee, 0x1b, 0xec, 0x8b, 0xe8, 0xdb, 0xed, 0xfb, 0xef,
+ 0x07, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+#else
+ static unsigned char close_bits[]={
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0xfb,0xcf,0xf9,
+ 0x9f,0xfc,0x3f,0xfe,0x3f,0xfe,0x9f,0xfc,0xcf,0xf9,0xef,0xfb,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
+#endif
+
+ static unsigned char left_bits[] = {
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0xfe, 0x3f, 0xfe,
+ 0x1f, 0xfe, 0x0f, 0xfe, 0x1f, 0xfe, 0x3f, 0xfe, 0x7f, 0xfe, 0xff, 0xfe,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
+ static unsigned char right_bits[] = {
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0x9f, 0xff, 0x1f, 0xff,
+ 0x1f, 0xfe, 0x1f, 0xfc, 0x1f, 0xfe, 0x1f, 0xff, 0x9f, 0xff, 0xdf, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
+ m_active_close_bmp = BitmapFromBits(close_bits, 16, 16, *wxBLACK);
+ m_disabled_close_bmp = BitmapFromBits(close_bits, 16, 16, wxColour(128,128,128));
+
+ m_active_left_bmp = BitmapFromBits(left_bits, 16, 16, *wxBLACK);
+ m_disabled_left_bmp = BitmapFromBits(left_bits, 16, 16, wxColour(128,128,128));
+
+ m_active_right_bmp = BitmapFromBits(right_bits, 16, 16, *wxBLACK);
+ m_disabled_right_bmp = BitmapFromBits(right_bits, 16, 16, wxColour(128,128,128));
+}
+
+wxDefaultTabArt::~wxDefaultTabArt()
+{
+}
+
+void wxDefaultTabArt::DrawBackground(wxDC* dc,
+ const wxRect& rect)
+{
+ // draw background
+ dc->SetBrush(m_bkbrush);
+ dc->SetPen(*wxTRANSPARENT_PEN);
+ dc->DrawRectangle(-1, -1, rect.GetWidth()+2, rect.GetHeight()+2);
+
+ // draw base line
+ dc->SetPen(*wxGREY_PEN);
+ dc->DrawLine(0, rect.GetHeight()-1, rect.GetWidth(), rect.GetHeight()-1);
+}
+
+
+// DrawTab() draws an individual tab.
+//
+// dc - output dc
+// in_rect - rectangle the tab should be confined to
+// caption - tab's caption
+// active - whether or not the tab is active
+// out_rect - actual output rectangle
+// x_extent - the advance x; where the next tab should start
+
+void wxDefaultTabArt::DrawTab(wxDC* dc,
+ const wxRect& in_rect,
+ const wxString& caption_text,
+ bool active,
+ wxRect* out_rect,
+ int* x_extent)
+{
+ wxCoord normal_textx, normal_texty;
+ wxCoord selected_textx, selected_texty;
+ wxCoord measured_textx, measured_texty;
+ wxCoord textx, texty;
+
+
+ // if the caption is empty, measure some temporary text
+ wxString caption = caption_text;
+ if (caption_text.empty())
+ caption = wxT("Xj");
+
+ // measure text
+ dc->SetFont(m_measuring_font);
+ dc->GetTextExtent(caption, &measured_textx, &measured_texty);
+
+ dc->SetFont(m_selected_font);
+ dc->GetTextExtent(caption, &selected_textx, &selected_texty);
+
+ dc->SetFont(m_normal_font);
+ dc->GetTextExtent(caption, &normal_textx, &normal_texty);
+
+ caption = caption_text;
+
+ wxCoord tab_height = measured_texty + 4;
+ wxCoord tab_width = measured_textx + tab_height + 5;
+ wxCoord tab_x = in_rect.x;
+ wxCoord tab_y = in_rect.y + in_rect.height - tab_height;
+
+
+ // select pen, brush and font for the tab to be drawn
+
+ if (active)
+ {
+ dc->SetPen(m_selected_bkpen);
+ dc->SetBrush(m_selected_bkbrush);
+ dc->SetFont(m_selected_font);
+ textx = selected_textx;
+ texty = selected_texty;
+ }
+ else
+ {
+ dc->SetPen(m_normal_bkpen);
+ dc->SetBrush(m_normal_bkbrush);
+ dc->SetFont(m_normal_font);
+ textx = normal_textx;
+ texty = normal_texty;
+ }
+
+
+ // -- draw line --
+
+ wxPoint points[7];
+ points[0].x = tab_x;
+ points[0].y = tab_y + tab_height - 1;
+ points[1].x = tab_x + tab_height - 3;
+ points[1].y = tab_y + 2;
+ points[2].x = tab_x + tab_height + 3;
+ points[2].y = tab_y;
+ points[3].x = tab_x + tab_width - 2;
+ points[3].y = tab_y;
+ points[4].x = tab_x + tab_width;
+ points[4].y = tab_y + 2;
+ points[5].x = tab_x + tab_width;
+ points[5].y = tab_y + tab_height - 1;
+ points[6] = points[0];
+
+
+ dc->DrawPolygon(6, points);
+
+ dc->SetPen(*wxGREY_PEN);
+
+ //dc->DrawLines(active ? 6 : 7, points);
+ dc->DrawLines(7, points);
+
+ // -- draw text --
+
+ dc->DrawText(caption,
+ tab_x + (tab_height/3) + (tab_width/2) - (textx/2),
+ tab_y + tab_height - texty - 2);
+
+ *out_rect = wxRect(tab_x, tab_y, tab_width, tab_height);
+ *x_extent = tab_width - (tab_height/2) - 1;
+}
+
+
+wxSize wxDefaultTabArt::GetTabSize(wxDC* dc,
+ const wxString& caption,
+ bool WXUNUSED(active),
+ int* x_extent)
+{
+ wxCoord measured_textx, measured_texty;
+
+ dc->SetFont(m_measuring_font);
+ dc->GetTextExtent(caption, &measured_textx, &measured_texty);
+
+ wxCoord tab_height = measured_texty + 4;
+ wxCoord tab_width = measured_textx + tab_height + 5;
+
+ *x_extent = tab_width - (tab_height/2) - 1;
+
+ return wxSize(tab_width, tab_height);
+}
+
+
+void wxDefaultTabArt::DrawButton(
+ wxDC* dc,
+ const wxRect& in_rect,
+ int bitmap_id,
+ int button_state,
+ int orientation,
+ const wxBitmap& bitmap_override,
+ wxRect* out_rect)
+{
+ wxBitmap bmp;
+ wxRect rect;
+
+ if (bitmap_override.IsOk())
+ {
+ bmp = bitmap_override;
+ }
+ else
+ {
+ switch (bitmap_id)
+ {
+ case wxAUI_BUTTON_CLOSE:
+ if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+ bmp = m_disabled_close_bmp;
+ else
+ bmp = m_active_close_bmp;
+ break;
+ case wxAUI_BUTTON_LEFT:
+ if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+ bmp = m_disabled_left_bmp;
+ else
+ bmp = m_active_left_bmp;
+ break;
+ case wxAUI_BUTTON_RIGHT:
+ if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+ bmp = m_disabled_right_bmp;
+ else
+ bmp = m_active_right_bmp;
+ break;
+ }
+ }
+
+ if (!bmp.IsOk())
+ return;
+
+ rect = in_rect;
+
+ if (orientation == wxLEFT)
+ {
+ rect.SetWidth(bmp.GetWidth());
+ rect.SetHeight(bmp.GetHeight());
+ }
+ else
+ {
+ rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(), in_rect.y,
+ bmp.GetWidth(), bmp.GetHeight());
+ }
+
+
+ DrawButtonS(*dc, rect, bmp, *wxWHITE, button_state);
+
+ *out_rect = rect;
+}
+
+
+
+
+
+void wxDefaultTabArt::SetNormalFont(const wxFont& font)
+{
+ m_normal_font = font;
+}
+
+void wxDefaultTabArt::SetSelectedFont(const wxFont& font)
+{
+ m_selected_font = font;
+}
+
+void wxDefaultTabArt::SetMeasuringFont(const wxFont& font)
+{
+ m_measuring_font = font;
+}
+
+
+
+
+
+
+// -- wxAuiTabContainer class implementation --
+
+
+// wxAuiTabContainer is a class which contains information about each
+// tab. It also can render an entire tab control to a specified DC.
+// It's not a window class itself, because this code will be used by
+// the wxFrameMananger, where it is disadvantageous to have separate
+// windows for each tab control in the case of "docked tabs"
+
+// A derived class, wxAuiTabCtrl, is an actual wxWindow-derived window
+// which can be used as a tab control in the normal sense.
+
+
+wxAuiTabContainer::wxAuiTabContainer()
+{
+ m_tab_offset = 0;
+ m_art = new wxDefaultTabArt;
+
+ AddButton(wxAUI_BUTTON_LEFT, wxLEFT);
+ AddButton(wxAUI_BUTTON_RIGHT, wxRIGHT);
+ AddButton(wxAUI_BUTTON_CLOSE, wxRIGHT);
}
wxAuiTabContainer::~wxAuiTabContainer()
{
+ delete m_art;
+}
+
+void wxAuiTabContainer::SetArtProvider(wxTabArt* art)
+{
+ delete m_art;
+ m_art = art;
+}
+
+wxTabArt* wxAuiTabContainer::GetArtProvider()
+{
+ return m_art;
}
void wxAuiTabContainer::SetNormalFont(const wxFont& font)
{
- m_normal_font = font;
+ m_art->SetNormalFont(font);
}
void wxAuiTabContainer::SetSelectedFont(const wxFont& font)
{
- m_selected_font = font;
+ m_art->SetSelectedFont(font);
}
void wxAuiTabContainer::SetMeasuringFont(const wxFont& font)
{
- m_measuring_font = font;
+ m_art->SetMeasuringFont(font);
}
void wxAuiTabContainer::SetRect(const wxRect& rect)
return m_pages.GetCount();
}
-void wxAuiTabContainer::AddButton(int id, const wxBitmap& bmp)
+void wxAuiTabContainer::AddButton(int id,
+ int location,
+ const wxBitmap& normal_bitmap,
+ const wxBitmap& disabled_bitmap)
{
wxAuiTabContainerButton button;
button.id = id;
- button.bitmap = bmp;
+ button.bitmap = normal_bitmap;
+ button.dis_bitmap = disabled_bitmap;
+ button.location = location;
button.cur_state = wxAUI_BUTTON_STATE_NORMAL;
m_buttons.Add(button);
}
-
-
-// DrawTab() draws an individual tab.
-// As it is virtual it may be overridden.
-//
-// dc - output dc
-// in_rect - rectangle the tab should be confined to
-// caption - tab's caption
-// active - whether or not the tab is active
-// out_rect - actual output rectangle
-// x_extent - the advance x; where the next tab should start
-
-void wxAuiTabContainer::DrawTab(wxDC* dc,
- const wxRect& in_rect,
- const wxString& caption_text,
- bool active,
- wxRect* out_rect,
- int* x_extent)
+size_t wxAuiTabContainer::GetTabOffset() const
{
- wxCoord normal_textx, normal_texty;
- wxCoord selected_textx, selected_texty;
- wxCoord measured_textx, measured_texty;
- wxCoord textx, texty;
-
-
- // if the caption is empty, measure some temporary text
- wxString caption = caption_text;
- if (caption_text.empty())
- caption = wxT("Xj");
-
- // measure text
- dc->SetFont(m_measuring_font);
- dc->GetTextExtent(caption, &measured_textx, &measured_texty);
-
- dc->SetFont(m_selected_font);
- dc->GetTextExtent(caption, &selected_textx, &selected_texty);
-
- dc->SetFont(m_normal_font);
- dc->GetTextExtent(caption, &normal_textx, &normal_texty);
+ return m_tab_offset;
+}
- caption = caption_text;
+void wxAuiTabContainer::SetTabOffset(size_t offset)
+{
+ m_tab_offset = offset;
+}
- wxCoord tab_height = measured_texty + 4;
- wxCoord tab_width = measured_textx + tab_height + 5;
- wxCoord tab_x = in_rect.x;
- wxCoord tab_y = in_rect.y + in_rect.height - tab_height;
+// Render() renders the tab catalog to the specified DC
+// It is a virtual function and can be overridden to
+// provide custom drawing capabilities
+void wxAuiTabContainer::Render(wxDC* raw_dc)
+{
+ wxMemoryDC dc;
+ wxBitmap bmp;
+ size_t i;
+ size_t page_count = m_pages.GetCount();
+ size_t button_count = m_buttons.GetCount();
+ // create off-screen bitmap
+ bmp.Create(m_rect.GetWidth(), m_rect.GetHeight());
+ dc.SelectObject(bmp);
- // select pen, brush and font for the tab to be drawn
- if (active)
+ // find out if size of tabs is larger than can be
+ // afforded on screen
+ int total_width = 0;
+
+ for (i = 0; i < page_count; ++i)
{
- dc->SetPen(m_selected_bkpen);
- dc->SetBrush(m_selected_bkbrush);
- dc->SetFont(m_selected_font);
- textx = selected_textx;
- texty = selected_texty;
+ wxAuiNotebookPage& page = m_pages.Item(i);
+ int x_extent = 0;
+ wxSize size = m_art->GetTabSize(&dc, page.caption, page.active, &x_extent);
+ if (i+1 < page_count)
+ total_width += x_extent;
+ else
+ total_width += size.x;
+ }
+
+ if (total_width > m_rect.GetWidth() - 20 || m_tab_offset != 0)
+ {
+ // show left/right buttons
+ for (i = 0; i < button_count; ++i)
+ {
+ wxAuiTabContainerButton& button = m_buttons.Item(i);
+ if (button.id == wxAUI_BUTTON_LEFT ||
+ button.id == wxAUI_BUTTON_RIGHT)
+ {
+ button.cur_state &= ~wxAUI_BUTTON_STATE_HIDDEN;
+ }
+ }
}
else
{
- dc->SetPen(m_normal_bkpen);
- dc->SetBrush(m_normal_bkbrush);
- dc->SetFont(m_normal_font);
- textx = normal_textx;
- texty = normal_texty;
+ // hide left/right buttons
+ for (i = 0; i < button_count; ++i)
+ {
+ wxAuiTabContainerButton& button = m_buttons.Item(i);
+ if (button.id == wxAUI_BUTTON_LEFT ||
+ button.id == wxAUI_BUTTON_RIGHT)
+ {
+ button.cur_state |= wxAUI_BUTTON_STATE_HIDDEN;
+ }
+ }
}
- // -- draw line --
-
- wxPoint points[7];
- points[0].x = tab_x;
- points[0].y = tab_y + tab_height - 1;
- points[1].x = tab_x + tab_height - 3;
- points[1].y = tab_y + 2;
- points[2].x = tab_x + tab_height + 3;
- points[2].y = tab_y;
- points[3].x = tab_x + tab_width - 2;
- points[3].y = tab_y;
- points[4].x = tab_x + tab_width;
- points[4].y = tab_y + 2;
- points[5].x = tab_x + tab_width;
- points[5].y = tab_y + tab_height - 1;
- points[6] = points[0];
-
-
- dc->DrawPolygon(6, points);
-
- dc->SetPen(*wxGREY_PEN);
-
- //dc->DrawLines(active ? 6 : 7, points);
- dc->DrawLines(7, points);
-
- // -- draw text --
- dc->DrawText(caption,
- tab_x + (tab_height/3) + (tab_width/2) - (textx/2),
- tab_y + tab_height - texty - 2);
+ // draw background
+ m_art->DrawBackground(&dc, m_rect);
- *out_rect = wxRect(tab_x, tab_y, tab_width, tab_height);
- *x_extent = tab_width - (tab_height/2) - 1;
-}
+ // draw buttons
+ int left_buttons_width = 0;
+ int right_buttons_width = 0;
+
+ int offset = 0;
+ // draw the buttons on the right side
+ offset = m_rect.x + m_rect.width;
+ for (i = 0; i < button_count; ++i)
+ {
+ wxAuiTabContainerButton& button = m_buttons.Item(button_count - i - 1);
+
+ if (button.location != wxRIGHT)
+ continue;
+ if (button.cur_state & wxAUI_BUTTON_STATE_HIDDEN)
+ continue;
+
+ wxRect button_rect = m_rect;
+ button_rect.SetY(1);
+ button_rect.SetWidth(offset);
+
+ m_art->DrawButton(&dc,
+ button_rect,
+ button.id,
+ button.cur_state,
+ wxRIGHT,
+ wxNullBitmap,
+ &button.rect);
+
+ offset -= button.rect.GetWidth();
+ right_buttons_width += button.rect.GetWidth();
+ }
-// Render() renders the tab catalog to the specified DC
-// It is a virtual function and can be overridden to
-// provide custom drawing capabilities
-void wxAuiTabContainer::Render(wxDC* raw_dc)
-{
- wxMemoryDC dc;
- wxBitmap bmp;
- bmp.Create(m_rect.GetWidth(), m_rect.GetHeight());
- dc.SelectObject(bmp);
- // draw background
- dc.SetBrush(m_bkbrush);
- dc.SetPen(*wxTRANSPARENT_PEN);
- dc.DrawRectangle(-1, -1, m_rect.GetWidth()+2, m_rect.GetHeight()+2);
- // draw base line
- dc.SetPen(*wxGREY_PEN);
- dc.DrawLine(0, m_rect.GetHeight()-1, m_rect.GetWidth(), m_rect.GetHeight()-1);
+ offset = 0;
+
+ // draw the buttons on the left side
+ for (i = 0; i < button_count; ++i)
+ {
+ wxAuiTabContainerButton& button = m_buttons.Item(button_count - i - 1);
+
+ if (button.location != wxLEFT)
+ continue;
+ if (button.cur_state & wxAUI_BUTTON_STATE_HIDDEN)
+ continue;
+
+ wxRect button_rect(offset, 1, 1000, m_rect.height);
+
+ m_art->DrawButton(&dc,
+ button_rect,
+ button.id,
+ button.cur_state,
+ wxLEFT,
+ wxNullBitmap,
+ &button.rect);
+
+ offset += button.rect.GetWidth();
+ left_buttons_width += button.rect.GetWidth();
+ }
- size_t i, page_count = m_pages.GetCount();
- int offset = 0;
+ offset = left_buttons_width;
+
+
+ dc.SetClippingRegion(left_buttons_width, 0,
+ m_rect.GetWidth() - right_buttons_width - left_buttons_width - 2,
+ m_rect.GetHeight());
+
+ // draw the tabs
size_t active = 999;
int active_offset = 0;
rect.width = 1000;
rect.height = m_rect.height;
- for (i = 0; i < page_count; ++i)
+ for (i = m_tab_offset; i < page_count; ++i)
{
wxAuiNotebookPage& page = m_pages.Item(i);
rect.x = offset;
- DrawTab(&dc,
+ m_art->DrawTab(&dc,
rect,
page.caption,
page.active,
}
// draw the active tab again so it stands in the foreground
- if (active < m_pages.GetCount())
+ if (active >= m_tab_offset && active < m_pages.GetCount())
{
wxAuiNotebookPage& page = m_pages.Item(active);
rect.x = active_offset;
- DrawTab(&dc,
+ m_art->DrawTab(&dc,
rect,
page.caption,
page.active,
&x_extent);
}
- // draw the buttons
- offset = m_rect.x + m_rect.width;
- size_t button_count = m_buttons.GetCount();
- for (i = 0; i < button_count; ++i)
- {
- wxAuiTabContainerButton& button = m_buttons.Item(button_count - i - 1);
-
- wxRect button_rect(offset - button.bitmap.GetWidth(), 1,
- button.bitmap.GetWidth(), button.bitmap.GetHeight());
-
- button.rect = button_rect;
-
- DrawButton(dc, button.rect, button.bitmap,
- m_bkbrush.GetColour(),
- button.cur_state);
-
- offset -= button.bitmap.GetWidth();
- }
-
-
- raw_dc->Blit(m_rect.x, m_rect.y, m_rect.GetWidth(), m_rect.GetHeight(), &dc, 0, 0);
+ dc.DestroyClippingRegion();
+
+ raw_dc->Blit(m_rect.x, m_rect.y,
+ m_rect.GetWidth(), m_rect.GetHeight(),
+ &dc, 0, 0);
}
// true if a tab was hit, otherwise false
bool wxAuiTabContainer::TabHitTest(int x, int y, wxWindow** hit) const
{
- if (!m_rect.Inside(x,y))
+ if (!m_rect.Contains(x,y))
+ return false;
+
+ if (ButtonHitTest(x, y, NULL))
return false;
size_t i, page_count = m_pages.GetCount();
- for (i = 0; i < page_count; ++i)
+ for (i = m_tab_offset; i < page_count; ++i)
{
wxAuiNotebookPage& page = m_pages.Item(i);
- if (page.rect.Inside(x,y))
+ if (page.rect.Contains(x,y))
{
- *hit = page.window;
+ if (hit)
+ *hit = page.window;
return true;
}
}
bool wxAuiTabContainer::ButtonHitTest(int x, int y,
wxAuiTabContainerButton** hit) const
{
- if (!m_rect.Inside(x,y))
+ if (!m_rect.Contains(x,y))
return false;
size_t i, button_count = m_buttons.GetCount();
for (i = 0; i < button_count; ++i)
{
wxAuiTabContainerButton& button = m_buttons.Item(i);
- if (button.rect.Inside(x,y))
+ if (button.rect.Contains(x,y))
{
- *hit = &button;
+ if (hit)
+ *hit = &button;
return true;
}
}
// -- wxAuiTabCtrl class implementation --
-const int wxAuiButtonClose = 101;
BEGIN_EVENT_TABLE(wxAuiTabCtrl, wxControl)
EVT_PAINT(wxAuiTabCtrl::OnPaint)
EVT_LEFT_UP(wxAuiTabCtrl::OnLeftUp)
EVT_MOTION(wxAuiTabCtrl::OnMotion)
EVT_LEAVE_WINDOW(wxAuiTabCtrl::OnLeaveWindow)
+ EVT_AUINOTEBOOK_BUTTON(-1, wxAuiTabCtrl::OnButton)
END_EVENT_TABLE()
m_click_pt = wxDefaultPosition;
m_is_dragging = false;
m_hover_button = NULL;
-
- // FIXME: copied from dockart-- needs to put in a common place
-#if defined( __WXMAC__ )
- static unsigned char close_bits[]={
- 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0xFE, 0x03, 0xF8, 0x01, 0xF0, 0x19, 0xF3,
- 0xB8, 0xE3, 0xF0, 0xE1, 0xE0, 0xE0, 0xF0, 0xE1, 0xB8, 0xE3, 0x19, 0xF3,
- 0x01, 0xF0, 0x03, 0xF8, 0x0F, 0xFE, 0xFF, 0xFF };
-#elif defined( __WXGTK__)
- static unsigned char close_bits[]={
- 0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xfb, 0xef, 0xdb, 0xed, 0x8b, 0xe8,
- 0x1b, 0xec, 0x3b, 0xee, 0x1b, 0xec, 0x8b, 0xe8, 0xdb, 0xed, 0xfb, 0xef,
- 0x07, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-#else
- static unsigned char close_bits[]={
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0xfb,0xcf,0xf9,
- 0x9f,0xfc,0x3f,0xfe,0x3f,0xfe,0x9f,0xfc,0xcf,0xf9,0xef,0xfb,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
-#endif
-
- AddButton(101, BitmapFromBits(close_bits, 16, 16, *wxBLACK));
}
wxAuiTabContainerButton* button;
if (ButtonHitTest(pos.x, pos.y, &button))
{
+ if (m_hover_button && button != m_hover_button)
+ {
+ m_hover_button->cur_state = wxAUI_BUTTON_STATE_NORMAL;
+ m_hover_button = NULL;
+ Refresh();
+ Update();
+ }
+
if (button->cur_state != wxAUI_BUTTON_STATE_HOVER)
{
button->cur_state = wxAUI_BUTTON_STATE_HOVER;
}
}
+void wxAuiTabCtrl::OnButton(wxAuiNotebookEvent& event)
+{
+ int button = event.GetInt();
+
+ if (button == wxAUI_BUTTON_LEFT || button == wxAUI_BUTTON_RIGHT)
+ {
+ if (button == wxAUI_BUTTON_LEFT)
+ {
+ if (GetTabOffset() > 0)
+ {
+ SetTabOffset(GetTabOffset()-1);
+ Refresh();
+ Update();
+ }
+ }
+ else
+ {
+ SetTabOffset(GetTabOffset()+1);
+ Refresh();
+ Update();
+ }
+ }
+ else
+ {
+ event.Skip();
+ }
+}
// wxTabFrame is an interesting case. It's important that all child pages
// of the multi-notebook control are all actually children of that control
m_mgr.UnInit();
}
+void wxAuiMultiNotebook::SetArtProvider(wxTabArt* art)
+{
+ m_tabs.SetArtProvider(art);
+}
+
+wxTabArt* wxAuiMultiNotebook::GetArtProvider()
+{
+ return m_tabs.GetArtProvider();
+}
+
bool wxAuiMultiNotebook::AddPage(wxWindow* page,
const wxString& caption,
bool select,
// DeletePage() removes a tab from the multi-notebook,
// and destroys the window as well
bool wxAuiMultiNotebook::DeletePage(size_t page_idx)
-{
+{
wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx);
-
+ wxWindow* new_active = NULL;
// find out which onscreen tab ctrl owns this tab
wxAuiTabCtrl* ctrl;
if (new_idx >= 0 && new_idx < (int)ctrl->GetPageCount())
{
- wxWindow* new_wnd = ctrl->GetWindowFromIdx(new_idx);
- int main_idx = m_tabs.GetIdxFromWindow(new_wnd);
- wxASSERT(main_idx != -1);
- SetSelection(main_idx);
+ new_active = ctrl->GetWindowFromIdx(new_idx);
}
else
{
// set the active page to the first page that
// isn't the one being deleted
- bool found = false;
size_t i, page_count = m_tabs.GetPageCount();
for (i = 0; i < page_count; ++i)
{
wxWindow* w = m_tabs.GetWindowFromIdx(i);
if (wnd != w)
{
- found = true;
- SetSelection(i);
+ new_active = m_tabs.GetWindowFromIdx(i);
break;
}
}
-
- if (!found)
- m_curpage = -1;
}
-
// remove the tab from main catalog
if (!m_tabs.RemovePage(wnd))
return false;
RemoveEmptyTabFrames();
+ // set new active pane
+ if (new_active)
+ {
+ m_curpage = -1;
+ SetSelection(m_tabs.GetIdxFromWindow(new_active));
+ }
+
return true;
}
continue;
wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window;
- if (tabframe->m_tab_rect.Inside(pt))
+ if (tabframe->m_tab_rect.Contains(pt))
return tabframe->m_tabs;
}
void wxAuiMultiNotebook::RemoveEmptyTabFrames()
{
- bool must_update = false;
-
// if we've just removed the last tab from the source
// tab set, the remove the tab control completely
wxPaneInfoArray all_panes = m_mgr.GetAllPanes();
//tab_frame->m_tabs->Destroy();
delete tab_frame;
- must_update = true;
}
}
if (!center_found && first_good)
{
m_mgr.GetPane(first_good).Centre();
- must_update = true;
}
m_mgr.Update();
int button_id = evt.GetInt();
- if (button_id == wxAuiButtonClose)
+ if (button_id == wxAUI_BUTTON_CLOSE)
{
int selection = tabs->GetActivePage();
projects / wxWidgets.git / blobdiff