X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/461fe6e2559a3096d4985a50ba106f26ed890a1d..73fe67bd60b57f95dc63809f7843ed2a15928436:/src/mac/carbon/notebmac.cpp?ds=sidebyside diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp index 150fe2e87b..ae2e636a3a 100644 --- a/src/mac/carbon/notebmac.cpp +++ b/src/mac/carbon/notebmac.cpp @@ -58,78 +58,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) // implementation // ============================================================================ -// 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 - -static inline int wxMacTabMargin(long nbStyle, long side) -{ - static int tabMargin = -1; - static int otherMargin = -1; - - if ( tabMargin == -1) - { - if ( UMAHasAquaLayout() ) - { - 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 - { - return tabMargin; - } - } - 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 // ---------------------------------------------------------------------------- @@ -137,13 +65,6 @@ static inline int wxMacTabBottomMargin(long style) // 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; } @@ -174,27 +95,40 @@ bool wxNotebook::Create(wxWindow *parent, long style, const wxString& name) { + m_macIsUserPane = FALSE ; + if ( !wxNotebookBase::Create(parent, id, pos, size, style, name) ) return false; - Rect bounds ; - Str255 title ; + Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; - MacPreControlCreate( parent , id , wxEmptyString , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ; + if( bounds.right <= bounds.left ) + bounds.right = bounds.left + 100 ; + if ( bounds.bottom <= bounds.top ) + bounds.bottom = bounds.top + 100 ; - int tabstyle = kControlTabSmallNorthProc ; + UInt16 tabstyle = kControlTabDirectionNorth ; if ( HasFlag(wxNB_LEFT) ) - tabstyle = kControlTabSmallWestProc ; + tabstyle = kControlTabDirectionWest ; else if ( HasFlag( wxNB_RIGHT ) ) - tabstyle = kControlTabSmallEastProc ; + tabstyle = kControlTabDirectionEast ; else if ( HasFlag( wxNB_BOTTOM ) ) - tabstyle = kControlTabSmallSouthProc ; - - - m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, - tabstyle , (long) this ) ; + tabstyle = kControlTabDirectionSouth ; + + ControlTabSize tabsize = kControlTabSizeLarge ; + if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL ) + tabsize = kControlTabSizeSmall ; + else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI ) + { + if (UMAGetSystemVersion() >= 0x1030 ) + tabsize = 3 ; + else + tabsize = kControlSizeSmall; + } - MacPostControlCreate() ; + ::CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , tabsize , tabstyle, 0, NULL, (ControlRef*) &m_macControl); + + MacPostControlCreate(pos,size) ; return TRUE ; } @@ -203,58 +137,56 @@ wxNotebook::~wxNotebook() { } -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 - sizeTotal.y += 20; - } - else - { - if (major >= 10) - { - sizeTotal.x += 34; - sizeTotal.y += 46; - } - else - { - sizeTotal.x += 22; - sizeTotal.y += 44; - } - } - - return sizeTotal; -} - // ---------------------------------------------------------------------------- // wxNotebook accessors // ---------------------------------------------------------------------------- void wxNotebook::SetPadding(const wxSize& padding) { - wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") ); + // unsupported by OS } void wxNotebook::SetTabSize(const wxSize& sz) { - wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") ); + // unsupported by OS } void wxNotebook::SetPageSize(const wxSize& size) { - wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") ); + SetSize( CalcSizeFromPage( size ) ); +} + +wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const +{ + return DoGetSizeFromClientSize( sizePage ) ; +} + +wxSize wxNotebook::DoGetBestSize() const +{ + // calculate the max page size + wxSize size(0, 0); + + size_t count = GetPageCount(); + if ( count ) + { + for ( size_t n = 0; n < count; n++ ) + { + wxSize sizePage = m_pages[n]->GetSize(); + + if ( size.x < sizePage.x ) + size.x = sizePage.x; + if ( size.y < sizePage.y ) + size.y = sizePage.y; + } + } + else // no pages + { + // use some arbitrary default size + size.x = + size.y = 100; + } + + return CalcSizeFromPage(size); } int wxNotebook::SetSelection(size_t nPage) @@ -380,12 +312,8 @@ bool wxNotebook::InsertPage(size_t nPage, MacSetupTabs(); - int h, w; - GetSize(&w, &h); - 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); + wxRect rect = GetPageRect() ; + pPage->SetSize(rect); if ( pPage->GetAutoLayout() ) { pPage->Layout(); } @@ -401,7 +329,7 @@ bool wxNotebook::InsertPage(size_t nPage, { m_nSelection++; // while this still is the same page showing, we need to update the tabs - SetControl32BitValue( (ControlHandle) m_macControl , m_nSelection + 1 ) ; + SetControl32BitValue( (ControlRef) m_macControl , m_nSelection + 1 ) ; } // some page should be selected: either this one or the first one if there @@ -425,7 +353,7 @@ bool wxNotebook::InsertPage(size_t nPage, */ void wxNotebook::MacSetupTabs() { - SetControl32BitMaximum( (ControlHandle) m_macControl , GetPageCount() ) ; + SetControl32BitMaximum( (ControlRef) m_macControl , GetPageCount() ) ; wxNotebookPage *page; ControlTabInfoRec info; @@ -438,9 +366,9 @@ void wxNotebook::MacSetupTabs() info.iconSuiteID = 0; wxMacStringToPascal( page->GetLabel() , info.name ) ; - SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabInfoTag, + SetControlData( (ControlRef) m_macControl, ii+1, kControlTabInfoTag, sizeof( ControlTabInfoRec) , (char*) &info ) ; - SetTabEnabled( (ControlHandle) m_macControl , ii+1 , true ) ; + SetTabEnabled( (ControlRef) m_macControl , ii+1 , true ) ; #if TARGET_CARBON if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 ) { @@ -450,7 +378,7 @@ void wxNotebook::MacSetupTabs() // 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 - wxBitmap* bmap = GetImageList()->GetBitmap( GetPageImage(ii ) ) ; + const wxBitmap* bmap = GetImageList()->GetBitmap( GetPageImage(ii ) ) ; if ( bmap ) { wxBitmap scaledBitmap ; @@ -465,14 +393,18 @@ void wxNotebook::MacSetupTabs() OSErr err = SetIconFamilyData( iconFamily, 'PICT' , (Handle) info.u.picture ) ; wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ; IconRef iconRef ; - err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) 1 , iconFamily, &iconRef ) ; + err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) 1, iconFamily, &iconRef ) ; wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ; info.contentType = kControlContentIconRef ; info.u.iconRef = iconRef ; - SetControlData( (ControlHandle) m_macControl, ii+1,kControlTabImageContentTag, + SetControlData( (ControlRef) m_macControl, ii+1,kControlTabImageContentTag, sizeof( info ), (Ptr)&info ); wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ; - UnregisterIconRef( 'WXNG' , (OSType) 1 ) ; + if ( UMAGetSystemVersion() < 0x1030 ) + { + UnregisterIconRef( 'WXNG' , (OSType) 1 ) ; + } + ReleaseIconRef( iconRef ) ; DisposeHandle( (Handle) iconFamily ) ; } @@ -480,10 +412,15 @@ void wxNotebook::MacSetupTabs() #endif } Rect bounds; - GetControlBounds((ControlHandle)m_macControl, &bounds); - InvalWindowRect((WindowRef)MacGetRootWindow(), &bounds); + UMAGetControlBoundsInWindowCoords((ControlRef)m_macControl, &bounds); + InvalWindowRect((WindowRef)MacGetTopLevelWindowRef(), &bounds); } +wxRect wxNotebook::GetPageRect() const +{ + wxSize size = GetClientSize() ; + return wxRect( 0 , 0 , size.x , size.y ) ; +} // ---------------------------------------------------------------------------- // wxNotebook callbacks // ---------------------------------------------------------------------------- @@ -492,25 +429,12 @@ void wxNotebook::MacSetupTabs() // time because doing it in ::Create() doesn't work (for unknown reasons) void wxNotebook::OnSize(wxSizeEvent& event) { - // emulate page change (it's esp. important to do it first time because - // otherwise our page would stay invisible) - /* - 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(); + wxRect rect = GetPageRect() ; for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) { wxNotebookPage *pPage = m_pages[nPage]; - 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); + pPage->SetSize(rect); if ( pPage->GetAutoLayout() ) { pPage->Layout(); } @@ -640,13 +564,13 @@ void wxNotebook::ChangePage(int nOldSel, int nSel) } m_nSelection = nSel; - SetControl32BitValue( (ControlHandle) m_macControl , m_nSelection + 1 ) ; + SetControl32BitValue( (ControlRef) m_macControl , m_nSelection + 1 ) ; } void wxNotebook::OnMouse( wxMouseEvent &event ) { - if ( (ControlHandle) m_macControl == NULL ) + if ( (ControlRef) m_macControl == NULL ) { event.Skip() ; return ; @@ -657,9 +581,17 @@ void wxNotebook::OnMouse( wxMouseEvent &event ) int x = event.m_x ; int y = event.m_y ; - MacClientToRootWindow( &x , &y ) ; +#if TARGET_API_MAC_OSX + // OS Needs it in window not client coordinates + wxPoint origin = GetClientAreaOrigin() ; + x += origin.x ; + y += origin.y ; +#else + // OS Needs it in tlw content area coordinates + MacClientToRootWindow( &x , &y ) ; +#endif - ControlHandle control ; + ControlRef control ; Point localwhere ; SInt16 controlpart ; @@ -683,7 +615,7 @@ void wxNotebook::OnMouse( wxMouseEvent &event ) if ( event.m_metaDown ) modifiers |= cmdKey ; - control = (ControlHandle) m_macControl ; + control = (ControlRef) m_macControl ; if ( control && ::IsControlActive( control ) ) { { @@ -713,7 +645,7 @@ void wxNotebook::OnMouse( wxMouseEvent &event ) 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); + wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControl32BitValue((ControlRef)m_macControl) - 1, m_nSelection); event.SetEventObject(this); ProcessEvent(event);