Backported fix for scrollbar refresh from trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -391,9 +391,9 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const
|
|||||||
|
|
||||||
MacRootWindowToWindow( x , y ) ;
|
MacRootWindowToWindow( x , y ) ;
|
||||||
if ( x )
|
if ( x )
|
||||||
(*x) -= MacGetLeftBorderSize() ;
|
*x -= MacGetLeftBorderSize() ;
|
||||||
if ( y )
|
if ( y )
|
||||||
(*y) -= MacGetTopBorderSize() ;
|
*y -= MacGetTopBorderSize() ;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxWindowMac::DoClientToScreen(int *x, int *y) const
|
void wxWindowMac::DoClientToScreen(int *x, int *y) const
|
||||||
@@ -401,9 +401,9 @@ void wxWindowMac::DoClientToScreen(int *x, int *y) const
|
|||||||
WindowRef window = (WindowRef) MacGetRootWindow() ;
|
WindowRef window = (WindowRef) MacGetRootWindow() ;
|
||||||
|
|
||||||
if ( x )
|
if ( x )
|
||||||
(*x) += MacGetLeftBorderSize() ;
|
*x += MacGetLeftBorderSize() ;
|
||||||
if ( y )
|
if ( y )
|
||||||
(*y) += MacGetTopBorderSize() ;
|
*y += MacGetTopBorderSize() ;
|
||||||
|
|
||||||
MacWindowToRootWindow( x , y ) ;
|
MacWindowToRootWindow( x , y ) ;
|
||||||
|
|
||||||
@@ -1666,8 +1666,8 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
|
|||||||
|
|
||||||
SetRectRgn( tempRgn ,
|
SetRectRgn( tempRgn ,
|
||||||
x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
|
x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
|
||||||
x + size.x - parent->MacGetLeftBorderSize() - parent->MacGetRightBorderSize(),
|
x + size.x - parent->MacGetRightBorderSize(),
|
||||||
y + size.y - parent->MacGetTopBorderSize() - parent->MacGetBottomBorderSize()) ;
|
y + size.y - parent->MacGetBottomBorderSize()) ;
|
||||||
|
|
||||||
SectRgn( visRgn , tempRgn , visRgn ) ;
|
SectRgn( visRgn , tempRgn , visRgn ) ;
|
||||||
if ( parent->IsTopLevel() )
|
if ( parent->IsTopLevel() )
|
||||||
|
316
src/mac/dc.cpp
316
src/mac/dc.cpp
File diff suppressed because it is too large
Load Diff
@@ -391,9 +391,9 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const
|
|||||||
|
|
||||||
MacRootWindowToWindow( x , y ) ;
|
MacRootWindowToWindow( x , y ) ;
|
||||||
if ( x )
|
if ( x )
|
||||||
(*x) -= MacGetLeftBorderSize() ;
|
*x -= MacGetLeftBorderSize() ;
|
||||||
if ( y )
|
if ( y )
|
||||||
(*y) -= MacGetTopBorderSize() ;
|
*y -= MacGetTopBorderSize() ;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxWindowMac::DoClientToScreen(int *x, int *y) const
|
void wxWindowMac::DoClientToScreen(int *x, int *y) const
|
||||||
@@ -401,9 +401,9 @@ void wxWindowMac::DoClientToScreen(int *x, int *y) const
|
|||||||
WindowRef window = (WindowRef) MacGetRootWindow() ;
|
WindowRef window = (WindowRef) MacGetRootWindow() ;
|
||||||
|
|
||||||
if ( x )
|
if ( x )
|
||||||
(*x) += MacGetLeftBorderSize() ;
|
*x += MacGetLeftBorderSize() ;
|
||||||
if ( y )
|
if ( y )
|
||||||
(*y) += MacGetTopBorderSize() ;
|
*y += MacGetTopBorderSize() ;
|
||||||
|
|
||||||
MacWindowToRootWindow( x , y ) ;
|
MacWindowToRootWindow( x , y ) ;
|
||||||
|
|
||||||
@@ -1666,8 +1666,8 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
|
|||||||
|
|
||||||
SetRectRgn( tempRgn ,
|
SetRectRgn( tempRgn ,
|
||||||
x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
|
x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
|
||||||
x + size.x - parent->MacGetLeftBorderSize() - parent->MacGetRightBorderSize(),
|
x + size.x - parent->MacGetRightBorderSize(),
|
||||||
y + size.y - parent->MacGetTopBorderSize() - parent->MacGetBottomBorderSize()) ;
|
y + size.y - parent->MacGetBottomBorderSize()) ;
|
||||||
|
|
||||||
SectRgn( visRgn , tempRgn , visRgn ) ;
|
SectRgn( visRgn , tempRgn , visRgn ) ;
|
||||||
if ( parent->IsTopLevel() )
|
if ( parent->IsTopLevel() )
|
||||||
|
Reference in New Issue
Block a user