X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f0fac91ab5c66f831dabdfae674381b32eb1f3a..63691d4ff993bb4b7f09c3d0391084e2cd4f5ba4:/src/mac/notebmac.cpp?ds=inline diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp index 56cacb02a2..3a45c336fa 100644 --- a/src/mac/notebmac.cpp +++ b/src/mac/notebmac.cpp @@ -2,7 +2,7 @@ // Name: notebook.cpp // Purpose: implementation of wxNotebook // Author: Stefan Csomor -// Modified by: +// Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor @@ -31,14 +31,8 @@ // ---------------------------------------------------------------------------- // check that the page index is valid -#define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount())) +#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount()) -static bool constantsSet = false ; - -short kwxMacTabLeftMargin = 0 ; -short kwxMacTabTopMargin = 0 ; -short kwxMacTabRightMargin = 0 ; -short kwxMacTabBottomMargin = 0 ; // ---------------------------------------------------------------------------- // event table @@ -65,38 +59,92 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) // implementation // ============================================================================ -// ---------------------------------------------------------------------------- -// wxNotebook construction -// ---------------------------------------------------------------------------- +// The Appearance Manager docs show using tab controls in either edge to edge +// mode, or inset. I think edge to edge conforms better to the other ports, +// and inset mode is better accomplished with space around the wxNotebook rather +// than within it. --Robin +#define wxMAC_EDGE_TO_EDGE 1 -// common part of all ctors -void wxNotebook::Init() +static inline int wxMacTabMargin(long nbStyle, long side) { - if ( !constantsSet ) + static int tabMargin = -1; + static int otherMargin = -1; + + if ( tabMargin == -1) { 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 ; + tabMargin = 26; // From Appearance Manager docs for small tab control dimensions +#if wxMAC_EDGE_TO_EDGE + otherMargin = 0; +#else + otherMargin = 20; +#endif + } + else + { + tabMargin = 30; +#if wxMAC_EDGE_TO_EDGE + otherMargin = 0; +#else + otherMargin = 16; +#endif + } + } + + // If the style matches the side asked for then return the tab margin, + // but we have to special case wxNB_TOP since it is zero... + if ( side == wxNB_TOP) + { + if ( nbStyle != 0 && nbStyle & (wxNB_LEFT|wxNB_RIGHT|wxNB_BOTTOM)) + { + return otherMargin; } else { - kwxMacTabLeftMargin = 16 ; - kwxMacTabTopMargin = 30 ; - kwxMacTabRightMargin = 16 ; - kwxMacTabBottomMargin = 16 ; + return tabMargin; } - constantsSet = true ; } + else if ( nbStyle & side) + return tabMargin; + else + return otherMargin; +} + +static inline int wxMacTabLeftMargin(long style) +{ + return wxMacTabMargin(style, wxNB_LEFT); +} + +static inline int wxMacTabTopMargin(long style) +{ + return wxMacTabMargin(style, wxNB_TOP); +} + +static inline int wxMacTabRightMargin(long style) +{ + return wxMacTabMargin(style, wxNB_RIGHT); +} + +static inline int wxMacTabBottomMargin(long style) +{ + return wxMacTabMargin(style, wxNB_BOTTOM); +} + +// ---------------------------------------------------------------------------- +// wxNotebook construction +// ---------------------------------------------------------------------------- + +// common part of all ctors +void wxNotebook::Init() +{ if ( UMAHasAquaLayout() ) { + // Should these depend on wxMAC_EDGE_TO_EDGE too? m_macHorizontalBorder = 7; m_macVerticalBorder = 8; } - + m_nSelection = -1; } @@ -115,7 +163,7 @@ wxNotebook::wxNotebook(wxWindow *parent, const wxString& name) { Init(); - + Create(parent, id, pos, size, style, name); } @@ -127,11 +175,14 @@ bool wxNotebook::Create(wxWindow *parent, long style, const wxString& name) { + if ( !wxNotebookBase::Create(parent, id, pos, size, style, name) ) + return false; + Rect bounds ; Str255 title ; - - MacPreControlCreate( parent , id , "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ; - + + MacPreControlCreate( parent , id , wxEmptyString , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ; + int tabstyle = kControlTabSmallNorthProc ; if ( HasFlag(wxNB_LEFT) ) tabstyle = kControlTabSmallWestProc ; @@ -139,11 +190,11 @@ bool wxNotebook::Create(wxWindow *parent, tabstyle = kControlTabSmallEastProc ; else if ( HasFlag( wxNB_BOTTOM ) ) tabstyle = kControlTabSmallSouthProc ; - - - m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, + + + m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, tabstyle , (long) this ) ; - + MacPostControlCreate() ; return TRUE ; } @@ -151,22 +202,21 @@ bool wxNotebook::Create(wxWindow *parent, // dtor wxNotebook::~wxNotebook() { - m_macControl = NULL ; } -wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) +wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const { 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 @@ -185,7 +235,7 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) sizeTotal.y += 44; } } - + return sizeTotal; } @@ -208,61 +258,61 @@ void wxNotebook::SetPageSize(const wxSize& size) wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") ); } -int wxNotebook::SetSelection(int nPage) +int wxNotebook::SetSelection(size_t nPage) { - if( !IS_VALID_PAGE(nPage) ) + if( !IS_VALID_PAGE(nPage) ) return m_nSelection ; - + ChangePage(m_nSelection, nPage); SetControl32BitValue( (ControlHandle) m_macControl , m_nSelection + 1 ) ; - + Refresh(); return m_nSelection; } -bool wxNotebook::SetPageText(int nPage, const wxString& strText) +bool wxNotebook::SetPageText(size_t nPage, const wxString& strText) { wxASSERT( IS_VALID_PAGE(nPage) ); - + wxNotebookPage *page = m_pages[nPage]; page->SetLabel(strText); MacSetupTabs(); - + return true; } -wxString wxNotebook::GetPageText(int nPage) const +wxString wxNotebook::GetPageText(size_t nPage) const { wxASSERT( IS_VALID_PAGE(nPage) ); - + wxNotebookPage *page = m_pages[nPage]; return page->GetLabel(); } -int wxNotebook::GetPageImage(int nPage) const +int wxNotebook::GetPageImage(size_t nPage) const { wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") ); - + return m_images[nPage]; } -bool wxNotebook::SetPageImage(int nPage, int nImage) +bool wxNotebook::SetPageImage(size_t nPage, int nImage) { wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("invalid notebook page") ); - + wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), FALSE, _T("invalid image index in SetPageImage()") ); - + if ( nImage != m_images[nPage] ) { // if the item didn't have an icon before or, on the contrary, did have // it but has lost it now, its size will change - but if the icon just // changes, it won't m_images[nPage] = nImage; - + MacSetupTabs() ; } - + return TRUE; } @@ -271,15 +321,15 @@ bool wxNotebook::SetPageImage(int nPage, int nImage) // ---------------------------------------------------------------------------- // remove one page from the notebook, without deleting the window -wxNotebookPage* wxNotebook::DoRemovePage(int nPage) +wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage) { wxCHECK( IS_VALID_PAGE(nPage), NULL ); wxNotebookPage* page = m_pages[nPage] ; m_pages.RemoveAt(nPage); - + MacSetupTabs(); - - if(m_nSelection >= GetPageCount()) { + + if(m_nSelection >= (int)GetPageCount()) { m_nSelection = GetPageCount() - 1; } if(m_nSelection >= 0) { @@ -292,54 +342,52 @@ wxNotebookPage* wxNotebook::DoRemovePage(int nPage) bool wxNotebook::DeleteAllPages() { // TODO: delete native widget pages - + WX_CLEAR_ARRAY(m_pages) ; MacSetupTabs(); - + return TRUE; } // same as AddPage() but does it at given position -bool wxNotebook::InsertPage(int nPage, +bool wxNotebook::InsertPage(size_t nPage, wxNotebookPage *pPage, const wxString& strText, bool bSelect, int imageId) { - wxASSERT( pPage != NULL ); - wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE ); - + if ( !wxNotebookBase::InsertPage(nPage, pPage, strText, bSelect, imageId) ) + return false; + pPage->SetLabel(strText); - - // save the pointer to the page - m_pages.Insert(pPage, nPage); - + m_images.Insert(imageId, nPage); - + MacSetupTabs(); - + if ( bSelect ) { m_nSelection = nPage; } else if ( m_nSelection == -1 ) { m_nSelection = 0; } - else if (m_nSelection >= nPage) { + else if ((size_t)m_nSelection >= nPage) { m_nSelection++; } // 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 ); + pPage->SetSize(wxMacTabLeftMargin(GetWindowStyle()) + m_macHorizontalBorder, + wxMacTabTopMargin(GetWindowStyle()) + m_macVerticalBorder, + w - wxMacTabLeftMargin(GetWindowStyle()) - wxMacTabRightMargin(GetWindowStyle()) - 2*m_macHorizontalBorder, + h - wxMacTabTopMargin(GetWindowStyle()) - wxMacTabBottomMargin(GetWindowStyle()) - 2*m_macVerticalBorder); if ( pPage->GetAutoLayout() ) { pPage->Layout(); } - + return true; } @@ -351,46 +399,43 @@ bool wxNotebook::InsertPage(int nPage, void wxNotebook::MacSetupTabs() { SetControl32BitMaximum( (ControlHandle) m_macControl , GetPageCount() ) ; - + wxNotebookPage *page; ControlTabInfoRec info; - - for(int ii = 0; ii < GetPageCount(); ii++) + + const size_t countPages = GetPageCount(); + for(size_t ii = 0; ii < countPages; 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 + wxMacStringToPascal( page->GetLabel() , info.name ) ; + SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabInfoTag, sizeof( ControlTabInfoRec) , (char*) &info ) ; SetTabEnabled( (ControlHandle) m_macControl , ii+1 , true ) ; -#if 0 // TARGET_CARBON +#if TARGET_CARBON if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 ) { // tab controls only support very specific types of images, therefore we are doing an odyssee // accross the icon worlds (even Apple DTS did not find a shorter path) // in order not to pollute the icon registry we put every icon into (OSType) 1 and immediately - // afterwards Unregister it (IconRef is ref counted, so it will stay on the tab even if we + // afterwards Unregister it (IconRef is ref counted, so it will stay on the tab even if we // unregister it) in case this will ever lead to having the same icon everywhere add some kind - // of static counter + // of static counter ControlButtonContentInfo info ; wxMacCreateBitmapButton( &info , *GetImageList()->GetBitmap( GetPageImage(ii ) ) , kControlContentPictHandle) ; IconFamilyHandle iconFamily = (IconFamilyHandle) NewHandle(0) ; OSErr err = SetIconFamilyData( iconFamily, 'PICT' , (Handle) info.u.picture ) ; - wxASSERT_MSG( err == noErr , "Error when adding bitmap" ) ; + wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ; IconRef iconRef ; err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) 1 , iconFamily, &iconRef ) ; - wxASSERT_MSG( err == noErr , "Error when adding bitmap" ) ; + wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ; info.contentType = kControlContentIconRef ; info.u.iconRef = iconRef ; SetControlData( (ControlHandle) m_macControl, ii+1,kControlTabImageContentTag, sizeof( info ), (Ptr)&info ); - wxASSERT_MSG( err == noErr , "Error when setting icon on tab" ) ; + wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ; UnregisterIconRef( 'WXNG' , (OSType) 1 ) ; ReleaseIconRef( iconRef ) ; DisposeHandle( (Handle) iconFamily ) ; @@ -415,22 +460,23 @@ void wxNotebook::OnSize(wxSizeEvent& event) int nSel = m_nSelection; m_nSelection = -1; SetSelection(nSel); - + // fit the notebook page to the tab control's display area int w, h; GetSize(&w, &h); - + unsigned int nCount = m_pages.Count(); for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) { wxNotebookPage *pPage = m_pages[nPage]; - pPage->SetSize(kwxMacTabLeftMargin, kwxMacTabTopMargin, - w - kwxMacTabLeftMargin - kwxMacTabRightMargin, - h - kwxMacTabTopMargin - kwxMacTabBottomMargin ); + pPage->SetSize(wxMacTabLeftMargin(GetWindowStyle()) + m_macHorizontalBorder, + wxMacTabTopMargin(GetWindowStyle()) + m_macVerticalBorder, + w - wxMacTabLeftMargin(GetWindowStyle()) - wxMacTabRightMargin(GetWindowStyle()) - 2*m_macHorizontalBorder, + h - wxMacTabTopMargin(GetWindowStyle()) - wxMacTabBottomMargin(GetWindowStyle()) - 2*m_macVerticalBorder); if ( pPage->GetAutoLayout() ) { pPage->Layout(); } } - + // Processing continues to next OnSize event.Skip(); } @@ -440,7 +486,7 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event) // is it our tab control? if ( event.GetEventObject() == this ) ChangePage(event.GetOldSelection(), event.GetSelection()); - + // we want to give others a chance to process this message as well event.Skip(); } @@ -450,7 +496,7 @@ void wxNotebook::OnSetFocus(wxFocusEvent& event) // set focus to the currently selected page if any if ( m_nSelection != -1 ) m_pages[m_nSelection]->SetFocus(); - + event.Skip(); } @@ -488,7 +534,7 @@ bool wxNotebook::DoPhase(int /* nPhase */) void wxNotebook::Command(wxCommandEvent& event) { - wxFAIL_MSG("wxNotebook::Command not implemented"); + wxFAIL_MSG(wxT("wxNotebook::Command not implemented")); } // ---------------------------------------------------------------------------- @@ -508,16 +554,16 @@ void wxNotebook::ChangePage(int nOldSel, int nSel) pPage->SetFocus(); return; } - + // Hide previous page if ( nOldSel != -1 ) { m_pages[nOldSel]->Show(FALSE); } - + wxNotebookPage *pPage = m_pages[nSel]; pPage->Show(TRUE); pPage->SetFocus(); - + m_nSelection = nSel; } @@ -529,38 +575,38 @@ void wxNotebook::OnMouse( wxMouseEvent &event ) event.Skip() ; return ; } - + if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK ) { int x = event.m_x ; int y = event.m_y ; - + MacClientToRootWindow( &x , &y ) ; - + ControlHandle control ; Point localwhere ; SInt16 controlpart ; - + localwhere.h = x ; localwhere.v = y ; - + short modifiers = 0; - + if ( !event.m_leftDown && !event.m_rightDown ) modifiers |= btnState ; - + if ( event.m_shiftDown ) modifiers |= shiftKey ; - + if ( event.m_controlDown ) modifiers |= controlKey ; - + if ( event.m_altDown ) modifiers |= optionKey ; - + if ( event.m_metaDown ) modifiers |= cmdKey ; - + control = (ControlHandle) m_macControl ; if ( control && ::IsControlActive( control ) ) { @@ -568,19 +614,19 @@ void wxNotebook::OnMouse( wxMouseEvent &event ) wxNotebookEvent changing(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId, ::GetControl32BitValue(control) - 1, m_nSelection); changing.SetEventObject(this); - ProcessEvent(changing); - + GetEventHandler()->ProcessEvent(changing); + if(changing.IsAllowed()) { controlpart = ::HandleControlClick(control, localwhere, modifiers, (ControlActionUPP) -1); wxTheApp->s_lastMouseDown = 0 ; - + wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId, ::GetControl32BitValue(control) - 1, m_nSelection); event.SetEventObject(this); - - ProcessEvent(event); + + GetEventHandler()->ProcessEvent(event); } } } @@ -588,12 +634,12 @@ void wxNotebook::OnMouse( wxMouseEvent &event ) } -void wxNotebook::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) +void wxNotebook::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) { #if 0 wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControl32BitValue((ControlHandle)m_macControl) - 1, m_nSelection); event.SetEventObject(this); - + ProcessEvent(event); #endif }