X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9234615181cb1b63d509c2e16afb39b374d44987..222702b112dcc7bebe018d6f4d66fe469fefd02c:/src/mac/carbon/window.cpp?ds=sidebyside diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 625eabb20d..4bd0ab12be 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -76,8 +76,6 @@ extern wxList wxPendingDelete; IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) #endif // __WXUNIVERSAL__/__WXMAC__ -#if !USE_SHARED_LIBRARY - BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase) EVT_NC_PAINT(wxWindowMac::OnNcPaint) EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground) @@ -89,8 +87,6 @@ BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase) EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent) END_EVENT_TABLE() -#endif - #define wxMAC_DEBUG_REDRAW 0 #ifndef wxMAC_DEBUG_REDRAW #define wxMAC_DEBUG_REDRAW 0 @@ -213,7 +209,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl thisWindow->GetPeer()->GetRect( &controlBounds ) ; } } - + if ( cEvent.GetParameter(kEventParamRgnHandle, &updateRgn) != noErr ) { updateRgn = (RgnHandle) visRegion.GetWXHRGN() ; @@ -222,20 +218,12 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl { if ( thisWindow->GetPeer()->IsCompositing() == false ) { - if ( thisWindow->GetPeer()->IsRootControl() == false ) - { - GetControlBounds( thisWindow->GetPeer()->GetControlRef() , &controlBounds ) ; - } - else - { - thisWindow->GetPeer()->GetRect( &controlBounds ) ; - } allocatedRgn = NewRgn() ; CopyRgn( updateRgn , allocatedRgn ) ; OffsetRgn( allocatedRgn , -controlBounds.left , -controlBounds.top ) ; // hide the given region by the new region that must be shifted wxMacNativeToWindow( thisWindow , allocatedRgn ) ; - updateRgn = allocatedRgn ; + updateRgn = allocatedRgn ; } else { @@ -280,10 +268,10 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl if ( cEvent.GetParameter(kEventParamCGContextRef, &cgContext) != noErr ) { wxASSERT( thisWindow->GetPeer()->IsCompositing() == false ) ; - + // this parameter is not provided on non-composited windows created = true ; - // rest of the code expects this to be already transformed and clipped for local + // rest of the code expects this to be already transformed and clipped for local CGrafPtr port = GetWindowPort( (WindowRef) thisWindow->MacGetTopLevelWindowRef() ) ; Rect bounds ; GetPortBounds( port , &bounds ) ; @@ -297,13 +285,13 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ; CGContextScaleCTM( cgContext , 1 , -1 ) ; - + CGContextTranslateCTM( cgContext , controlBounds.left , controlBounds.top ) ; - + /* CGContextSetRGBFillColor( cgContext , 1.0 , 1.0 , 1.0 , 1.0 ) ; - CGContextFillRect(cgContext , CGRectMake( 0 , 0 , - controlBounds.right - controlBounds.left , + CGContextFillRect(cgContext , CGRectMake( 0 , 0 , + controlBounds.right - controlBounds.left , controlBounds.bottom - controlBounds.top ) ); */ @@ -483,6 +471,7 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef break ; case kEventClassService : result = wxMacWindowServiceEventHandler( handler, event , data ) ; + break ; default : break ; } @@ -574,6 +563,9 @@ void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part) { RgnHandle rgn = NewRgn() ; GetClip( rgn ) ; + int x = 0 , y = 0; + MacWindowToRootWindow( &x,&y ) ; + OffsetRgn( rgn , -x , -y ) ; wxMacWindowStateSaver sv( this ) ; SectRgn( rgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , rgn ) ; MacDoRedraw( rgn , 0 ) ; @@ -734,20 +726,22 @@ void wxWindowMac::Init() m_peer = NULL ; m_frozenness = 0 ; #if WXWIN_COMPATIBILITY_2_4 - m_backgroundTransparent = FALSE; + m_backgroundTransparent = false; #endif // as all windows are created with WS_VISIBLE style... - m_isShown = TRUE; + m_isShown = true; m_hScrollBar = NULL ; m_vScrollBar = NULL ; m_macBackgroundBrush = wxNullBrush ; - m_macIsUserPane = TRUE; + m_macIsUserPane = true; #if wxMAC_USE_CORE_GRAPHICS m_cgContextRef = NULL ; #endif + m_clipChildren = false ; + m_cachedClippedRectValid = false ; // we need a valid font for the encodings wxWindowBase::SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); } @@ -757,7 +751,7 @@ wxWindowMac::~wxWindowMac() { SendDestroyEvent(); - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; MacInvalidateBorders() ; @@ -856,10 +850,10 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, long style, const wxString& name) { - wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") ); + wxCHECK_MSG( parent, false, wxT("can't create wxWindowMac without parent") ); if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) - return FALSE; + return false; m_windowVariant = parent->GetWindowVariant() ; @@ -897,10 +891,10 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, wxWindowCreateEvent event(this); GetEventHandler()->AddPendingEvent(event); - return TRUE; + return true; } -void wxWindowMac::MacChildAdded() +void wxWindowMac::MacChildAdded() { if ( m_vScrollBar ) { @@ -1115,17 +1109,17 @@ void wxWindowMac::SetFocus() void wxWindowMac::DoCaptureMouse() { - wxTheApp->s_captureWindow = this ; + wxApp::s_captureWindow = this ; } wxWindow* wxWindowBase::GetCapture() { - return wxTheApp->s_captureWindow ; + return wxApp::s_captureWindow ; } void wxWindowMac::DoReleaseMouse() { - wxTheApp->s_captureWindow = NULL ; + wxApp::s_captureWindow = NULL ; } #if wxUSE_DRAG_AND_DROP @@ -1168,7 +1162,7 @@ bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos, int& w, int& h , bool adjustOrigin ) const { bool isCompositing = MacGetTopLevelWindow()->MacUsesCompositing() ; - + // the desired size, minus the border pixels gives the correct size of the control x = (int)pos.x; @@ -1213,7 +1207,7 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const { Rect bounds ; m_peer->GetRect( &bounds ) ; - + int x1 = bounds.left ; int y1 = bounds.top ; @@ -1341,9 +1335,13 @@ void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const if ( !IsTopLevel() ) { - wxMacControl::Convert( &pt , MacGetTopLevelWindow()->m_peer , m_peer ) ; - pt.x += MacGetLeftBorderSize() ; - pt.y += MacGetTopBorderSize() ; + wxTopLevelWindowMac* top = MacGetTopLevelWindow(); + if (top) + { + wxMacControl::Convert( &pt , top->m_peer , m_peer ) ; + pt.x += MacGetLeftBorderSize() ; + pt.y += MacGetTopBorderSize() ; + } } if ( x ) *x = (int) pt.x ; @@ -1370,7 +1368,7 @@ void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , in GetRegionBounds( rgn , &content ) ; m_peer->GetRect( &structure ) ; OffsetRect( &structure, -structure.left , -structure.top ) ; - + left = content.left - structure.left ; top = content.top - structure.top ; right = structure.right - content.right ; @@ -1432,11 +1430,11 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const if (m_hScrollBar && m_hScrollBar->IsShown() ) { - hh -= m_hScrollBar->GetSize().y ; // MAC_SCROLLBAR_SIZE ; + hh -= m_hScrollBar->GetSize().y ; } if (m_vScrollBar && m_vScrollBar->IsShown() ) { - ww -= m_vScrollBar->GetSize().x ; // MAC_SCROLLBAR_SIZE; + ww -= m_vScrollBar->GetSize().x ; } if(x) *x = ww; if(y) *y = hh; @@ -1446,17 +1444,17 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const bool wxWindowMac::SetCursor(const wxCursor& cursor) { if (m_cursor == cursor) - return FALSE; + return false; if (wxNullCursor == cursor) { if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) ) - return FALSE ; + return false ; } else { if ( ! wxWindowBase::SetCursor( cursor ) ) - return FALSE ; + return false ; } wxASSERT_MSG( m_cursor.Ok(), @@ -1490,7 +1488,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor) m_cursor.MacInstall() ; } - return TRUE ; + return true ; } #if wxUSE_MENUS @@ -1528,7 +1526,7 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) menu->SetInvokingWindow(NULL); - return TRUE; + return true; } #endif @@ -1548,7 +1546,7 @@ void wxWindowMac::DoSetToolTip(wxToolTip *tooltip) #endif // wxUSE_TOOLTIPS -void wxWindowMac::MacInvalidateBorders() +void wxWindowMac::MacInvalidateBorders() { if ( m_peer == NULL ) return ; @@ -1556,18 +1554,18 @@ void wxWindowMac::MacInvalidateBorders() bool vis = MacIsReallyShown() ; if ( !vis ) return ; - + int outerBorder = MacGetLeftBorderSize() ; if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() ) outerBorder += 4 ; if ( outerBorder == 0 ) return ; - - // now we know that we have something to do at all + + // now we know that we have something to do at all // as the borders are drawn on the parent we have to properly invalidate all these areas - RgnHandle updateInner = NewRgn() , + RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() ; // this rectangle is in HIViewCoordinates under OSX and in Window Coordinates under Carbon @@ -1709,7 +1707,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) if ((m_maxWidth != -1) && (actualWidth > m_maxWidth)) actualWidth = m_maxWidth; if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) - actualHeight = m_maxHeight; + actualHeight = m_maxHeight; bool doMove = false ; bool doResize = false ; @@ -1725,10 +1723,10 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) if ( doMove || doResize ) { - // as the borders are drawn outside the native control, we adjust now + // as the borders are drawn outside the native control, we adjust now - wxRect bounds( wxPoint( actualX + MacGetLeftBorderSize() ,actualY + MacGetTopBorderSize() ), - wxSize( actualWidth - (MacGetLeftBorderSize() + MacGetRightBorderSize()) , + wxRect bounds( wxPoint( actualX + MacGetLeftBorderSize() ,actualY + MacGetTopBorderSize() ), + wxSize( actualWidth - (MacGetLeftBorderSize() + MacGetRightBorderSize()) , actualHeight - (MacGetTopBorderSize() + MacGetBottomBorderSize()) ) ) ; Rect r ; @@ -1740,11 +1738,11 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) } MacInvalidateBorders() ; - + + m_cachedClippedRectValid = false ; m_peer->SetRect( &r ) ; - if ( doMove ) - wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified + wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified MacInvalidateBorders() ; @@ -1786,12 +1784,12 @@ wxSize wxWindowMac::DoGetBestSize() const { bestsize.bottom = 16 ; } -#if wxUSE_SPINBTN +#if wxUSE_SPINBTN else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) ) { bestsize.bottom = 24 ; } -#endif // wxUSE_SPINBTN +#endif // wxUSE_SPINBTN else { // return wxWindowBase::DoGetBestSize() ; @@ -1929,7 +1927,7 @@ bool wxWindowMac::Show(bool show) { bool former = MacIsReallyShown() ; if ( !wxWindowBase::Show(show) ) - return FALSE; + return false; // TODO use visibilityChanged Carbon Event for OSX if ( m_peer ) @@ -1938,7 +1936,7 @@ bool wxWindowMac::Show(bool show) } if ( former != MacIsReallyShown() ) MacPropagateVisibilityChanged() ; - return TRUE; + return true; } bool wxWindowMac::Enable(bool enable) @@ -1946,13 +1944,13 @@ bool wxWindowMac::Enable(bool enable) wxASSERT( m_peer->Ok() ) ; bool former = MacIsReallyEnabled() ; if ( !wxWindowBase::Enable(enable) ) - return FALSE; + return false; m_peer->Enable( enable ) ; if ( former != MacIsReallyEnabled() ) MacPropagateEnabledStateChanged() ; - return TRUE; + return true; } // @@ -2032,7 +2030,7 @@ bool wxWindowMac::MacIsReallyShown() // only under OSX the visibility of the TLW is taken into account if ( m_isBeingDeleted ) return false ; - + #if TARGET_API_MAC_OSX if ( m_peer && m_peer->Ok() ) return m_peer->IsVisible(); @@ -2275,7 +2273,7 @@ void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin ) HIThemeFrameDrawInfo info ; memset( &info, 0 , sizeof( info ) ) ; - + info.version = 0 ; info.kind = 0 ; info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ; @@ -2283,7 +2281,7 @@ void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin ) CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ; wxASSERT( cgContext ) ; - + if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) { info.kind = kHIThemeFrameTextFieldSquare ; @@ -2298,14 +2296,14 @@ void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin ) { HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ; } - + m_peer->GetRect( &rect ) ; if ( hasBothScrollbars ) { int size = m_hScrollBar->GetWindowVariant() == wxWINDOW_VARIANT_NORMAL ? 16 : 12 ; CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ; CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ; - HIThemeGrowBoxDrawInfo info ; + HIThemeGrowBoxDrawInfo info ; memset( &info, 0 , sizeof( info ) ) ; info.version = 0 ; info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ; @@ -2334,7 +2332,7 @@ void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin ) { DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; } - + if ( hasFocus ) { DrawThemeFocusRect( &rect , true ) ; @@ -2342,7 +2340,7 @@ void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin ) if ( hasBothScrollbars ) { - // GetThemeStandaloneGrowBoxBounds + // GetThemeStandaloneGrowBoxBounds //DrawThemeStandaloneNoGrowBox } } @@ -2408,8 +2406,8 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) int width , height ; GetClientSize( &width , &height ) ; #if TARGET_API_MAC_OSX - if ( 1 /* m_peer->IsCompositing() */ ) - { + if ( 1 /* m_peer->IsCompositing() */ ) + { // note there currently is a bug in OSX which makes inefficient refreshes in case an entire control // area is scrolled, this does not occur if width and height are 2 pixels less, // TODO write optimal workaround @@ -2428,10 +2426,12 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) #else // this would be the preferred version for fast drawing controls - if( UMAGetSystemVersion() < 0x1030 || !m_peer->IsCompositing() ) - Update() ; - else +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 + if( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() ) HIViewRender(m_peer->GetControlRef()) ; + else +#endif + Update() ; #endif } // as the native control might be not a 0/0 wx window coordinates, we have to offset @@ -2444,17 +2444,20 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) // is the better overall solution, as it does not slow down scrolling m_peer->SetNeedsDisplay() ; #else - // this would be the preferred version for fast drawing controls + // this would be the preferred version for fast drawing controls - if( UMAGetSystemVersion() < 0x1030 || !m_peer->IsCompositing() ) - Update() ; - else - HIViewRender(m_peer->GetControlRef()) ; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 + if( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() ) + HIViewRender(m_peer->GetControlRef()) ; + else #endif - } - else + Update() ; + +#endif + } + else #endif - { + { wxPoint pos; pos.x = pos.y = 0; @@ -2481,7 +2484,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) ScrollRect( &scrollrect , dx , dy , updateRgn ) ; // now scroll the former update region as well and add the new update region - + WindowRef rootWindow = (WindowRef) MacGetTopLevelWindowRef() ; RgnHandle formerUpdateRgn = NewRgn() ; RgnHandle scrollRgn = NewRgn() ; @@ -2704,7 +2707,7 @@ void wxWindowMac::ClearBackground() void wxWindowMac::Update() { #if TARGET_API_MAC_OSX - MacGetTopLevelWindow()->MacPerformUpdates() ; + MacGetTopLevelWindow()->MacPerformUpdates() ; #else ::Draw1Control( m_peer->GetControlRef() ) ; #endif @@ -2720,82 +2723,127 @@ wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const } return win ; } -wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) + +const wxRect& wxWindowMac::MacGetClippedClientRect() const +{ + MacUpdateClippedRects() ; + return m_cachedClippedClientRect ; +} + +const wxRect& wxWindowMac::MacGetClippedRect() const +{ + MacUpdateClippedRects() ; + return m_cachedClippedRect ; +} + +const wxRect&wxWindowMac:: MacGetClippedRectWithOuterStructure() const { + MacUpdateClippedRects() ; + return m_cachedClippedRectWithOuterStructure ; +} + +const wxRegion& wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) +{ + static wxRegion emptyrgn ; + if ( !m_isBeingDeleted && MacIsReallyShown() /*m_peer->IsVisible() */ ) + { + MacUpdateClippedRects() ; + if ( includeOuterStructures ) + return m_cachedClippedRegionWithOuterStructure ; + else + return m_cachedClippedRegion ; + } + else + { + return emptyrgn ; + } +} + +void wxWindowMac::MacUpdateClippedRects() const +{ + if ( m_cachedClippedRectValid ) + return ; + // includeOuterStructures is true if we try to draw somthing like a focus ring etc. // also a window dc uses this, in this case we only clip in the hierarchy for hard // borders like a scrollwindow, splitter etc otherwise we end up in a paranoia having // to add focus borders everywhere Rect r ; - RgnHandle visRgn = NewRgn() ; - RgnHandle tempRgn = NewRgn() ; - if ( !m_isBeingDeleted && MacIsReallyShown() /*m_peer->IsVisible() */ ) - { - m_peer->GetRect( &r ) ; - r.left -= MacGetLeftBorderSize() ; - r.top -= MacGetTopBorderSize() ; - r.bottom += MacGetBottomBorderSize() ; - r.right += MacGetRightBorderSize() ; + Rect rIncludingOuterStructures ; - r.right -= r.left ; - r.bottom -= r.top ; - r.left = 0 ; - r.top = 0 ; + m_peer->GetRect( &r ) ; + r.left -= MacGetLeftBorderSize() ; + r.top -= MacGetTopBorderSize() ; + r.bottom += MacGetBottomBorderSize() ; + r.right += MacGetRightBorderSize() ; - if ( includeOuterStructures ) - InsetRect( &r , -4 , -4 ) ; - RectRgn( visRgn , &r ) ; + r.right -= r.left ; + r.bottom -= r.top ; + r.left = 0 ; + r.top = 0 ; + + rIncludingOuterStructures = r ; + InsetRect( &rIncludingOuterStructures , -4 , -4 ) ; + + wxRect cl = GetClientRect() ; + Rect rClient = { cl.y , cl.x , cl.y + cl.height , cl.x + cl.width } ; + + const wxWindow* child = this ; + const wxWindow* parent = NULL ; + while( !child->IsTopLevel() && ( parent = child->GetParent() ) != NULL ) + { + int x , y ; + wxSize size ; - if ( !IsTopLevel() ) + if ( parent->MacIsChildOfClientArea(child) ) { - wxWindow* child = this ; - wxWindow* parent = child->GetParent() ; - while( parent ) - { - int x , y ; - wxSize size ; - // we have to find a better clipping algorithm here, in order not to clip things - // positioned like status and toolbar - if ( 1 /* parent->IsTopLevel() && child->IsKindOf( CLASSINFO( wxToolBar ) ) */ ) - { - size = parent->GetSize() ; - x = y = 0 ; - } - else - { - size = parent->GetClientSize() ; - wxPoint origin = parent->GetClientAreaOrigin() ; - x = origin.x ; - y = origin.y ; - } - parent->MacWindowToRootWindow( &x, &y ) ; - MacRootWindowToWindow( &x , &y ) ; + size = parent->GetClientSize() ; + wxPoint origin = parent->GetClientAreaOrigin() ; + x = origin.x ; + y = origin.y ; + } + else + { + // this will be true for scrollbars, toolbars etc. + size = parent->GetSize() ; + y = parent->MacGetTopBorderSize() ; + x = parent->MacGetLeftBorderSize() ; + size.x -= parent->MacGetLeftBorderSize() + parent->MacGetRightBorderSize() ; + size.y -= parent->MacGetTopBorderSize() + parent->MacGetBottomBorderSize() ; + } - if ( !includeOuterStructures || ( - parent->MacClipChildren() || - ( parent->GetParent() && parent->GetParent()->MacClipGrandChildren() ) - ) ) - { - SetRectRgn( tempRgn , - x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() , - x + size.x - parent->MacGetRightBorderSize(), - y + size.y - parent->MacGetBottomBorderSize()) ; + parent->MacWindowToRootWindow( &x, &y ) ; + MacRootWindowToWindow( &x , &y ) ; - SectRgn( visRgn , tempRgn , visRgn ) ; - } - if ( parent->IsTopLevel() ) - break ; - child = parent ; - parent = child->GetParent() ; - } + Rect rparent = { y , x , y + size.y , x + size.x } ; + + // the wxwindow and client rects will always be clipped + SectRect( &r , &rparent , &r ) ; + SectRect( &rClient , &rparent , &rClient ) ; + + // the structure only at 'hard' borders + if ( parent->MacClipChildren() || + ( parent->GetParent() && parent->GetParent()->MacClipGrandChildren() ) ) + { + SectRect( &rIncludingOuterStructures , &rparent , &rIncludingOuterStructures ) ; } + child = parent ; } - wxRegion vis = visRgn ; - DisposeRgn( visRgn ) ; - DisposeRgn( tempRgn ) ; - return vis ; + m_cachedClippedRect = wxRect( r.left , r.top , r.right - r.left , r.bottom - r.top ) ; + m_cachedClippedClientRect = wxRect( rClient.left , rClient.top , + rClient.right - rClient.left , rClient.bottom - rClient.top ) ; + m_cachedClippedRectWithOuterStructure = wxRect( + rIncludingOuterStructures.left , rIncludingOuterStructures.top , + rIncludingOuterStructures.right - rIncludingOuterStructures.left , + rIncludingOuterStructures.bottom - rIncludingOuterStructures.top ) ; + + m_cachedClippedRegionWithOuterStructure = wxRegion( m_cachedClippedRectWithOuterStructure ) ; + m_cachedClippedRegion = wxRegion( m_cachedClippedRect ) ; + m_cachedClippedClientRegion = wxRegion( m_cachedClippedClientRect ) ; + + m_cachedClippedRectValid = true ; } /* @@ -2810,7 +2858,7 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) // wxLogDebug(wxT("update for %s bounds %d , %d , %d , %d"),wxString(GetClassInfo()->GetClassName()).c_str(), updatebounds.left , updatebounds.top , updatebounds.right , updatebounds.bottom ) ; - if ( !EmptyRgn(updatergn) ) + if ( !EmptyRgn(updatergn) ) { RgnHandle newupdate = NewRgn() ; wxSize point = GetClientSize() ; @@ -2824,12 +2872,12 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) // for all the others only their client area, otherwise they // might be drawing with full alpha and eg put blue into // the grow-box area of a scrolled window (scroll sample) - wxDC* dc ; + wxDC* dc = new wxWindowDC(this); if ( IsTopLevel() ) - dc = new wxWindowDC(this); + dc->SetClippingRegion(wxRegion(updatergn)); else - dc = new wxClientDC(this); - dc->SetClippingRegion(wxRegion(updatergn)); + dc->SetClippingRegion(wxRegion(newupdate)); + wxEraseEvent eevent( GetId(), dc ); eevent.SetEventObject( this ); GetEventHandler()->ProcessEvent( eevent ); @@ -2963,6 +3011,14 @@ void wxWindowMac::MacCreateScrollBars( long style ) MacRepositionScrollBars() ; // we might have a real position shift } +bool wxWindowMac::MacIsChildOfClientArea( const wxWindow* child ) const +{ + if ( child != NULL && ( child == m_hScrollBar || child == m_vScrollBar ) ) + return false ; + else + return true ; +} + void wxWindowMac::MacRepositionScrollBars() { if ( !m_hScrollBar && !m_vScrollBar ) @@ -3049,6 +3105,7 @@ bool wxWindowMac::AcceptsFocus() const void wxWindowMac::MacSuperChangedPosition() { + m_cachedClippedRectValid = false ; // only window-absolute structures have to be moved i.e. controls wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); @@ -3079,7 +3136,7 @@ long wxWindowMac::MacGetLeftBorderSize( ) const return 0 ; SInt32 border = 0 ; - + if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) { GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;