X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e79a06be44af981a6dc4a9422585721600957e1..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/mac/carbon/notebmac.cpp diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp index 5861863c68..746e0464f3 100644 --- a/src/mac/carbon/notebmac.cpp +++ b/src/mac/carbon/notebmac.cpp @@ -105,10 +105,7 @@ bool wxNotebook::Create( wxWindow *parent, switch (GetWindowVariant()) { case wxWINDOW_VARIANT_MINI: - if ( UMAGetSystemVersion() >= 0x1030 ) - tabsize = 3 ; - else - tabsize = kControlSizeSmall; + tabsize = 3 ; break; case wxWINDOW_VARIANT_SMALL: @@ -140,12 +137,12 @@ wxNotebook::~wxNotebook() // wxNotebook accessors // ---------------------------------------------------------------------------- -void wxNotebook::SetPadding(const wxSize& padding) +void wxNotebook::SetPadding(const wxSize& WXUNUSED(padding)) { // unsupported by OS } -void wxNotebook::SetTabSize(const wxSize& sz) +void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz)) { // unsupported by OS } @@ -329,7 +326,6 @@ int wxNotebook::HitTest(const wxPoint& pt, long * flags) const { int resultV = wxNOT_FOUND; -#if TARGET_API_MAC_OSX const int countPages = GetPageCount(); // we have to convert from Client to Window relative coordinates @@ -370,7 +366,6 @@ int wxNotebook::HitTest(const wxPoint& pt, long * flags) const if ( outPart >= 1 && outPart <= countPages ) resultV = outPart - 1 ; -#endif // TARGET_API_MAC_OSX if (flags != NULL) { @@ -408,7 +403,7 @@ void wxNotebook::MacSetupTabs() info.name = cflabel ; m_peer->SetData( ii + 1, kControlTabInfoTag, &info ) ; - if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 ) + if ( GetImageList() && GetPageImage(ii) >= 0 ) { const wxBitmap bmap = GetImageList()->GetBitmap( GetPageImage( ii ) ) ; if ( bmap.Ok() ) @@ -427,9 +422,7 @@ void wxNotebook::MacSetupTabs() m_peer->SetTabEnabled( ii + 1, true ) ; } - Rect bounds; - m_peer->GetRectInWindowCoords( &bounds ) ; - InvalWindowRect( (WindowRef)MacGetTopLevelWindowRef(), &bounds ); + Refresh(); } wxRect wxNotebook::GetPageRect() const @@ -516,7 +509,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) event.SetEventObject( this ); wxWindow *page = m_pages[m_nSelection]; - if ( !page->GetEventHandler()->ProcessEvent( event ) ) + if ( !page->HandleWindowEvent( event ) ) { page->SetFocus(); } @@ -534,7 +527,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) if ( parent ) { event.SetCurrentFocus( this ); - parent->GetEventHandler()->ProcessEvent( event ); + parent->HandleWindowEvent( event ); } } } @@ -561,7 +554,7 @@ bool wxNotebook::DoPhase(int WXUNUSED(nPhase)) #endif // wxUSE_CONSTRAINTS -void wxNotebook::Command(wxCommandEvent& event) +void wxNotebook::Command(wxCommandEvent& WXUNUSED(event)) { wxFAIL_MSG(wxT("wxNotebook::Command not implemented")); } @@ -601,7 +594,7 @@ wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId, newSel , m_nSelection ); changing.SetEventObject( this ); - GetEventHandler()->ProcessEvent( changing ); + HandleWindowEvent( changing ); if ( changing.IsAllowed() ) { @@ -609,7 +602,7 @@ wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId, newSel, m_nSelection ); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); + HandleWindowEvent( event ); } else {