// headers
// ----------------------------------------------------------------------------
#ifdef __GNUG__
-#pragma implementation "notebook.h"
+ #pragma implementation "notebook.h"
#endif
-#include <wx/string.h>
-#include <wx/log.h>
-#include <wx/imaglist.h>
-#include <wx/notebook.h>
-#include <wx/mac/uma.h>
+#include "wx/string.h"
+#include "wx/log.h"
+#include "wx/imaglist.h"
+#include "wx/notebook.h"
+#include "wx/mac/uma.h"
// ----------------------------------------------------------------------------
// macros
// ----------------------------------------------------------------------------
// check that the page index is valid
#define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount()))
+#ifdef __DARWIN__
+ // I got these values for Mac OS X from the Appearance mgr docs. (Mark Newsam)
+const short kwxMacTabLeftMargin = 20 ;
+const short kwxMacTabTopMargin = 38 ;
+const short kwxMacTabRightMargin = 20 ;
+const short kwxMacTabBottomMargin = 12 ;
+#else
const short kwxMacTabLeftMargin = 16 ;
const short kwxMacTabTopMargin = 30 ;
const short kwxMacTabRightMargin = 16 ;
const short kwxMacTabBottomMargin = 16 ;
+#endif
// ----------------------------------------------------------------------------
// 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)
// common part of all ctors
void wxNotebook::Init()
{
- m_pImageList = NULL;
+#ifdef __DARWIN__
+ m_macHorizontalBorder = 7;
+ m_macVerticalBorder = 8;
+#endif
m_nSelection = -1;
}
MacPreControlCreate( parent , id , "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
- m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1,
+ m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1,
kControlTabSmallProc , (long) this ) ;
MacPostControlCreate() ;
// ----------------------------------------------------------------------------
// wxNotebook accessors
// ----------------------------------------------------------------------------
-int wxNotebook::GetPageCount() const
+
+void wxNotebook::SetPadding(const wxSize& padding)
+{
+ wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") );
+}
+
+void wxNotebook::SetTabSize(const wxSize& sz)
{
- return m_aPages.Count();
+ wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") );
}
-int wxNotebook::GetRowCount() const
+void wxNotebook::SetPageSize(const wxSize& size)
{
- return 1;
+ wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") );
}
int wxNotebook::SetSelection(int nPage)
{
- wxASSERT( IS_VALID_PAGE(nPage) );
+ if( !IS_VALID_PAGE(nPage) )
+ return m_nSelection ;
ChangePage(m_nSelection, nPage);
- SetControlValue( m_macControl , m_nSelection + 1 ) ;
-// Boolean enabled = true ;
-
-// SetControlData( m_macControl, m_nSelection + 1, kControlTabEnabledFlagTag, sizeof( Boolean ), (Ptr)&enabled );
- return m_nSelection;
-}
+ SetControlValue( m_macControl , m_nSelection + 1 ) ;
-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);
+ return m_nSelection;
}
bool wxNotebook::SetPageText(int nPage, const wxString& strText)
{
wxASSERT( IS_VALID_PAGE(nPage) );
- // TODO
- return FALSE;
+ wxNotebookPage *page = m_pages[nPage];
+ page->SetLabel(strText);
+ MacSetupTabs();
+
+ return true;
}
wxString wxNotebook::GetPageText(int nPage) const
{
wxASSERT( IS_VALID_PAGE(nPage) );
- // TODO
- return wxString("");
+ wxNotebookPage *page = m_pages[nPage];
+ return page->GetLabel();
}
int wxNotebook::GetPageImage(int nPage) const
{
- wxASSERT( IS_VALID_PAGE(nPage) );
+ wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") );
- // TODO
- return 0;
+ return 0 ;
}
bool wxNotebook::SetPageImage(int nPage, int nImage)
{
- wxASSERT( IS_VALID_PAGE(nPage) );
+ wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("invalid notebook page") );
- // TODO
- return FALSE;
-}
+ wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), FALSE,
+ _T("invalid image index in SetPageImage()") );
-void wxNotebook::SetImageList(wxImageList* imageList)
-{
- m_pImageList = imageList;
- // TODO
+ return FALSE;
}
// ----------------------------------------------------------------------------
// wxNotebook operations
// ----------------------------------------------------------------------------
-// remove one page from the notebook
-bool wxNotebook::DeletePage(int nPage)
-{
- wxCHECK( IS_VALID_PAGE(nPage), FALSE );
-
- // TODO: delete native widget page
-
- delete m_aPages[nPage];
- m_aPages.Remove(nPage);
-
- return TRUE;
-}
-
// remove one page from the notebook, without deleting the window
-bool wxNotebook::RemovePage(int nPage)
+wxNotebookPage* wxNotebook::DoRemovePage(int nPage)
{
- wxCHECK( IS_VALID_PAGE(nPage), FALSE );
+ wxCHECK( IS_VALID_PAGE(nPage), NULL );
+ wxNotebookPage* page = m_pages[nPage] ;
+ m_pages.RemoveAt(nPage);
- m_aPages.Remove(nPage);
+ MacSetupTabs();
- return TRUE;
+ if(m_nSelection >= GetPageCount()) {
+ m_nSelection = GetPageCount() - 1;
+ }
+ if(m_nSelection >= 0) {
+ m_pages[m_nSelection]->Show(true);
+ }
+ return page;
}
// remove all pages
{
// TODO: delete native widget pages
- int nPageCount = GetPageCount();
- int nPage;
- for ( nPage = 0; nPage < nPageCount; nPage++ )
- delete m_aPages[nPage];
-
- m_aPages.Clear();
+ WX_CLEAR_ARRAY(m_pages) ;
+ MacSetupTabs();
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,
wxASSERT( pPage != NULL );
wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE );
- ControlTabInfoRec tie ;
- Boolean enabled = true ;
- if ( nPage + 1 > GetControlMaximum( m_macControl ) )
- {
- SetControlMaximum( m_macControl , nPage + 1 ) ;
- }
-
- tie.version = 0 ;
- tie.iconSuiteID = 0 ;
- strcpy( (char*) tie.name , strText ) ;
- c2pstr( (char*) tie.name ) ;
- SetControlData( m_macControl, nPage + 1, kControlTabInfoTag , sizeof( ControlTabInfoRec) , (char*) &tie ) ;
- SetControlData( m_macControl, m_nSelection + 1, kControlTabEnabledFlagTag, sizeof( Boolean ), (Ptr)&enabled );
+ pPage->SetLabel(strText);
// save the pointer to the page
- m_aPages.Insert(pPage, nPage);
+ m_pages.Insert(pPage, nPage);
+
+ MacSetupTabs();
- // some page must be selected: either this one or the first one if there is
- // still no selection
- if ( bSelect )
+ if ( bSelect ) {
m_nSelection = nPage;
- else if ( m_nSelection == -1 )
+ }
+ else if ( m_nSelection == -1 ) {
m_nSelection = 0;
+ }
+ else if (m_nSelection >= nPage) {
+ m_nSelection++;
+ }
+ // don't show pages by default (we'll need to adjust their size first)
+ pPage->Show( false ) ;
- // don't show pages by default (we'll need to adjust their size first)
- pPage->Show( FALSE ) ;
+ int h, w;
+ GetSize(&w, &h);
+ pPage->SetSize(kwxMacTabLeftMargin, kwxMacTabTopMargin,
+ w - kwxMacTabLeftMargin - kwxMacTabRightMargin,
+ h - kwxMacTabTopMargin - kwxMacTabBottomMargin );
+ if ( pPage->GetAutoLayout() ) {
+ pPage->Layout();
+ }
- return TRUE;
+ return true;
+}
+
+/* Added by Mark Newsam
+ * When a page is added or deleted to the notebook this function updates
+ * information held in the m_macControl so that it matches the order
+ * the user would expect.
+ */
+void wxNotebook::MacSetupTabs()
+{
+ SetControlMaximum( m_macControl , GetPageCount() ) ;
+
+ wxNotebookPage *page;
+ ControlTabInfoRec info;
+ Boolean enabled = true;
+ for(int ii = 0; ii < GetPageCount(); ii++)
+ {
+ page = m_pages[ii];
+ info.version = 0;
+ info.iconSuiteID = 0;
+#if TARGET_CARBON
+ c2pstrcpy( (StringPtr) info.name , page->GetLabel() ) ;
+#else
+ strcpy( (char *) info.name , page->GetLabel() ) ;
+ c2pstr( (char *) info.name ) ;
+#endif
+ SetControlData( m_macControl, ii+1, kControlTabInfoTag,
+ sizeof( ControlTabInfoRec) , (char*) &info ) ;
+ SetControlData( m_macControl, ii+1, kControlTabEnabledFlagTag,
+ sizeof( Boolean ), (Ptr)&enabled );
+ }
+ Rect bounds;
+ GetControlBounds(m_macControl, &bounds);
+ InvalWindowRect(MacGetRootWindow(), &bounds);
}
// ----------------------------------------------------------------------------
// time because doing it in ::Create() doesn't work (for unknown reasons)
void wxNotebook::OnSize(wxSizeEvent& event)
{
- static bool s_bFirstTime = TRUE;
- if ( s_bFirstTime ) {
- // TODO: any first-time-size processing.
- s_bFirstTime = FALSE;
- }
-
- // TODO: all this may or may not be necessary for your platform
-
// emulate page change (it's esp. important to do it first time because
// otherwise our page would stay invisible)
int nSel = m_nSelection;
int w, h;
GetSize(&w, &h);
- 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];
- pPage->SetSize(kwxMacTabLeftMargin, kwxMacTabTopMargin, w - kwxMacTabLeftMargin - kwxMacTabRightMargin,
- h - kwxMacTabTopMargin - kwxMacTabBottomMargin );
-// pPage->SetSize(0, 0, w, h);
- if ( pPage->GetAutoLayout() )
+ wxNotebookPage *pPage = m_pages[nPage];
+ pPage->SetSize(kwxMacTabLeftMargin, kwxMacTabTopMargin,
+ w - kwxMacTabLeftMargin - kwxMacTabRightMargin,
+ h - kwxMacTabTopMargin - kwxMacTabBottomMargin );
+ if ( pPage->GetAutoLayout() ) {
pPage->Layout();
+ }
}
// Processing continues to next OnSize
{
// 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();
}
// hide the currently active panel and show the new one
void wxNotebook::ChangePage(int nOldSel, int nSel)
{
- // it's not an error (the message may be generated by the tab control itself)
- // and it may happen - just do nothing
- if ( nSel == nOldSel )
- {
- wxNotebookPage *pPage = m_aPages[nSel];
- pPage->Show(FALSE);
- pPage->Show(TRUE);
- pPage->SetFocus();
- return;
- }
+ // it's not an error (the message may be generated by the tab control itself)
+ // and it may happen - just do nothing
+ if ( nSel == nOldSel )
+ {
+ wxNotebookPage *pPage = m_pages[nSel];
+ pPage->Show(FALSE);
+ pPage->Show(TRUE);
+ pPage->SetFocus();
+ return;
+ }
+ // Hide previous page
if ( nOldSel != -1 ) {
- m_aPages[nOldSel]->Show(FALSE);
+ m_pages[nOldSel]->Show(FALSE);
}
- wxNotebookPage *pPage = m_aPages[nSel];
+ wxNotebookPage *pPage = m_pages[nSel];
pPage->Show(TRUE);
pPage->SetFocus();
projects / wxWidgets.git / blobdiff