// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "listbook.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = wxNewEventType();
const int wxID_LISTBOOKLISTVIEW = wxNewId();
-BEGIN_EVENT_TABLE(wxListbook, wxBookCtrl)
+BEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase)
EVT_SIZE(wxListbook::OnSize)
EVT_LIST_ITEM_SELECTED(wxID_LISTBOOKLISTVIEW, wxListbook::OnListSelected)
END_EVENT_TABLE()
#ifdef __WXMSW__
// On XP with themes enabled the GetViewRect used in GetListSize to
// determine the space needed for the list view will incorrectly return
- // (0,0,0,0) the first time. So send a pending event so OnSize wiull be
+ // (0,0,0,0) the first time. So send a pending event so OnSize will be
// called again after the window is ready to go. Technically we don't
// need to do this on non-XP windows, but if things are already sized
// correctly then nothing changes and so there is no harm.
wxSize wxListbook::GetListSize() const
{
const wxSize sizeClient = GetClientSize(),
- sizeList = m_list->GetViewRect().GetSize();
+ sizeBorder = m_list->GetSize() - m_list->GetClientSize(),
+ sizeList = m_list->GetViewRect().GetSize() + sizeBorder;
wxSize size;
if ( IsVertical() )
{
const wxSize sizeList = m_list->GetSize();
- wxRect rectPage(wxPoint(0, 0), GetClientSize());
+ wxPoint pt;
+ wxRect rectPage(pt, GetClientSize());
switch ( GetWindowStyle() & wxLB_ALIGN_MASK )
{
default:
return;
}
+ // arrange the icons before calling SetClientSize(), otherwise it wouldn't
+ // account for the scrollbars the list control might need and, at least
+ // under MSW, we'd finish with an ugly looking list control with both
+ // vertical and horizontal scrollbar (with one of them being added because
+ // the other one is not accounted for in client size computations)
+ m_list->Arrange();
+
// resize the list control and the page area to fit inside our new size
const wxSize sizeClient = GetClientSize(),
+ sizeBorder = m_list->GetSize() - m_list->GetClientSize(),
sizeList = GetListSize();
+ m_list->SetClientSize( sizeList.x - sizeBorder.x, sizeList.y - sizeBorder.y );
+
+ const wxSize sizeNew = m_list->GetSize();
wxPoint posList;
switch ( GetWindowStyle() & wxLB_ALIGN_MASK )
{
break;
case wxLB_BOTTOM:
- posList.y = sizeClient.y - sizeList.y;
+ posList.y = sizeClient.y - sizeNew.y;
break;
case wxLB_RIGHT:
- posList.x = sizeClient.x - sizeList.x;
+ posList.x = sizeClient.x - sizeNew.x;
break;
}
- m_list->Move(posList.x, posList.y);
- m_list->SetClientSize(sizeList.x, sizeList.y);
+ if ( m_list->GetPosition() != posList )
+ m_list->Move(posList);
#if wxUSE_LINE_IN_LISTBOOK
if ( m_line )
{
- wxRect rectLine(wxPoint(0, 0), sizeClient);
+ wxRect rectLine(sizeClient);
switch ( GetWindowStyle() & wxLB_ALIGN_MASK )
{
case wxLB_TOP:
- rectLine.y = sizeList.y + 1;
+ rectLine.y = sizeNew.y + 1;
rectLine.height = MARGIN - 2;
break;
case wxLB_BOTTOM:
rectLine.height = MARGIN - 2;
- rectLine.y = sizeClient.y - sizeList.y - rectLine.height;
+ rectLine.y = sizeClient.y - sizeNew.y - rectLine.height;
break;
case wxLB_LEFT:
- rectLine.x = sizeList.x + 1;
+ rectLine.x = sizeNew.x + 1;
rectLine.width = MARGIN - 2;
break;
case wxLB_RIGHT:
rectLine.width = MARGIN - 2;
- rectLine.x = sizeClient.x - sizeList.x - rectLine.width;
+ rectLine.x = sizeClient.x - sizeNew.x - rectLine.width;
break;
}
wxWindow *page = m_pages[m_selection];
wxCHECK_RET( page, _T("NULL page in wxListbook?") );
page->SetSize(GetPageRect());
- }
+ }
}
wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const
{
wxFAIL_MSG( _T("wxListbook::GetPageImage() not implemented") );
- return -1;
+ return wxNOT_FOUND;
}
bool wxListbook::SetPageImage(size_t n, int imageId)
{
- return m_list->SetItemImage(n, imageId, imageId);
+ return m_list->SetItemImage(n, imageId);
}
// ----------------------------------------------------------------------------
{
m_list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
- wxBookCtrl::SetImageList(imageList);
+ wxBookCtrlBase::SetImageList(imageList);
}
// ----------------------------------------------------------------------------
page->SetSize(GetPageRect());
page->Show();
+ // change m_selection now to ignore the selection change event
m_selection = n;
m_list->Select(n);
m_list->Focus(n);
bool bSelect,
int imageId)
{
- if ( !wxBookCtrl::InsertPage(n, page, text, bSelect, imageId) )
+ if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) )
return false;
m_list->InsertItem(n, text, imageId);
- // we should always have some selection if possible
- if ( bSelect || (m_selection == wxNOT_FOUND) )
+ // if the inserted page is before the selected one, we must update the
+ // index of the selected page
+ if ( int(n) <= m_selection )
{
- SetSelection(n);
+ // one extra page added
+ m_selection++;
+ m_list->Select(m_selection);
+ m_list->Focus(m_selection);
}
- else // don't select this page
- {
- // it will be shown only when selected
+
+ // some page should be selected: either this one or the first one if there
+ // is still no selection
+ int selNew = -1;
+ if ( bSelect )
+ selNew = n;
+ else if ( m_selection == -1 )
+ selNew = 0;
+
+ if ( selNew != m_selection )
page->Hide();
- }
+
+ if ( selNew != -1 )
+ SetSelection(selNew);
InvalidateBestSize();
+ m_list->Arrange();
return true;
}
wxWindow *wxListbook::DoRemovePage(size_t page)
{
const int page_count = GetPageCount();
- wxWindow *win = wxBookCtrl::DoRemovePage(page);
+ wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
if ( win )
{
if ((sel != wxNOT_FOUND) && (sel != m_selection))
SetSelection(sel);
}
+
+ m_list->Arrange();
}
return win;
bool wxListbook::DeleteAllPages()
{
m_list->DeleteAllItems();
- return wxBookCtrl::DeleteAllPages();
+ return wxBookCtrlBase::DeleteAllPages();
}
// ----------------------------------------------------------------------------
void wxListbook::OnListSelected(wxListEvent& eventList)
{
const int selNew = eventList.GetIndex();
- const int selOld = m_selection;
if ( selNew == m_selection )
{
return;
}
- // first send "change in progress" event which may be vetoed by user
- wxListbookEvent eventIng(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, GetId());
+ SetSelection(selNew);
- eventIng.SetEventObject(this);
- eventIng.SetSelection(selNew);
- eventIng.SetOldSelection(selOld);
- if ( GetEventHandler()->ProcessEvent(eventIng) && !eventIng.IsAllowed() )
+ // change wasn't allowed, return to previous state
+ if (m_selection != selNew)
{
m_list->Select(m_selection);
- return;
+ m_list->Focus(m_selection);
}
-
- // change allowed: do change the page and notify the user about it
- SetSelection(selNew);
-
- wxListbookEvent eventEd(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, GetId());
-
- eventEd.SetEventObject(this);
- eventEd.SetSelection(selNew);
- eventEd.SetOldSelection(selOld);
-
- (void)GetEventHandler()->ProcessEvent(eventEd);
}
#endif // wxUSE_LISTBOOK
projects / wxWidgets.git / blobdiff