1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
--- src/slic3r/GUI/wxExtensions.cpp.orig 2025-04-10 11:26:51 UTC
+++ src/slic3r/GUI/wxExtensions.cpp
@@ -29,7 +29,7 @@
#include "libslic3r/Color.hpp"
-#ifndef __linux__
+#if !defined(__linux__) && !defined(__FreeBSD__)
// msw_menuitem_bitmaps is used for MSW and OSX
static std::map<int, std::string> msw_menuitem_bitmaps;
void sys_color_changed_menu(wxMenu* menu)
@@ -142,7 +142,7 @@ wxMenuItem* append_menu_item(wxMenu* menu, int id, con
wxBitmapBundle* bmp = icon.empty() ? nullptr : get_bmp_bundle(icon);
-#ifndef __linux__
+#if !defined(__linux__) && !defined(__FreeBSD__)
if (bmp && bmp->IsOk())
msw_menuitem_bitmaps[id] = icon;
#endif /* no __linux__ */
@@ -160,7 +160,7 @@ wxMenuItem* append_submenu(wxMenu* menu, wxMenu* sub_m
if (!icon.empty()) {
item->SetBitmap(*get_bmp_bundle(icon));
-#ifndef __linux__
+#if !defined(__linux__) && !defined(__FreeBSD__)
msw_menuitem_bitmaps[id] = icon;
#endif // no __linux__
}
@@ -223,7 +223,7 @@ void set_menu_item_bitmap(wxMenuItem* item, const std:
void set_menu_item_bitmap(wxMenuItem* item, const std::string& icon_name)
{
item->SetBitmap(*get_bmp_bundle(icon_name));
-#ifndef __linux__
+#if !defined(__linux__) && !defined(__FreeBSD__)
const auto it = msw_menuitem_bitmaps.find(item->GetId());
if (it != msw_menuitem_bitmaps.end() && it->second != icon_name)
it->second = icon_name;
|
