Corrected accidental pointer arithmetic in ClientToScreen and vice versa

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 26c54353c66c939d779ee9d2011a991926323fee..0ef67a8a20469b8f977877155bedc38af022b685 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -391,9 +391,9 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const
 
     MacRootWindowToWindow( x , y ) ;
     if ( x )
 
     MacRootWindowToWindow( x , y ) ;
     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() ;
 
     if ( x )
     WindowRef window = (WindowRef) MacGetRootWindow() ;
 
     if ( x )

-            x += MacGetLeftBorderSize() ;
+            *x += MacGetLeftBorderSize() ;

     if ( y )
     if ( y )

-            y += MacGetTopBorderSize() ;
+            *y += MacGetTopBorderSize() ;

 
     MacWindowToRootWindow( x , y ) ;
 
 
     MacWindowToRootWindow( x , y ) ;
 

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index 26c54353c66c939d779ee9d2011a991926323fee..0ef67a8a20469b8f977877155bedc38af022b685 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -391,9 +391,9 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const
 
     MacRootWindowToWindow( x , y ) ;
     if ( x )
 
     MacRootWindowToWindow( x , y ) ;
     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() ;
 
     if ( x )
     WindowRef window = (WindowRef) MacGetRootWindow() ;
 
     if ( x )

-            x += MacGetLeftBorderSize() ;
+            *x += MacGetLeftBorderSize() ;

     if ( y )
     if ( y )

-            y += MacGetTopBorderSize() ;
+            *y += MacGetTopBorderSize() ;

 
     MacWindowToRootWindow( x , y ) ;
 
 
     MacWindowToRootWindow( x , y ) ;