///////////////////////////////////////////////////////////////////////////////
-// Name: src/aui/notebook.cpp
+// Name: src/aui/auibook.cpp
// Purpose: wxaui: wx advanced user interface - notebook
// Author: Benjamin I. Williams
// Modified by:
#if wxUSE_AUI
-#include "wx/aui/notebook.h"
-#include "wx/aui/tabmdi.h"
-#include "wx/dcbuffer.h"
+#include "wx/aui/auibook.h"
#ifndef WX_PRECOMP
+ #include "wx/settings.h"
+ #include "wx/image.h"
#endif
+#include "wx/aui/tabmdi.h"
+#include "wx/dcbuffer.h"
+
#include "wx/arrimpl.cpp"
WX_DEFINE_OBJARRAY(wxAuiNotebookPageArray)
WX_DEFINE_OBJARRAY(wxAuiTabContainerButtonArray)
m_selected_font = *wxNORMAL_FONT;
m_selected_font.SetWeight(wxBOLD);
m_measuring_font = m_selected_font;
-
+
wxColour base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-
+
wxColour background_colour = StepColour(base_colour, 95);
wxColour normaltab_colour = base_colour;
wxColour selectedtab_colour = *wxWHITE;
-
+
m_bkbrush = wxBrush(background_colour);
m_normal_bkbrush = wxBrush(normaltab_colour);
m_normal_bkpen = wxPen(normaltab_colour);
m_selected_bkpen = wxPen(selectedtab_colour);
}
+wxAuiTabContainer::~wxAuiTabContainer()
+{
+}
+
void wxAuiTabContainer::SetNormalFont(const wxFont& font)
{
m_normal_font = font;
wxAuiNotebookPage page_info;
page_info = info;
page_info.window = page;
-
+
m_pages.Add(page_info);
return true;
wxAuiNotebookPage page_info;
page_info = info;
page_info.window = page;
-
+
if (idx >= m_pages.GetCount())
m_pages.Add(page_info);
else
return true;
}
}
-
+
return false;
}
bool wxAuiTabContainer::SetActivePage(wxWindow* wnd)
{
bool found = false;
-
+
size_t i, page_count = m_pages.GetCount();
for (i = 0; i < page_count; ++i)
{
page.active = false;
}
}
-
+
return found;
}
{
if (page >= m_pages.GetCount())
return false;
-
+
return SetActivePage(m_pages.Item(page).window);
}
-
+
int wxAuiTabContainer::GetActivePage() const
{
size_t i, page_count = m_pages.GetCount();
if (page.active)
return i;
}
-
+
return -1;
}
{
if (idx >= m_pages.GetCount())
return NULL;
-
+
return m_pages[idx].window;
}
button.id = id;
button.bitmap = bmp;
button.cur_state = wxAUI_BUTTON_STATE_NORMAL;
-
+
m_buttons.Add(button);
}
void wxAuiTabContainer::DrawTab(wxDC* dc,
const wxRect& in_rect,
- const wxString& caption,
+ const wxString& caption_text,
bool active,
wxRect* out_rect,
int* x_extent)
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);
textx = normal_textx;
texty = normal_texty;
}
-
-
+
+
// -- draw line --
-
+
wxPoint points[7];
points[0].x = tab_x;
points[0].y = tab_y + tab_height - 1;
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),
+
+ 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;
}
// 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);
-
-
+
+
size_t i, page_count = m_pages.GetCount();
int offset = 0;
size_t active = 999;
int active_offset = 0;
-
+
int x_extent = 0;
wxRect rect = m_rect;
rect.y = 0;
rect.width = 1000;
rect.height = m_rect.height;
-
+
for (i = 0; i < page_count; ++i)
{
wxAuiNotebookPage& page = m_pages.Item(i);
-
+
rect.x = offset;
-
+
DrawTab(&dc,
rect,
page.caption,
page.active,
&page.rect,
&x_extent);
-
+
if (page.active)
{
active = i;
active_offset = offset;
}
-
+
offset += x_extent;
}
-
+
// draw the active tab again so it stands in the foreground
if (active < m_pages.GetCount())
{
&page.rect,
&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);
}
{
if (!m_rect.Inside(x,y))
return false;
-
+
size_t i, page_count = m_pages.GetCount();
-
+
for (i = 0; i < page_count; ++i)
{
wxAuiNotebookPage& page = m_pages.Item(i);
return true;
}
}
-
+
return false;
}
{
if (!m_rect.Inside(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);
return true;
}
}
-
+
return false;
}
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
- long style) : wxControl(parent, id, pos, size, style)
+ long style) : wxControl(parent, id, pos, size, style)
{
m_click_pt = wxDefaultPosition;
m_is_dragging = false;
m_hover_button = NULL;
-
- // copied from dockart-- needs to put in a common place
+
+ // FIXME: copied from dockart-- needs to put in a common place
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};
-
+
AddButton(101, BitmapFromBits(close_bits, 16, 16, *wxBLACK));
}
void wxAuiTabCtrl::OnPaint(wxPaintEvent&)
{
wxPaintDC dc(this);
-
+
dc.SetFont(GetFont());
-
+
if (GetPageCount() > 0)
Render(&dc);
}
m_click_pt = wxDefaultPosition;
m_is_dragging = false;
m_click_tab = -1;
-
+
wxWindow* wnd;
if (TabHitTest(evt.m_x, evt.m_y, &wnd))
{
e.SetOldSelection(GetActivePage());
e.SetEventObject(this);
GetEventHandler()->ProcessEvent(e);
-
+
m_click_pt.x = evt.m_x;
m_click_pt.y = evt.m_y;
m_click_tab = e.GetSelection();
}
-
+
if (m_hover_button)
{
m_hover_button->cur_state = wxAUI_BUTTON_STATE_PRESSED;
{
if (GetCapture() == this)
ReleaseMouse();
-
+
if (m_is_dragging)
{
wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, m_windowId);
GetEventHandler()->ProcessEvent(evt);
return;
}
-
+
if (m_hover_button)
{
m_hover_button->cur_state = wxAUI_BUTTON_STATE_HOVER;
Refresh();
Update();
-
+
wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, m_windowId);
evt.SetInt(m_hover_button->id);
evt.SetEventObject(this);
GetEventHandler()->ProcessEvent(evt);
}
-
+
m_click_pt = wxDefaultPosition;
m_is_dragging = false;
m_click_tab = -1;
Update();
}
}
-
-
+
+
if (!evt.LeftIsDown() || m_click_pt == wxDefaultPosition)
return;
-
+
if (m_is_dragging)
{
wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, m_windowId);
evt.SetEventObject(this);
GetEventHandler()->ProcessEvent(evt);
return;
- }
-
-
+ }
+
+
int drag_x_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_X);
int drag_y_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_Y);
evt.SetOldSelection(m_click_tab);
evt.SetEventObject(this);
GetEventHandler()->ProcessEvent(evt);
-
+
m_is_dragging = true;
}
}
{
m_tabs = NULL;
m_rect = wxRect(0,0,200,200);
+ m_tab_ctrl_height = 20;
+ }
+
+ void SetTabCtrlHeight(int h)
+ {
+ m_tab_ctrl_height = h;
}
-
+
void DoSetSize(int x, int y,
int width, int height,
int WXUNUSED(sizeFlags = wxSIZE_AUTO))
m_rect = wxRect(x, y, width, height);
DoSizing();
}
-
+
void DoGetClientSize(int* x, int* y) const
{
*x = m_rect.width;
*y = m_rect.height;
}
-
+
+ bool Show( bool WXUNUSED(show = true) ) { return false; }
+
void DoSizing()
{
if (!m_tabs)
return;
-
- int tab_height = wxMin(m_rect.height, 19);
+
+ int tab_height = wxMin(m_rect.height, m_tab_ctrl_height);
m_tab_rect = wxRect(m_rect.x, m_rect.y, m_rect.width, tab_height);
m_tabs->SetSize(m_rect.x, m_rect.y, m_rect.width, tab_height);
m_tabs->SetRect(wxRect(0, 0, m_rect.width, tab_height));
m_tabs->Refresh();
-
+ m_tabs->Update();
+
wxAuiNotebookPageArray& pages = m_tabs->GetPages();
size_t i, page_count = pages.GetCount();
-
+
for (i = 0; i < page_count; ++i)
{
wxAuiNotebookPage& page = pages.Item(i);
page.window->SetSize(m_rect.x, m_rect.y+tab_height, m_rect.width, m_rect.height-tab_height);
-
+
if (page.window->IsKindOf(CLASSINFO(wxTabMDIChildFrame)))
{
wxTabMDIChildFrame* wnd = (wxTabMDIChildFrame*)page.window;
}
}
+ void DoGetSize(int* x, int* y) const
+ {
+ if (x)
+ *x = m_rect.GetWidth();
+ if (y)
+ *y = m_rect.GetHeight();
+ }
+
+ void Update()
+ {
+ // does nothing
+ }
+
public:
wxRect m_rect;
wxRect m_tab_rect;
wxAuiTabCtrl* m_tabs;
+ int m_tab_ctrl_height;
};
wxAuiMultiNotebook::OnTabClicked)
EVT_COMMAND_RANGE(10000, 10100,
wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG,
- wxAuiMultiNotebook::OnTabBeginDrag)
+ wxAuiMultiNotebook::OnTabBeginDrag)
EVT_COMMAND_RANGE(10000, 10100,
wxEVT_COMMAND_AUINOTEBOOK_END_DRAG,
- wxAuiMultiNotebook::OnTabEndDrag)
+ wxAuiMultiNotebook::OnTabEndDrag)
EVT_COMMAND_RANGE(10000, 10100,
wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION,
wxAuiMultiNotebook::OnTabDragMotion)
m_curpage = -1;
m_tab_id_counter = 10000;
m_dummy_wnd = NULL;
+ m_tab_ctrl_height = 20;
}
wxAuiMultiNotebook::wxAuiMultiNotebook(wxWindow *parent,
{
if (!wxControl::Create(parent, id, pos, size, style))
return false;
-
+
InitNotebook();
-
+
return true;
}
// code called by all constructors
void wxAuiMultiNotebook::InitNotebook()
{
+ m_curpage = -1;
+ m_tab_id_counter = 10000;
+ m_dummy_wnd = NULL;
+ m_tab_ctrl_height = 20;
+
m_normal_font = *wxNORMAL_FONT;
m_selected_font = *wxNORMAL_FONT;
m_selected_font.SetWeight(wxBOLD);
-
- m_tab_id_counter = 10000;
-
- m_dummy_wnd = new wxWindow(this, -1, wxPoint(0,0), wxSize(0,0));
+ // choose a default for the tab height
+ wxClientDC dc(this);
+ int tx, ty;
+ dc.SetFont(m_selected_font);
+ dc.GetTextExtent(wxT("ABCDEFGHhijklm"), &tx, &ty);
+ m_tab_ctrl_height = (ty*150)/100;
+
+ m_dummy_wnd = new wxWindow(this, wxID_ANY, wxPoint(0,0), wxSize(0,0));
m_dummy_wnd->SetSize(200, 200);
m_dummy_wnd->Show(false);
-
+
m_mgr.SetManagedWindow(this);
-
+
m_mgr.AddPane(m_dummy_wnd,
wxPaneInfo().Name(wxT("dummy")).Bottom().Show(false));
-
+
m_mgr.Update();
}
{
return InsertPage(GetPageCount(), page, caption, select, bitmap);
}
-
+
bool wxAuiMultiNotebook::InsertPage(size_t page_idx,
wxWindow* page,
const wxString& caption,
active_tabctrl->AddPage(page, info);
else
active_tabctrl->InsertPage(page, info, page_idx);
-
+
DoSizing();
active_tabctrl->DoShowHide();
-
+
if (select)
{
int idx = m_tabs.GetIdxFromWindow(page);
wxASSERT_MSG(idx != -1, wxT("Invalid Page index returned on wxAuiMultiNotebook::InsertPage()"));
-
+
SetSelection(idx);
}
-
+
return true;
}
// and destroys the window as well
bool wxAuiMultiNotebook::DeletePage(size_t page_idx)
{
- wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx);
-
-
+ wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx);
+
+
// 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;
-
+
if (new_idx >= 0 && new_idx < (int)ctrl->GetPageCount())
{
wxWindow* new_wnd = ctrl->GetWindowFromIdx(new_idx);
break;
}
}
-
+
if (!found)
m_curpage = -1;
}
-
-
+
+
// remove the tab from main catalog
if (!m_tabs.RemovePage(wnd))
return false;
-
+
// remove the tab from the onscreen tab ctrl
ctrl->RemovePage(wnd);
-
+
// actually destroy the window now
if (wnd->IsKindOf(CLASSINFO(wxTabMDIChildFrame)))
{
{
wnd->Destroy();
}
-
+
RemoveEmptyTabFrames();
-
+
return true;
}
wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx);
if (!m_tabs.RemovePage(wnd))
return false;
-
+
// remove the tab from the onscreen tab ctrl
wxAuiTabCtrl* ctrl;
int ctrl_idx;
ctrl->RemovePage(wnd);
return true;
}
-
+
return false;
}
// SetPageText() changes the tab caption of the specified page
bool wxAuiMultiNotebook::SetPageText(size_t page_idx, const wxString& text)
-{
+{
if (page_idx >= m_tabs.GetPageCount())
return false;
-
+
// update our own tab catalog
wxAuiNotebookPage& page_info = m_tabs.GetPage(page_idx);
page_info.caption = text;
-
+
// update what's on screen
wxAuiTabCtrl* ctrl;
int ctrl_idx;
wxAuiNotebookPage& info = ctrl->GetPage(ctrl_idx);
info.caption = text;
ctrl->Refresh();
+ ctrl->Update();
}
-
-
+
return true;
}
wxWindow* wnd = m_tabs.GetWindowFromIdx(new_page);
if (!wnd)
return m_curpage;
-
+
wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
evt.SetSelection(new_page);
evt.SetOldSelection(m_curpage);
wxAuiTabCtrl* ctrl;
int ctrl_idx;
if (FindTab(wnd, &ctrl, &ctrl_idx))
- {
+ {
m_tabs.SetActivePage(wnd);
-
+
ctrl->SetActivePage(ctrl_idx);
DoSizing();
ctrl->DoShowHide();
-
+
int old_curpage = m_curpage;
m_curpage = new_page;
}
wnd->SetFocus();
-
+
return old_curpage;
}
}
wxWindow* wxAuiMultiNotebook::GetPage(size_t page_idx) const
{
wxASSERT(page_idx < m_tabs.GetPageCount());
-
+
return m_tabs.GetWindowFromIdx(page_idx);
}
{
wxAuiTabCtrl* ctrl;
int idx;
-
+
// find the tab ctrl with the current page
if (FindTab(m_tabs.GetPage(m_curpage).window,
&ctrl, &idx))
- {
+ {
return ctrl;
}
}
-
+
// no current page, just find the first tab ctrl
wxPaneInfoArray& all_panes = m_mgr.GetAllPanes();
size_t i, pane_count = all_panes.GetCount();
{
if (all_panes.Item(i).name == wxT("dummy"))
continue;
-
+
wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window;
return tabframe->m_tabs;
}
-
+
// If there is no tabframe at all, create one
wxTabFrame* tabframe = new wxTabFrame;
+ tabframe->SetTabCtrlHeight(m_tab_ctrl_height);
tabframe->m_tabs = new wxAuiTabCtrl(this,
m_tab_id_counter++,
wxDefaultPosition,
wxDefaultSize,
wxNO_BORDER);
m_mgr.AddPane(tabframe,
- wxPaneInfo().Center().CaptionVisible(false));
-
+ wxPaneInfo().Center().CaptionVisible(false));
+
m_mgr.Update();
-
+
return tabframe->m_tabs;
}
{
if (all_panes.Item(i).name == wxT("dummy"))
continue;
-
+
wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window;
-
+
int page_idx = tabframe->m_tabs->GetIdxFromWindow(page);
if (page_idx != -1)
{
return true;
}
}
-
+
return false;
}
void wxAuiMultiNotebook::OnTabClicked(wxCommandEvent& command_evt)
{
wxAuiNotebookEvent& evt = (wxAuiNotebookEvent&)command_evt;
-
+
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);
-
+
SetSelection(idx);
}
wxPoint screen_pt = ::wxGetMousePosition();
wxPoint client_pt = ScreenToClient(screen_pt);
wxPoint zero(0,0);
-
+
wxAuiTabCtrl* src_tabs = (wxAuiTabCtrl*)evt.GetEventObject();
-
+
wxAuiTabCtrl* tab_ctrl = GetTabCtrlFromPoint(client_pt);
if (tab_ctrl == src_tabs)
{
m_mgr.HideHint();
return;
}
-
+
if (tab_ctrl)
{
wxRect hint_rect = tab_ctrl->GetRect();
wxAuiNotebookEvent& evt = (wxAuiNotebookEvent&)command_evt;
m_mgr.HideHint();
-
+
// get the mouse position, which will be used to determine the drop point
wxPoint mouse_screen_pt = ::wxGetMousePosition();
// the src tab control is the control that fired this event
wxAuiTabCtrl* src_tabs = (wxAuiTabCtrl*)evt.GetEventObject();
wxAuiTabCtrl* dest_tabs = NULL;
-
+
// If the pointer is in an existing tab frame, do a tab insert
wxWindow* hit_wnd = ::wxFindWindowAtPoint(mouse_screen_pt);
if (tab_frame)
{
dest_tabs = tab_frame->m_tabs;
-
+
if (dest_tabs == src_tabs)
return;
}
{
// If there is no tabframe at all, create one
wxTabFrame* new_tabs = new wxTabFrame;
+ new_tabs->SetTabCtrlHeight(m_tab_ctrl_height);
new_tabs->m_tabs = new wxAuiTabCtrl(this,
m_tab_id_counter++,
wxDefaultPosition,
m_mgr.Update();
dest_tabs = new_tabs->m_tabs;
}
-
-
-
+
+
+
// remove the page from the source tabs
wxAuiNotebookPage page_info = src_tabs->GetPage(evt.GetSelection());
page_info.active = false;
src_tabs->Refresh();
}
-
-
+
+
// add the page to the destination tabs
dest_tabs->AddPage(page_info.window, page_info);
-
+
if (src_tabs->GetPageCount() == 0)
- {
+ {
RemoveEmptyTabFrames();
}
-
+
DoSizing();
dest_tabs->DoShowHide();
dest_tabs->Refresh();
{
if (all_panes.Item(i).name == wxT("dummy"))
continue;
-
+
wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window;
if (tabframe->m_tab_rect.Inside(pt))
return tabframe->m_tabs;
}
-
+
return NULL;
}
{
if (all_panes.Item(i).name == wxT("dummy"))
continue;
-
+
wxTabFrame* tabframe = (wxTabFrame*)all_panes.Item(i).window;
if (tabframe->m_tabs == tab_ctrl)
{
return tabframe;
}
}
-
+
return NULL;
}
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();
if (tab_frame->m_tabs->GetPageCount() == 0)
{
m_mgr.DetachPane(tab_frame);
-
+
// use pending delete because sometimes during
// window closing, refreshs are pending
if (!wxPendingDelete.Member(tab_frame->m_tabs))
- wxPendingDelete.Append(tab_frame->m_tabs);
+ wxPendingDelete.Append(tab_frame->m_tabs);
//tab_frame->m_tabs->Destroy();
-
+
delete tab_frame;
must_update = true;
}
}
-
-
+
+
// check to see if there is still a center pane;
// if there isn't, make a frame the center pane
wxPaneInfoArray panes = m_mgr.GetAllPanes();
must_update = true;
}
- m_mgr.Update();
+ m_mgr.Update();
}
void wxAuiMultiNotebook::OnChildFocus(wxChildFocusEvent& evt)
int idx = m_tabs.GetIdxFromWindow(evt.GetWindow());
if (idx != -1 && idx != m_curpage)
{
- SetSelection(idx);
+ SetSelection(idx);
}
}
{
wxAuiNotebookEvent& evt = (wxAuiNotebookEvent&)command_evt;
wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject();
-
+
int button_id = evt.GetInt();
-
+
if (button_id == wxAuiButtonClose)
{
int selection = tabs->GetActivePage();
-
+
if (selection != -1)
{
wxWindow* close_wnd = tabs->GetWindowFromIdx(selection);
-
+
if (close_wnd->IsKindOf(CLASSINFO(wxTabMDIChildFrame)))
{
close_wnd->Close();
projects / wxWidgets.git / blobdiff