changed Refresh to take Rect as client coordinates not window coordinates

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index edc7d866a8004aeafd795eb68bb2dced560eb4c8..78d6f247103675f5cdd6674245c1428759e7b8f3 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -930,10 +930,12 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 //    if ( !IsShown() )
 //        return ;
         
 //    if ( !IsShown() )
 //        return ;
         

-       wxMacDrawingHelper focus( this ) ;
+       wxMacDrawingClientHelper focus( this ) ;

        if ( focus.Ok() )
        {
        if ( focus.Ok() )
        {

-               Rect clientrect = { 0 , 0 , m_height , m_width } ;
+           wxPoint client ;
+           client = GetClientAreaOrigin( ) ;
+               Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ;

                // ClipRect( &clientrect ) ;
 
        if ( rect )
                // ClipRect( &clientrect ) ;
 
        if ( rect )

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index edc7d866a8004aeafd795eb68bb2dced560eb4c8..78d6f247103675f5cdd6674245c1428759e7b8f3 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -930,10 +930,12 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 //    if ( !IsShown() )
 //        return ;
         
 //    if ( !IsShown() )
 //        return ;
         

-       wxMacDrawingHelper focus( this ) ;
+       wxMacDrawingClientHelper focus( this ) ;

        if ( focus.Ok() )
        {
        if ( focus.Ok() )
        {

-               Rect clientrect = { 0 , 0 , m_height , m_width } ;
+           wxPoint client ;
+           client = GetClientAreaOrigin( ) ;
+               Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ;

                // ClipRect( &clientrect ) ;
 
        if ( rect )
                // ClipRect( &clientrect ) ;
 
        if ( rect )