From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 24 Nov 2001 23:59:08 +0000 (+0000)
Subject: fix for palette restoration in wxToolBarSimple
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a6b27b78d3bde840b1ad0e7037f04117bc51a31c

fix for palette restoration in wxToolBarSimple


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp
index c019f0f43f..10f4cf1103 100644
--- a/src/generic/tbarsmpl.cpp
+++ b/src/generic/tbarsmpl.cpp
@@ -557,7 +557,8 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxToolBarToolBase *toolBase)
 
 #if wxUSE_PALETTE
 #ifndef __WXGTK__
-        memDC.SetPalette(wxNullPalette);
+        if (bitmap.GetPalette())
+            memDC.SetPalette(wxNullPalette);
 #endif
 #endif // wxUSE_PALETTE
     }