X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd47b3d3f33eaa1e6083392922f5a18a828e8bae..d66dcb6022662c03aa32f1c7ad306552f1edfdc0:/src/mac/notebmac.cpp?ds=sidebyside diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp index 9edaae2764..aae205f86b 100644 --- a/src/mac/notebmac.cpp +++ b/src/mac/notebmac.cpp @@ -9,6 +9,10 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#ifdef __GNUG__ + #pragma implementation "notebook.h" +#endif + // ============================================================================ // declarations // ============================================================================ @@ -16,10 +20,7 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "notebook.h" -#endif - +#include "wx/app.h" #include "wx/string.h" #include "wx/log.h" #include "wx/imaglist.h" @@ -49,7 +50,8 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) BEGIN_EVENT_TABLE(wxNotebook, wxControl) 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) @@ -130,8 +132,17 @@ bool wxNotebook::Create(wxWindow *parent, MacPreControlCreate( parent , id , "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ; - m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, - kControlTabSmallProc , (long) this ) ; + 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 = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, + tabstyle , (long) this ) ; MacPostControlCreate() ; return TRUE ; @@ -143,6 +154,41 @@ wxNotebook::~wxNotebook() 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 // ---------------------------------------------------------------------------- @@ -168,8 +214,9 @@ int wxNotebook::SetSelection(int 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; } @@ -196,7 +243,7 @@ int wxNotebook::GetPageImage(int nPage) const { wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") ); - return 0 ; + return m_images[nPage]; } bool wxNotebook::SetPageImage(int nPage, int nImage) @@ -206,7 +253,17 @@ bool wxNotebook::SetPageImage(int nPage, int nImage) wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), FALSE, _T("invalid image index in SetPageImage()") ); - return FALSE; + 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; } // ---------------------------------------------------------------------------- @@ -258,6 +315,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 ) { @@ -291,11 +350,11 @@ bool wxNotebook::InsertPage(int nPage, */ 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]; @@ -307,14 +366,41 @@ void wxNotebook::MacSetupTabs() 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, - sizeof( Boolean ), (Ptr)&enabled ); + SetTabEnabled( (ControlHandle) m_macControl , ii+1 , true ) ; + +#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 + // 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 } Rect bounds; - GetControlBounds(m_macControl, &bounds); - InvalWindowRect(MacGetRootWindow(), &bounds); + GetControlBounds((ControlHandle)m_macControl, &bounds); + InvalWindowRect((WindowRef)MacGetRootWindow(), &bounds); } // ---------------------------------------------------------------------------- @@ -436,11 +522,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); + 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 ; + + 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); + 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); + } + } + } + } +} + + +void wxNotebook::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) +{ +#if 0 + wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControl32BitValue((ControlHandle)m_macControl) - 1, m_nSelection); event.SetEventObject(this); ProcessEvent(event); +#endif }