From 048cf6df7ae95085750a8318d212e4c1169a7eb3 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 29 Jul 2022 10:26:45 +0200 Subject: [PATCH] Fix an issue when printing bitmaps when not on wxWidgets 3.1.6 Commit 6e35d5473 added a hack to fix an issue on wxWidgets 3.1.6. But this hack must by applied only to 3.1.6, not to other versions. Fixes #12108 https://gitlab.com/kicad/code/kicad/issues/12108 --- common/bitmap_base.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/bitmap_base.cpp b/common/bitmap_base.cpp index d3fbbd9a86..544220f42c 100644 --- a/common/bitmap_base.cpp +++ b/common/bitmap_base.cpp @@ -261,7 +261,10 @@ void BITMAP_BASE::DrawBitmap( wxDC* aDC, const VECTOR2I& aPos ) matrix.Translate( pos.x, pos.y ); matrix.Scale( GetScalingFactor(), GetScalingFactor() ); aDC->SetTransformMatrix( matrix ); - #if !wxCHECK_VERSION( 3, 1, 6 ) + + // Looks like wxWidgets 3.1.6 has a bug to fix the clipboard position + // So for 3.1.6 only, clipAreaPos.x = clipAreaPos.y = 0 + #if !wxCHECK_VERSION( 3, 1, 6 ) || wxCHECK_VERSION( 3, 1, 7 ) clipAreaPos.x = pos.x; clipAreaPos.y = pos.y; #else