juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH:Protect the bitmap

Browse Source 
jira: STUDIO-13044
Change-Id: I12ae5c8508fadd76f2dd3efd8d95c1547133a634
(cherry picked from commit 3ab0610b90fe17580b09d1edf538afd6bcf14b6e)
This commit is contained in:
zhou.xu
2025-07-02 19:29:24 +08:00
committed by Noisyfox
parent b6a68ef312
commit b0656fefbe
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/Widgets/ComboBox.cpp
View File

@@ -192,7 +192,10 @@ bool ComboBox::SetFont(wxFont const& font)
int ComboBox::Append(const wxString &item, const wxBitmap &bitmap, int style) int ComboBox::Append(const wxString &item, const wxBitmap &bitmap, int style)
{ {
return Append(item, bitmap, nullptr, style); if (bitmap.IsOk()) {
return Append(item, bitmap, nullptr, style);
}
return Append(item, wxNullBitmap, nullptr, style);
} }
int ComboBox::Append(const wxString &text, int ComboBox::Append(const wxString &text,
@@ -200,7 +203,10 @@ int ComboBox::Append(const wxString &text,
void * clientData, void * clientData,
int style) int style)
{ {
return Append(text, bitmap, wxString{}, clientData, style); if (bitmap.IsOk()) {
return Append(text, bitmap, wxString{}, clientData, style);
}
return Append(text, wxNullBitmap, wxString{}, clientData, style);
} }
int ComboBox::Append(const wxString &text, const wxBitmap &bitmap, const wxString &group, void *clientData, int style) int ComboBox::Append(const wxString &text, const wxBitmap &bitmap, const wxString &group, void *clientData, int style)