X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f6420d83ad1f42a78813da64b04a15c5f2a9b2c..7c60222510bc5e197b12f153c4bf05db66cb0f4a:/src/osx/notebook_osx.cpp diff --git a/src/osx/notebook_osx.cpp b/src/osx/notebook_osx.cpp index 7c65da4656..90dc488863 100644 --- a/src/osx/notebook_osx.cpp +++ b/src/osx/notebook_osx.cpp @@ -44,16 +44,16 @@ bool wxNotebook::Create( wxWindow *parent, const wxSize& size, long style, const wxString& name ) -{ - m_macIsUserPane = false ; - +{ + DontCreatePeer(); + if (! (style & wxBK_ALIGN_MASK)) style |= wxBK_TOP; if ( !wxNotebookBase::Create( parent, id, pos, size, style, name ) ) return false; - m_peer = wxWidgetImpl::CreateTabView(this,parent, id, pos, size, style, GetExtraStyle() ); + SetPeer(wxWidgetImpl::CreateTabView(this,parent, id, pos, size, style, GetExtraStyle() )); MacPostControlCreate( pos, size ); @@ -145,7 +145,7 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage) { wxCHECK_MSG( IS_VALID_PAGE(nPage), false, wxT("SetPageImage: invalid notebook page") ); - wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), false, + wxCHECK_MSG( HasImageList() && nImage < GetImageList()->GetImageCount(), false, wxT("SetPageImage: invalid image index") ); if ( nImage != m_images[nPage] ) @@ -235,7 +235,7 @@ bool wxNotebook::InsertPage(size_t nPage, m_selection++; // while this still is the same page showing, we need to update the tabs - m_peer->SetValue( m_selection + 1 ) ; + GetPeer()->SetValue( m_selection + 1 ) ; } DoSetSelectionAfterInsertion(nPage, bSelect); @@ -245,63 +245,9 @@ bool wxNotebook::InsertPage(size_t nPage, return true; } -int wxNotebook::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(flags)) const +int wxNotebook::HitTest(const wxPoint& pt, long *flags) const { - int resultV = wxNOT_FOUND; -#if 0 - const int countPages = GetPageCount(); - - // we have to convert from Client to Window relative coordinates - wxPoint adjustedPt = pt + GetClientAreaOrigin(); - // and now to HIView native ones - adjustedPt.x -= MacGetLeftBorderSize() ; - adjustedPt.y -= MacGetTopBorderSize() ; - - HIPoint hipoint= { adjustedPt.x , adjustedPt.y } ; - HIViewPartCode outPart = 0 ; - OSStatus err = HIViewGetPartHit( m_peer->GetControlRef(), &hipoint, &outPart ); - - int max = m_peer->GetMaximum() ; - if ( outPart == 0 && max > 0 ) - { - // this is a hack, as unfortunately a hit on an already selected tab returns 0, - // so we have to go some extra miles to make sure we select something different - // and try again .. - int val = m_peer->GetValue() ; - int maxval = max ; - if ( max == 1 ) - { - m_peer->SetMaximum( 2 ) ; - maxval = 2 ; - } - - if ( val == 1 ) - m_peer->SetValue( maxval ) ; - else - m_peer->SetValue( 1 ) ; - - err = HIViewGetPartHit( m_peer->GetControlRef(), &hipoint, &outPart ); - - m_peer->SetValue( val ) ; - if ( max == 1 ) - m_peer->SetMaximum( 1 ) ; - } - - if ( outPart >= 1 && outPart <= countPages ) - resultV = outPart - 1 ; - - if (flags != NULL) - { - *flags = 0; - - // we cannot differentiate better - if (resultV >= 0) - *flags |= wxBK_HITTEST_ONLABEL; - else - *flags |= wxBK_HITTEST_NOWHERE; - } -#endif - return resultV; + return GetPeer()->TabHitTest(pt,flags); } // Added by Mark Newsam @@ -311,7 +257,7 @@ int wxNotebook::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(flags)) con // void wxNotebook::MacSetupTabs() { - m_peer->SetupTabs(*this); + GetPeer()->SetupTabs(*this); Refresh(); } @@ -339,6 +285,7 @@ void wxNotebook::OnSize(wxSizeEvent& event) pPage->SetSize(rect, wxSIZE_FORCE_EVENT); } +#if 0 // deactivate r65078 for the moment // If the selected page is hidden at this point, the notebook // has become visible for the first time after creation, and // we postponed showing the page in ChangePage(). @@ -352,6 +299,7 @@ void wxNotebook::OnSize(wxSizeEvent& event) pPage->SetFocus(); } } +#endif // Processing continues to next OnSize event.Skip(); @@ -477,6 +425,7 @@ void wxNotebook::ChangePage(int nOldSel, int nSel) if ( nSel != wxNOT_FOUND ) { wxNotebookPage *pPage = m_pages[nSel]; +#if 0 // deactivate r65078 for the moment if ( IsShownOnScreen() ) { pPage->Show( true ); @@ -491,21 +440,25 @@ void wxNotebook::ChangePage(int nOldSel, int nSel) // We Show() the selected page in our OnSize handler, // unless it already is shown. } +#else + pPage->Show( true ); + pPage->SetFocus(); +#endif } m_selection = nSel; - m_peer->SetValue( m_selection + 1 ) ; + GetPeer()->SetValue( m_selection + 1 ) ; } bool wxNotebook::OSXHandleClicked( double WXUNUSED(timestampsec) ) { bool status = false ; - SInt32 newSel = m_peer->GetValue() - 1 ; + SInt32 newSel = GetPeer()->GetValue() - 1 ; if ( newSel != m_selection ) { wxBookCtrlEvent changing( - wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId, + wxEVT_NOTEBOOK_PAGE_CHANGING, m_windowId, newSel , m_selection ); changing.SetEventObject( this ); HandleWindowEvent( changing ); @@ -513,14 +466,16 @@ bool wxNotebook::OSXHandleClicked( double WXUNUSED(timestampsec) ) if ( changing.IsAllowed() ) { wxBookCtrlEvent event( - wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId, + wxEVT_NOTEBOOK_PAGE_CHANGED, m_windowId, newSel, m_selection ); event.SetEventObject( this ); HandleWindowEvent( event ); + + m_selection = newSel; } else { - m_peer->SetValue( m_selection + 1 ) ; + GetPeer()->SetValue( m_selection + 1 ) ; } status = true ;