// 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 __WXMAC_X__
- // 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
+static bool constantsSet = false ;
+
+ short kwxMacTabLeftMargin = 0 ;
+ short kwxMacTabTopMargin = 0 ;
+ short kwxMacTabRightMargin = 0 ;
+ short kwxMacTabBottomMargin = 0 ;
// ----------------------------------------------------------------------------
// event table
// common part of all ctors
void wxNotebook::Init()
{
-#ifdef __WXMAC_X__
- m_macHorizontalBorder = 7;
- m_macVerticalBorder = 8;
-#endif
- m_pImageList = NULL;
+ if ( !constantsSet )
+ {
+ if ( UMAHasAquaLayout() )
+ {
+ // I got these values for Mac OS X from the Appearance mgr docs. (Mark Newsam)
+ kwxMacTabLeftMargin = 20 ;
+ kwxMacTabTopMargin = 38 ;
+ kwxMacTabRightMargin = 20 ;
+ kwxMacTabBottomMargin = 12 ;
+ }
+ else
+ {
+ kwxMacTabLeftMargin = 16 ;
+ kwxMacTabTopMargin = 30 ;
+ kwxMacTabRightMargin = 16 ;
+ kwxMacTabBottomMargin = 16 ;
+ }
+ constantsSet = true ;
+ }
+ if ( UMAHasAquaLayout() )
+ {
+ m_macHorizontalBorder = 7;
+ m_macVerticalBorder = 8;
+ }
+
m_nSelection = -1;
}
MacPreControlCreate( parent , id , "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
- m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1,
+ m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1,
kControlTabSmallProc , (long) this ) ;
MacPostControlCreate() ;
m_macControl = NULL ;
}
+wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage)
+{
+ wxSize sizeTotal = sizePage;
+
+ int major,minor;
+ wxGetOsVersion( &major, &minor );
+
+ // Mac has large notebook borders. Aqua even more so.
+
+ if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) )
+ {
+ sizeTotal.x += 90;
+
+ if (major >= 10)
+ sizeTotal.y += 28;
+ else
+ sizeTotal.y += 20;
+ }
+ else
+ {
+ if (major >= 10)
+ {
+ sizeTotal.x += 34;
+ sizeTotal.y += 46;
+ }
+ else
+ {
+ sizeTotal.x += 22;
+ sizeTotal.y += 44;
+ }
+ }
+
+ return sizeTotal;
+}
+
// ----------------------------------------------------------------------------
// wxNotebook accessors
// ----------------------------------------------------------------------------
-int wxNotebook::GetPageCount() const
+
+void wxNotebook::SetPadding(const wxSize& padding)
{
- return m_aPages.Count();
+ wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") );
}
-int wxNotebook::GetRowCount() const
+void wxNotebook::SetTabSize(const wxSize& sz)
{
- return 1;
+ wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") );
+}
+
+void wxNotebook::SetPageSize(const wxSize& size)
+{
+ 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 ) ;
+ SetControlValue( (ControlHandle) m_macControl , m_nSelection + 1 ) ;
return m_nSelection;
}
-void wxNotebook::AdvanceSelection(bool bForward)
-{
- if (GetPageCount() == 0) {
- return;
- }
- 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)
{
wxASSERT( IS_VALID_PAGE(nPage) );
- wxNotebookPage *page = m_aPages[nPage];
+ wxNotebookPage *page = m_pages[nPage];
page->SetLabel(strText);
MacSetupTabs();
{
wxASSERT( IS_VALID_PAGE(nPage) );
- wxNotebookPage *page = m_aPages[nPage];
+ 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)
+// remove one page from the notebook, without deleting the window
+wxNotebookPage* wxNotebook::DoRemovePage(int nPage)
{
- wxCHECK( IS_VALID_PAGE(nPage), FALSE );
-
- delete m_aPages[nPage];
- m_aPages.Remove(nPage);
+ wxCHECK( IS_VALID_PAGE(nPage), NULL );
+ wxNotebookPage* page = m_pages[nPage] ;
+ m_pages.RemoveAt(nPage);
MacSetupTabs();
m_nSelection = GetPageCount() - 1;
}
if(m_nSelection >= 0) {
- m_aPages[m_nSelection]->Show(true);
+ m_pages[m_nSelection]->Show(true);
}
-
- return true;
-}
-
-// remove one page from the notebook, without deleting the window
-bool wxNotebook::RemovePage(int nPage)
-{
- wxCHECK( IS_VALID_PAGE(nPage), FALSE );
-
- m_aPages.Remove(nPage);
-
- return 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,
pPage->SetLabel(strText);
// save the pointer to the page
- m_aPages.Insert(pPage, nPage);
+ m_pages.Insert(pPage, nPage);
MacSetupTabs();
*/
void wxNotebook::MacSetupTabs()
{
- SetControlMaximum( m_macControl , GetPageCount() ) ;
+ SetControlMaximum( (ControlHandle) m_macControl , GetPageCount() ) ;
wxNotebookPage *page;
ControlTabInfoRec info;
Boolean enabled = true;
for(int ii = 0; ii < GetPageCount(); ii++)
{
- page = m_aPages[ii];
+ page = m_pages[ii];
info.version = 0;
info.iconSuiteID = 0;
#if TARGET_CARBON
strcpy( (char *) info.name , page->GetLabel() ) ;
c2pstr( (char *) info.name ) ;
#endif
- SetControlData( m_macControl, ii+1, kControlTabInfoTag,
+ SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabInfoTag,
sizeof( ControlTabInfoRec) , (char*) &info ) ;
- SetControlData( m_macControl, ii+1, kControlTabEnabledFlagTag,
+ SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabEnabledFlagTag,
sizeof( Boolean ), (Ptr)&enabled );
}
Rect bounds;
- GetControlBounds(m_macControl, &bounds);
- InvalWindowRect(GetMacRootWindow(), &bounds);
+ GetControlBounds((ControlHandle)m_macControl, &bounds);
+ InvalWindowRect((WindowRef)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];
+ wxNotebookPage *pPage = m_pages[nPage];
pPage->SetSize(kwxMacTabLeftMargin, kwxMacTabTopMargin,
w - kwxMacTabLeftMargin - kwxMacTabRightMargin,
h - kwxMacTabTopMargin - kwxMacTabBottomMargin );
{
// 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 it may happen - just do nothing
if ( nSel == nOldSel )
{
- wxNotebookPage *pPage = m_aPages[nSel];
+ wxNotebookPage *pPage = m_pages[nSel];
pPage->Show(FALSE);
pPage->Show(TRUE);
pPage->SetFocus();
// 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();
m_nSelection = nSel;
}
-void wxNotebook::MacHandleControlClick( ControlHandle control , SInt16 controlpart )
+void wxNotebook::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
{
- wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControlValue(m_macControl) - 1, m_nSelection);
+ wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControlValue((ControlHandle)m_macControl) - 1, m_nSelection);
event.SetEventObject(this);
ProcessEvent(event);
projects / wxWidgets.git / blobdiff