#pragma hdrstop
#endif
-#include <wx/string.h>
-#include <wx/log.h>
-#include <wx/imaglist.h>
-#include <wx/generic/notebook.h>
-#include <wx/dcclient.h>
+#include "wx/string.h"
+#include "wx/log.h"
+#include "wx/settings.h"
+#include "wx/generic/imaglist.h"
+#include "wx/notebook.h"
+#include "wx/dcclient.h"
// ----------------------------------------------------------------------------
// macros
// event table
// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARIES
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
+
BEGIN_EVENT_TABLE(wxNotebook, wxControl)
EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
EVT_SIZE(wxNotebook::OnSize)
IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
-#endif
// ============================================================================
// implementation
void wxNotebook::Init()
{
m_tabView = (wxNotebookTabView*) NULL;
- m_pImageList = NULL;
m_nSelection = -1;
}
if (!wxWindow::Create(parent, id, pos, size, style|wxNO_BORDER, name))
return FALSE;
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
SetTabView(new wxNotebookTabView(this));
// ----------------------------------------------------------------------------
// wxNotebook accessors
// ----------------------------------------------------------------------------
-int wxNotebook::GetPageCount() const
-{
- return m_aPages.Count();
-}
-
int wxNotebook::GetRowCount() const
{
// TODO
wxASSERT( IS_VALID_PAGE(nPage) );
+#if defined (__WIN16__)
+ m_tabView->SetTabSelection(nPage);
+#else
wxNotebookPage* pPage = GetPage(nPage);
m_tabView->SetTabSelection((int) (long) pPage);
-
+#endif
// TODO
return 0;
}
+#if 0
void wxNotebook::AdvanceSelection(bool bForward)
{
int nSel = GetSelection();
else
SetSelection(nSel == 0 ? nMax : nSel - 1);
}
+#endif
bool wxNotebook::SetPageText(int nPage, const wxString& strText)
{
wxASSERT( IS_VALID_PAGE(nPage) );
-
+#if defined (__WIN16__)
+ m_tabView->SetTabText(nPage, strText);
+ Refresh();
+ return TRUE;
+#else
wxNotebookPage* page = GetPage(nPage);
if (page)
{
Refresh();
return TRUE;
}
-
+#endif
return FALSE;
}
{
wxASSERT( IS_VALID_PAGE(nPage) );
+#if defined (__WIN16__)
+ return m_tabView->GetTabText(nPage);
+#else
wxNotebookPage* page = ((wxNotebook*)this)->GetPage(nPage);
if (page)
return m_tabView->GetTabText((int) (long) page);
else
return wxEmptyString;
+#endif
}
int wxNotebook::GetPageImage(int nPage) const
return FALSE;
}
-void wxNotebook::SetImageList(wxImageList* imageList)
-{
- m_pImageList = imageList;
+// set the size (the same for all pages)
+void wxNotebook::SetPageSize(const wxSize& size)
+{
+ // TODO
+}
+
+// set the padding between tabs (in pixels)
+void wxNotebook::SetPadding(const wxSize& padding)
+{
+ // TODO
+}
+
+// set the size of the tabs for wxNB_FIXEDWIDTH controls
+void wxNotebook::SetTabSize(const wxSize& sz)
+{
// TODO
}
if (m_nSelection != -1)
{
- m_aPages[m_nSelection]->Show(FALSE);
- m_aPages[m_nSelection]->Lower();
+ m_pages[m_nSelection]->Show(FALSE);
+ m_pages[m_nSelection]->Lower();
}
wxNotebookPage* pPage = GetPage(nPage);
+#if defined (__WIN16__)
+ m_tabView->RemoveTab(nPage);
+#else
m_tabView->RemoveTab((int) (long) pPage);
+#endif
- delete m_aPages[nPage];
- m_aPages.Remove(nPage);
+ m_pages.Remove(pPage);
+ delete pPage;
- if (m_aPages.GetCount() == 0)
+ if (m_pages.GetCount() == 0)
{
m_nSelection = -1;
m_tabView->SetTabSelection(-1, FALSE);
else if (m_nSelection > -1)
{
m_nSelection = -1;
+#if defined (__WIN16__)
+ m_tabView->SetTabSelection(0, FALSE);
+#else
m_tabView->SetTabSelection((int) (long) GetPage(0), FALSE);
+#endif
if (m_nSelection != 0)
ChangePage(-1, 0);
}
{
wxCHECK( IS_VALID_PAGE(nPage), FALSE );
- m_aPages[nPage]->Show(FALSE);
- // m_aPages[nPage]->Lower();
+ m_pages[nPage]->Show(FALSE);
+ // m_pages[nPage]->Lower();
wxNotebookPage* pPage = GetPage(nPage);
+#if defined (__WIN16__)
+ m_tabView->RemoveTab(nPage);
+#else
m_tabView->RemoveTab((int) (long) pPage);
+#endif
- m_aPages.Remove(nPage);
+ m_pages.Remove(pPage);
- if (m_aPages.GetCount() == 0)
+ if (m_pages.GetCount() == 0)
{
m_nSelection = -1;
m_tabView->SetTabSelection(-1, TRUE);
int nPageCount = GetPageCount();
int nPage;
for ( nPage = 0; nPage < nPageCount; nPage++ )
- if (m_aPages[nPage] == page)
+ if (m_pages[nPage] == page)
return nPage;
return -1;
}
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();
return TRUE;
}
-// add a page to the notebook
-bool wxNotebook::AddPage(wxNotebookPage *pPage,
- const wxString& strText,
- bool bSelect,
- int imageId)
-{
- return InsertPage(GetPageCount(), pPage, strText, bSelect, imageId);
-}
-
// same as AddPage() but does it at given position
bool wxNotebook::InsertPage(int nPage,
wxNotebookPage *pPage,
wxASSERT( pPage != NULL );
wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE );
+// For 16 bit integers (tabs limited to 32768)
+#if defined (__WIN16__)
+ m_tabView->AddTab(nPage, strText);
+#else
m_tabView->AddTab((int) (long) pPage, strText);
+#endif
if (!bSelect)
pPage->Show(FALSE);
// save the pointer to the page
- m_aPages.Insert(pPage, nPage);
+ m_pages.Insert(pPage, nPage);
if (bSelect)
{
// This will cause ChangePage to be called, via OnSelPage
+#if defined (__WIN16__)
+ m_tabView->SetTabSelection(nPage, TRUE);
+#else
m_tabView->SetTabSelection((int) (long) pPage, TRUE);
+#endif
}
// some page must be selected: either this one or the first one if there is
rect.y = tabHeight + 4;
rect.width = cw - 8;
rect.height = ch - 4 - rect.y ;
-
+
m_tabView->SetViewRect(rect);
- m_tabView->Layout();
+ m_tabView->LayoutTabs();
// Need to do it a 2nd time to get the tab height with
// the new view width, since changing the view width changes the
rect.y = tabHeight + 4;
rect.width = cw - 8;
rect.height = ch - 4 - rect.y ;
-
+
m_tabView->SetViewRect(rect);
- m_tabView->Layout();
+ m_tabView->LayoutTabs();
if (!force && (rect == oldRect))
return FALSE;
// fit the notebook page to the tab control's display area
- unsigned int nCount = m_aPages.Count();
+ unsigned int nCount = m_pages.Count();
for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) {
- wxNotebookPage *pPage = m_aPages[nPage];
+ wxNotebookPage *pPage = m_pages[nPage];
if (pPage->IsShown())
{
wxRect clientRect = GetAvailableClientSize();
{
// 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();
}
return TRUE;
}
-void wxNotebook::Command(wxCommandEvent& event)
+void wxNotebook::Command(wxCommandEvent& WXUNUSED(event))
{
wxFAIL_MSG("wxNotebook::Command not implemented");
}
wxASSERT( nOldSel != nSel ); // impossible
if ( nOldSel != -1 ) {
- m_aPages[nOldSel]->Show(FALSE);
- m_aPages[nOldSel]->Lower();
+ m_pages[nOldSel]->Show(FALSE);
+ m_pages[nOldSel]->Lower();
}
- wxNotebookPage *pPage = m_aPages[nSel];
+ wxNotebookPage *pPage = m_pages[nSel];
wxRect clientRect = GetAvailableClientSize();
pPage->SetSize(clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+ Refresh();
+
pPage->Show(TRUE);
pPage->Raise();
pPage->SetFocus();
- Refresh();
-
m_nSelection = nSel;
}
/*
* wxNotebookTabView
*/
-
+
IMPLEMENT_CLASS(wxNotebookTabView, wxTabView)
wxNotebookTabView::wxNotebookTabView(wxNotebook *notebook, long style): wxTabView(style)
wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_notebook->GetId());
+#if defined (__WIN16__)
+ int activatePos = activateId;
+ int deactivatePos = deactivateId;
+#else
// Translate from wxTabView's ids (which aren't position-dependent)
// to wxNotebook's (which are).
wxNotebookPage* pActive = (wxNotebookPage*) activateId;
int activatePos = m_notebook->FindPagePosition(pActive);
int deactivatePos = m_notebook->FindPagePosition(pDeactive);
+#endif
event.SetEventObject(m_notebook);
event.SetSelection(activatePos);
event.SetOldSelection(deactivatePos);
projects / wxWidgets.git / blobdiff