From 9a1b3471fd21f8a8761df18ba6bf843f93247ecd Mon Sep 17 00:00:00 2001 From: dsa-t Date: Sat, 25 May 2024 20:32:48 +0000 Subject: [PATCH] Revert "Improve toolbar bitmap redraw performance on Windows." This reverts commit 6170151cbc4d68958ee028bf4b0de1cebb6e6125 --- common/widgets/wx_aui_art_providers.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/common/widgets/wx_aui_art_providers.cpp b/common/widgets/wx_aui_art_providers.cpp index c791674a0b..a88c1c49b6 100644 --- a/common/widgets/wx_aui_art_providers.cpp +++ b/common/widgets/wx_aui_art_providers.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2021-2024 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -167,13 +167,7 @@ void WX_AUI_TOOLBAR_ART::DrawButton( wxDC& aDc, wxWindow* aWindow, const wxAuiTo } if( bmp.IsOk() ) - { -#ifdef __WXMSW__ - // Optimization - see https://github.com/wxWidgets/wxWidgets/issues/23841 - aDc.GetAsBitmap().ConvertToDIB(); -#endif aDc.DrawBitmap( bmp, bmpX, bmpY, true ); - } // set the item's text color based on if it is disabled aDc.SetTextForeground( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNTEXT ) );