From 48d226bb84efd8672de9ec8182a0dbc6b02bc90f Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <7330332+a-wi@users.noreply.github.com>
Date: Tue, 29 Nov 2022 18:41:08 +0200
Subject: [PATCH] Adjust scrolled contents only for wxPaintDC (drawing sample)

Adjust scrolled contents for screen drawing directly in EVT_PAINT
handler instead of doing so conditionally for generic wxDC.
This also helps demonstrating if wxPaintDC transformations
are transferred properly to wxGCDC.
---
 samples/drawing/drawing.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index 64df725202..df356c51b6 100644
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -1843,11 +1843,13 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
     if ( m_useBuffer )
     {
         wxBufferedPaintDC bpdc(this);
+        PrepareDC(bpdc); // Adjust scrolled contents.
         Draw(bpdc);
     }
     else
     {
         wxPaintDC pdc(this);
+        PrepareDC(pdc); // Adjust scrolled contents.
         Draw(pdc);
     }
 }
@@ -1891,13 +1893,6 @@ void MyCanvas::Draw(wxDC& pdc)
     wxDC &dc = pdc ;
 #endif
 
-    // Adjust scrolled contents for screen drawing operations only.
-    if ( wxDynamicCast(&pdc, wxBufferedPaintDC) ||
-         wxDynamicCast(&pdc, wxPaintDC) )
-    {
-        PrepareDC(dc);
-    }
-
     m_owner->PrepareDC(dc);
 
     dc.SetBackgroundMode( m_owner->m_backgroundMode );