Corrected accidental pointer arithmetic in DoClientToScreen and vice versa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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 ) ;
|
||||||
|
|
||||||
|
@@ -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 ) ;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user