#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
+#if wxUSE_NOTEBOOK
+
// wxWindows
#ifndef WX_PRECOMP
#include "wx/string.h"
#endif
#endif
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
#include <commctrl.h>
#endif
// common part of all ctors
void wxNotebook::Init()
{
- m_pImageList = NULL;
m_bOwnsImageList = FALSE;
+ m_imageList = NULL;
m_nSelection = -1;
}
long tabStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | TCS_TABS;
+ if ( m_windowStyle & wxCLIP_SIBLINGS )
+ tabStyle |= WS_CLIPSIBLINGS;
if (m_windowStyle & wxCLIP_CHILDREN)
tabStyle |= WS_CLIPCHILDREN;
if ( m_windowStyle & wxTC_MULTILINE )
// dtor
wxNotebook::~wxNotebook()
{
- if (m_bOwnsImageList) delete m_pImageList;
+ if (m_bOwnsImageList)
+ delete m_imageList;
}
// ----------------------------------------------------------------------------
int wxNotebook::GetPageCount() const
{
// consistency check
- wxASSERT( (int)m_aPages.Count() == TabCtrl_GetItemCount(m_hwnd) );
+ wxASSERT( (int)m_pages.Count() == TabCtrl_GetItemCount(m_hwnd) );
- return m_aPages.Count();
+ return m_pages.Count();
}
int wxNotebook::GetRowCount() const
return TabCtrl_SetCurSel(m_hwnd, nPage);
}
-void wxNotebook::AdvanceSelection(bool bForward)
-{
- int nSel = GetSelection();
- int nMax = GetPageCount() - 1;
- if ( bForward )
- SetSelection(nSel == nMax ? 0 : nSel + 1);
- else
- SetSelection(nSel == 0 ? nMax : nSel - 1);
-}
-
bool wxNotebook::SetPageText(int nPage, const wxString& strText)
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") );
void wxNotebook::SetImageList(wxImageList* imageList)
{
- if (m_bOwnsImageList) delete m_pImageList;
- m_pImageList = imageList;
+ if ( m_bOwnsImageList )
+ {
+ delete m_imageList;
+ }
+
m_bOwnsImageList = FALSE;
+ m_imageList = imageList;
+
TabCtrl_SetImageList(m_hwnd, (HIMAGELIST)imageList->GetHIMAGELIST());
}
TabCtrl_DeleteItem(m_hwnd, nPage);
- delete m_aPages[nPage];
- m_aPages.Remove(nPage);
+ delete m_pages[nPage];
+ m_pages.Remove(nPage);
- if ( m_aPages.IsEmpty() ) {
+ if ( m_pages.IsEmpty() ) {
// no selection if the notebook became empty
m_nSelection = -1;
}
}
// remove one page from the notebook, without deleting
-bool wxNotebook::RemovePage(int nPage)
+wxNotebookPage *wxNotebook::DoRemovePage(int nPage)
{
- wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") );
+ wxCHECK_MSG( IS_VALID_PAGE(nPage), NULL, wxT("notebook page out of range") );
TabCtrl_DeleteItem(m_hwnd, nPage);
- m_aPages.Remove(nPage);
+ wxNotebookPage *pageRemoved = m_pages[nPage];
+ m_pages.Remove(nPage);
- if ( m_aPages.IsEmpty() )
- m_nSelection = -1;
- else
- m_nSelection = TabCtrl_GetCurSel(m_hwnd);
+ if ( m_pages.IsEmpty() )
+ m_nSelection = -1;
+ else
+ m_nSelection = TabCtrl_GetCurSel(m_hwnd);
- return TRUE;
+ return pageRemoved;
}
// remove all pages
int nPageCount = GetPageCount();
int nPage;
for ( nPage = 0; nPage < nPageCount; nPage++ )
- delete m_aPages[nPage];
+ delete m_pages[nPage];
- m_aPages.Clear();
+ m_pages.Clear();
TabCtrl_DeleteAllItems(m_hwnd);
}
// save the pointer to the page
- m_aPages.Insert(pPage, nPage);
+ m_pages.Insert(pPage, nPage);
// don't show pages by default (we'll need to adjust their size first)
HWND hwnd = GetWinHwnd(pPage);
int width = rc.right - rc.left,
height = rc.bottom - rc.top;
- size_t nCount = m_aPages.Count();
+ size_t nCount = m_pages.Count();
for ( size_t nPage = 0; nPage < nCount; nPage++ ) {
- wxNotebookPage *pPage = m_aPages[nPage];
+ wxNotebookPage *pPage = m_pages[nPage];
pPage->SetSize(rc.left, rc.top, width, height);
}
{
int sel = event.GetOldSelection();
if ( sel != -1 )
- m_aPages[sel]->Show(FALSE);
+ m_pages[sel]->Show(FALSE);
sel = event.GetSelection();
if ( sel != -1 )
{
- wxNotebookPage *pPage = m_aPages[sel];
+ wxNotebookPage *pPage = m_pages[sel];
pPage->Show(TRUE);
pPage->SetFocus();
}
// set focus to the currently selected page if any
if ( m_nSelection != -1 )
- m_aPages[m_nSelection]->SetFocus();
+ m_pages[m_nSelection]->SetFocus();
event.Skip();
}
// and is being propagated downwards
event.SetEventObject(this);
- wxWindow *page = m_aPages[m_nSelection];
+ wxWindow *page = m_pages[m_nSelection];
if ( !page->GetEventHandler()->ProcessEvent(event) )
{
page->SetFocus();
event.SetSelection(nSel);
event.SetOldSelection(nOldSel);
event.SetEventObject(this);
- if ( ProcessEvent(event) && !event.IsAllowed() )
+ if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() )
{
// program doesn't allow the page change
s_bInsideChangePage = FALSE;
}
event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
- ProcessEvent(event);
+ GetEventHandler()->ProcessEvent(event);
s_bInsideChangePage = FALSE;
}
+
+#endif // wxUSE_NOTEBOOK