From d1c0d3b18c9332837877945aacd80236baf50df7 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 20 Mar 2021 22:09:31 +0100
Subject: [PATCH] keeping the OSX specific use of origin for non-native borders

fixes #19108
---
 include/wx/dcgraph.h        |  4 ++++
 include/wx/osx/dcclient.h   |  3 +++
 src/common/dcgraph.cpp      |  6 +++++-
 src/osx/carbon/dcclient.cpp | 13 +++++++++----
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index e483d58e81..6732155b84 100644
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -227,6 +227,10 @@ protected:
     // wxGraphicsContext, in the expectation that the derived class will do it
     wxGCDCImpl(wxDC* owner, int);
 
+#ifdef __WXOSX__
+    virtual wxPoint OSXGetOrigin() const { return wxPoint(); }
+#endif
+
     // scaling variables
     bool m_logicalFunctionSupported;
     wxGraphicsMatrix m_matrixOriginal;
diff --git a/include/wx/osx/dcclient.h b/include/wx/osx/dcclient.h
index ae85550165..7f0ead5d6e 100644
--- a/include/wx/osx/dcclient.h
+++ b/include/wx/osx/dcclient.h
@@ -32,9 +32,12 @@ public:
     virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE;
 
 protected:
+    virtual wxPoint OSXGetOrigin() const wxOVERRIDE;
+
     bool m_release;
     int m_width;
     int m_height;
+    wxPoint m_origin;
 
     wxDECLARE_CLASS(wxWindowDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index f103a2a0ca..c98d8f7394 100644
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -397,7 +397,11 @@ void wxGCDCImpl::DestroyClippingRegion()
     // so we must explicitly make sure it only covers the area we want it to draw
     int width, height ;
     GetOwner()->GetSize( &width , &height ) ;
-    m_graphicContext->Clip( DeviceToLogicalX(0) , DeviceToLogicalY(0) , DeviceToLogicalXRel(width), DeviceToLogicalYRel(height) );
+    wxPoint origin;
+#ifdef __WXOSX__
+    origin = OSXGetOrigin();
+#endif
+    m_graphicContext->Clip( DeviceToLogicalX(origin.x) , DeviceToLogicalY(origin.y) , DeviceToLogicalXRel(width), DeviceToLogicalYRel(height) );
 
     m_graphicContext->SetPen( m_pen );
     m_graphicContext->SetBrush( m_brush );
diff --git a/src/osx/carbon/dcclient.cpp b/src/osx/carbon/dcclient.cpp
index c05a31f9d7..519289e3c6 100644
--- a/src/osx/carbon/dcclient.cpp
+++ b/src/osx/carbon/dcclient.cpp
@@ -105,6 +105,11 @@ void wxWindowDCImpl::DoGetSize( int* width, int* height ) const
         *height = m_height;
 }
 
+wxPoint wxWindowDCImpl::OSXGetOrigin() const
+{
+    return m_origin;
+}
+
 /*
  * wxClientDCImpl
  */
@@ -120,14 +125,14 @@ wxClientDCImpl::wxClientDCImpl( wxDC *owner, wxWindow *window ) :
     wxWindowDCImpl( owner, window )
 {
     wxCHECK_RET( window, wxT("invalid window in wxClientDCImpl") );
-    wxPoint origin = window->GetClientAreaOrigin() ;
+    m_origin = window->GetClientAreaOrigin() ;
     m_window->GetClientSize( &m_width , &m_height);
     if ( !m_window->IsShownOnScreen() )
         m_width = m_height = 0;
     
     int x0,y0;
     DoGetDeviceOrigin(&x0,&y0);
-    SetDeviceOrigin( origin.x + x0, origin.y + y0 );
+    SetDeviceOrigin( m_origin.x + x0, m_origin.y + y0 );
     
     DoSetClippingRegion( 0 , 0 , m_width , m_height ) ;
 }
@@ -152,9 +157,9 @@ wxPaintDCImpl::wxPaintDCImpl( wxDC *owner )
 wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *window ) :
     wxWindowDCImpl( owner, window )
 {
-    wxPoint origin = window->GetClientAreaOrigin() ;
+    m_origin = window->GetClientAreaOrigin() ;
     m_window->GetClientSize( &m_width , &m_height);
-    SetDeviceOrigin( origin.x, origin.y );
+    SetDeviceOrigin( m_origin.x, m_origin.y );
     DoSetClippingRegion( 0 , 0 , m_width , m_height ) ;
 }