Sync with upstream

Signed-off-by: Simon Rozman <simon@rozman.si>

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);