From 723bd22b96ac23b1af3ee1438cc41f0dd86a70f9 Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Wed, 11 Apr 2018 15:35:04 +0200
Subject: [PATCH] Changed icons for lock/unlock filament_presets on Plater tab

Experiment with filament_presets transparency on GTK
---
 xs/src/slic3r/GUI/BitmapCache.cpp  | 5 ++++-
 xs/src/slic3r/GUI/PresetBundle.cpp | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/xs/src/slic3r/GUI/BitmapCache.cpp b/xs/src/slic3r/GUI/BitmapCache.cpp
index f92369650c..e29687ce5b 100644
--- a/xs/src/slic3r/GUI/BitmapCache.cpp
+++ b/xs/src/slic3r/GUI/BitmapCache.cpp
@@ -88,7 +88,10 @@ wxBitmap* BitmapCache::insert(const std::string &bitmap_key, std::vector<wxBitma
 
     wxMemoryDC memDC;
     memDC.SelectObject(*bitmap);
-    memDC.SetBackground(*wxTRANSPARENT_BRUSH);
+#ifdef __WXGTK__
+#else
+	memDC.SetBackground(*wxTRANSPARENT_BRUSH);
+#endif
     memDC.Clear();
     size_t x = 0;
 	for (wxBitmap &bmp : bmps) {
diff --git a/xs/src/slic3r/GUI/PresetBundle.cpp b/xs/src/slic3r/GUI/PresetBundle.cpp
index dcf10198d9..74e1b60d34 100644
--- a/xs/src/slic3r/GUI/PresetBundle.cpp
+++ b/xs/src/slic3r/GUI/PresetBundle.cpp
@@ -254,8 +254,8 @@ bool PresetBundle::load_compatible_bitmaps()
 {
     const std::string path_bitmap_compatible   = "flag-green-icon.png";
     const std::string path_bitmap_incompatible = "flag-red-icon.png";
-    const std::string path_bitmap_lock         = "lock.png";
-    const std::string path_bitmap_lock_open    = "lock_open.png";
+    const std::string path_bitmap_lock         = "sys_lock.png";//"lock.png";
+	const std::string path_bitmap_lock_open    = "sys_unlock.png";//"lock_open.png";
     bool loaded_compatible   = m_bitmapCompatible  ->LoadFile(
         wxString::FromUTF8(Slic3r::var(path_bitmap_compatible).c_str()), wxBITMAP_TYPE_PNG);
     bool loaded_incompatible = m_bitmapIncompatible->LoadFile(