// implementation
// ============================================================================
-IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxBookCtrlBase)
-
// ----------------------------------------------------------------------------
// wxNotebook creation
// ----------------------------------------------------------------------------
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), false, wxT("invalid notebook page") );
- wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), false,
- wxT("invalid image index in SetPageImage()") );
+ wxCHECK_MSG( HasImageList() && nImage < GetImageList()->GetImageCount(),
+ false, wxT("invalid image index in SetPageImage()") );
if ( nImage != m_images[nPage] )
{
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("invalid notebook page") );
- if ( (size_t)nPage == m_selection )
+ if ( (int)nPage == m_selection )
{
// don't do anything if there is nothing to do
return m_selection;
// otherwise the previously selected tab wouldn't be redrawn properly under
// wxGTK which calls Refresh() immediately and not during the next event
// loop iteration as wxMSW does and as it should
- size_t selOld = m_selection;
+ int selOld = m_selection;
m_selection = nPage;
m_spinbtn->SetValue(m_selection);
}
- if ( m_selection < m_firstVisible )
+ if ( nPage < m_firstVisible )
{
// selection is to the left of visible part of tabs
- ScrollTo(m_selection);
+ ScrollTo(nPage);
}
- else if ( m_selection > m_lastFullyVisible )
+ else if ( nPage > m_lastFullyVisible )
{
// selection is to the right of visible part of tabs
- ScrollLastTo(m_selection);
+ ScrollLastTo(nPage);
}
else // we already see this tab
{
// no need to scroll
- RefreshTab(m_selection);
+ RefreshTab(nPage);
}
- m_pages[m_selection]->SetSize(GetPageRect());
- m_pages[m_selection]->Show();
+ m_pages[nPage]->SetSize(GetPageRect());
+ m_pages[nPage]->Show();
}
if ( flags & SetSelection_SendEvent )
size_t count = GetPageCount();
if ( count )
{
- if ( m_selection == (size_t)nPage )
+ wxASSERT_MSG( m_selection != wxNOT_FOUND, "should have selection" );
+
+ if ( (size_t)m_selection == nPage )
{
// avoid sending event to this page which doesn't exist in the
// notebook any more
SetSelection(nPage == count ? nPage - 1 : nPage);
}
- else if ( m_selection > (size_t)nPage )
+ else if ( (size_t)m_selection > nPage )
{
// no need to change selection, just adjust the index
m_selection--;
wxCHECK_RET( IS_VALID_PAGE(page), wxT("invalid notebook page") );
wxRect rect = GetTabRect(page);
- if ( forceSelected || ((size_t)page == m_selection) )
+ if ( forceSelected || (page == m_selection) )
{
const wxSize indent = GetRenderer()->GetTabIndent();
rect.Inflate(indent.x, indent.y);
// used for wxUniversal under MSW
#if 0 // def __WXMSW__ // FIXME
int w, h;
- m_imageList->GetSize(n, w, h);
+ GetImageList()->GetSize(n, w, h);
bmp.Create(w, h);
wxMemoryDC dc;
dc.SelectObject(bmp);
dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
- m_imageList->Draw(image, dc, 0, 0, wxIMAGELIST_DRAW_NORMAL, true);
+ GetImageList()->Draw(image, dc, 0, 0, wxIMAGELIST_DRAW_NORMAL, true);
dc.SelectObject(wxNullBitmap);
#else
- bmp = m_imageList->GetBitmap(image);
+ bmp = GetImageList()->GetBitmap(image);
#endif
}
int flags = 0;
- if ( n == m_selection )
+ if ( (int)n == m_selection )
{
flags |= wxCONTROL_SELECTED;
{
GetTabSize(n, &rect.width, &rect.height);
- if ( n == m_selection )
+ if ( (int)n == m_selection )
{
// don't redraw it now as this tab has to be drawn over the other
// ones as it takes more place and spills over to them
if ( HasImage(page) )
{
wxSize sizeImage;
- m_imageList->GetSize(m_images[page], sizeImage.x, sizeImage.y);
+ GetImageList()->GetSize(m_images[page], sizeImage.x, sizeImage.y);
size.x += sizeImage.x + 5; // FIXME: hard coded margin
// is needed here)
if ( HasSpinBtn() )
{
- if ( m_selection < m_firstVisible )
+ const size_t selection = m_selection;
+ if ( selection < m_firstVisible )
{
// selection is to the left of visible part of tabs
- ScrollTo(m_selection);
+ ScrollTo(selection);
}
- else if ( m_selection > m_lastFullyVisible )
+ else if ( selection > m_lastFullyVisible )
{
// selection is to the right of visible part of tabs
- ScrollLastTo(m_selection);
+ ScrollLastTo(selection);
}
}
}
// wxNotebook scrolling
// ----------------------------------------------------------------------------
-void wxNotebook::ScrollTo(int page)
+void wxNotebook::ScrollTo(size_t page)
{
wxCHECK_RET( IS_VALID_PAGE(page), wxT("invalid notebook page") );
// set the first visible tab and offset (easy)
- m_firstVisible = (size_t)page;
+ m_firstVisible = page;
m_offset = 0;
for ( size_t n = 0; n < m_firstVisible; n++ )
{
RefreshAllTabs();
}
-void wxNotebook::ScrollLastTo(int page)
+void wxNotebook::ScrollLastTo(size_t page)
{
wxCHECK_RET( IS_VALID_PAGE(page), wxT("invalid notebook page") );
// wxNotebook sizing/moving
// ----------------------------------------------------------------------------
-wxSize wxNotebook::DoGetBestClientSize() const
-{
- // calculate the max page size
- wxSize size;
-
- size_t count = GetPageCount();
- if ( count )
- {
- for ( size_t n = 0; n < count; n++ )
- {
- wxSize sizePage = m_pages[n]->GetSize();
-
- if ( size.x < sizePage.x )
- size.x = sizePage.x;
- if ( size.y < sizePage.y )
- size.y = sizePage.y;
- }
- }
- else // no pages
- {
- // use some arbitrary default size
- size.x =
- size.y = 100;
- }
-
- return GetSizeForPage(size);
-}
-
void wxNotebook::DoMoveWindow(int x, int y, int width, int height)
{
wxControl::DoMoveWindow(x, y, width, height);
projects / wxWidgets.git / blobdiff