X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/90b959aee428b26304ee0056864af48775051496..da0766ab2ae2357cd4dc111415731ee85aa45984:/src/mac/carbon/notebmac.cpp?ds=sidebyside diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp index 6e94d28049..4e8a87a9b4 100644 --- a/src/mac/carbon/notebmac.cpp +++ b/src/mac/carbon/notebmac.cpp @@ -1,14 +1,18 @@ /////////////////////////////////////////////////////////////////////////////// // Name: notebook.cpp // Purpose: implementation of wxNotebook -// Author: AUTHOR -// Modified by: -// Created: ??/??/98 +// Author: Stefan Csomor +// Modified by: +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR +// Copyright: (c) Stefan Csomor // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#ifdef __GNUG__ +#pragma implementation "notebook.h" +#endif + // ============================================================================ // declarations // ============================================================================ @@ -16,15 +20,12 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ -#pragma implementation "notebook.h" -#endif - -#include -#include -#include -#include -#include +#include "wx/app.h" +#include "wx/string.h" +#include "wx/log.h" +#include "wx/imaglist.h" +#include "wx/notebook.h" +#include "wx/mac/uma.h" // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- @@ -32,18 +33,6 @@ // 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 // ---------------------------------------------------------------------------- // event table @@ -54,11 +43,12 @@ 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_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) +EVT_MOUSE_EVENTS(wxNotebook::OnMouse) - EVT_SIZE(wxNotebook::OnSize) - EVT_SET_FOCUS(wxNotebook::OnSetFocus) - EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey) +EVT_SIZE(wxNotebook::OnSize) +EVT_SET_FOCUS(wxNotebook::OnSetFocus) +EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) @@ -69,6 +59,78 @@ 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 // ---------------------------------------------------------------------------- @@ -76,10 +138,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) // common part of all ctors void wxNotebook::Init() { -#ifdef __WXMAC_X__ - m_macHorizontalBorder = 7; - m_macVerticalBorder = 8; -#endif + if ( UMAHasAquaLayout() ) + { + // Should these depend on wxMAC_EDGE_TO_EDGE too? + m_macHorizontalBorder = 7; + m_macVerticalBorder = 8; + } + m_nSelection = -1; } @@ -110,22 +175,66 @@ bool wxNotebook::Create(wxWindow *parent, long style, const wxString& name) { - Rect bounds ; - Str255 title ; - - MacPreControlCreate( parent , id , "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ; + Rect bounds ; + Str255 title ; + + MacPreControlCreate( parent , id , wxEmptyString , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ; + + int tabstyle = kControlTabSmallNorthProc ; + if ( HasFlag(wxNB_LEFT) ) + tabstyle = kControlTabSmallWestProc ; + else if ( HasFlag( wxNB_RIGHT ) ) + tabstyle = kControlTabSmallEastProc ; + else if ( HasFlag( wxNB_BOTTOM ) ) + tabstyle = kControlTabSmallSouthProc ; - m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, - kControlTabSmallProc , (long) this ) ; - - MacPostControlCreate() ; - return TRUE ; + + m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, + tabstyle , (long) this ) ; + + MacPostControlCreate() ; + return TRUE ; } // dtor wxNotebook::~wxNotebook() { - m_macControl = NULL ; + m_macControl = NULL ; +} + +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; } // ---------------------------------------------------------------------------- @@ -134,23 +243,28 @@ wxNotebook::~wxNotebook() void wxNotebook::SetPadding(const wxSize& padding) { + wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") ); } void wxNotebook::SetTabSize(const wxSize& sz) { + 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 ) ; + SetControl32BitValue( (ControlHandle) m_macControl , m_nSelection + 1 ) ; + Refresh(); return m_nSelection; } @@ -175,18 +289,29 @@ wxString wxNotebook::GetPageText(int nPage) const 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 m_images[nPage]; } 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()") ); + + 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; } // ---------------------------------------------------------------------------- @@ -198,7 +323,7 @@ wxNotebookPage* wxNotebook::DoRemovePage(int nPage) { wxCHECK( IS_VALID_PAGE(nPage), NULL ); wxNotebookPage* page = m_pages[nPage] ; - m_pages.Remove(nPage); + m_pages.RemoveAt(nPage); MacSetupTabs(); @@ -238,6 +363,8 @@ bool wxNotebook::InsertPage(int nPage, // save the pointer to the page m_pages.Insert(pPage, nPage); + m_images.Insert(imageId, nPage); + MacSetupTabs(); if ( bSelect ) { @@ -254,9 +381,10 @@ bool wxNotebook::InsertPage(int nPage, 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(); } @@ -265,36 +393,58 @@ bool wxNotebook::InsertPage(int nPage, } /* 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. - */ +* 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() ) ; + SetControl32BitMaximum( (ControlHandle) 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 ) ; + 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 ( 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 + // unregister it) in case this will ever lead to having the same icon everywhere add some kind + // 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" ) ; + IconRef iconRef ; + err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) 1 , iconFamily, &iconRef ) ; + wxASSERT_MSG( err == noErr , "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" ) ; + UnregisterIconRef( 'WXNG' , (OSType) 1 ) ; + ReleaseIconRef( iconRef ) ; + DisposeHandle( (Handle) iconFamily ) ; + } #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(GetMacRootWindow(), &bounds); + GetControlBounds((ControlHandle)m_macControl, &bounds); + InvalWindowRect((WindowRef)MacGetRootWindow(), &bounds); } // ---------------------------------------------------------------------------- @@ -305,14 +455,6 @@ void wxNotebook::MacSetupTabs() // 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; @@ -326,9 +468,10 @@ void wxNotebook::OnSize(wxSizeEvent& event) 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(); } @@ -391,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")); } // ---------------------------------------------------------------------------- @@ -424,11 +567,80 @@ void wxNotebook::ChangePage(int nOldSel, int nSel) m_nSelection = nSel; } -void wxNotebook::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) + +void wxNotebook::OnMouse( wxMouseEvent &event ) { - wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControlValue(m_macControl) - 1, m_nSelection); - event.SetEventObject(this); + if ( (ControlHandle) m_macControl == NULL ) + { + 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 ; - ProcessEvent(event); + if ( event.m_metaDown ) + modifiers |= cmdKey ; + + control = (ControlHandle) m_macControl ; + if ( control && ::IsControlActive( control ) ) + { + { + wxNotebookEvent changing(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId, + ::GetControl32BitValue(control) - 1, m_nSelection); + changing.SetEventObject(this); + 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); + + GetEventHandler()->ProcessEvent(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); + event.SetEventObject(this); + + ProcessEvent(event); +#endif }