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 c019f0f43f7d9ca344baea52386b1032e8a83974..10f4cf11036db45dbc42481ebfb1a07577b1c50f 100644 (file)
--- 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
     }