From 635b2c5ef856c23a9c520f296b1e62fcbf07e1fc Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Mon, 13 Dec 2021 09:40:49 +0100
Subject: [PATCH] Sync with upstream

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 src/aui/dockart.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index fc78c77ec9..7dd21f87c0 100644
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -706,7 +706,7 @@ void
 wxAuiDefaultDockArt::DrawIcon(wxDC& dc, wxWindow *window, const wxRect& rect, wxAuiPaneInfo& pane)
 {
     // Draw the icon centered vertically
-    int xOffset = wxWindow::FromDIP(2, window);
+    int xOffset = window ? window->FromDIP(2) : 2;
     dc.DrawBitmap(pane.icon,
                   rect.x+xOffset, rect.y+(rect.height-pane.icon.GetScaledHeight())/2,
                   true);