3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compilation on Linux / GTK

Browse Source
This commit is contained in:
bubnikv 2017-11-10 18:50:14 +01:00
parent 4628308415
commit 200f176951
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xs/src/slic3r/GUI/PresetBundle.cpp
View File

@ -570,14 +570,16 @@ void PresetBundle::update_platter_filament_ui(unsigned int idx_extruder, wxBitma
if (bitmap == nullptr) { if (bitmap == nullptr) {
// Create the bitmap with color bars. // Create the bitmap with color bars.
bitmap = new wxBitmap((wide_icons ? 16 : 0) + 24, 16); bitmap = new wxBitmap((wide_icons ? 16 : 0) + 24, 16);
#if defined(__APPLE__) || defined(_MSC_VER)
bitmap->UseAlpha(); bitmap->UseAlpha();
#endif
wxMemoryDC memDC; wxMemoryDC memDC;
memDC.SelectObject(*bitmap); memDC.SelectObject(*bitmap);
memDC.SetBackground(*wxTRANSPARENT_BRUSH); memDC.SetBackground(*wxTRANSPARENT_BRUSH);
memDC.Clear(); memDC.Clear();
if (wide_icons && ! preset.is_compatible) if (wide_icons && ! preset.is_compatible)
// Paint the red flag. // Paint the red flag.
memDC.DrawBitmap(*m_bitmapIncompatible, 0, 0, false); memDC.DrawBitmap(*m_bitmapIncompatible, 0, 0, true);
// Paint the color bars. // Paint the color bars.
parse_color(filament_rgb, rgb); parse_color(filament_rgb, rgb);
wxImage image(24, 16); wxImage image(24, 16);
@ -602,7 +604,7 @@ void PresetBundle::update_platter_filament_ui(unsigned int idx_extruder, wxBitma
} }
} }
} }
memDC.DrawBitmap(wxBitmap(image), wide_icons ? 16 : 0, 0, false); memDC.DrawBitmap(wxBitmap(image), wide_icons ? 16 : 0, 0, true);
memDC.SelectObject(wxNullBitmap); memDC.SelectObject(wxNullBitmap);
m_mapColorToBitmap[bitmap_key] = bitmap; m_mapColorToBitmap[bitmap_key] = bitmap;
} }