PRUSA 2.7.0

This commit is contained in:
sunsets
2023-12-27 18:02:35 +08:00
parent b33112327f
commit 0a3c63dcb1
488 changed files with 92371 additions and 29443 deletions

View File

@@ -62,10 +62,11 @@ BitmapComboBox::BitmapComboBox(wxWindow* parent,
int n/* = 0*/,
const wxString choices[]/* = NULL*/,
long style/* = 0*/) :
wxBitmapComboBox(parent, id, value, pos, size, n, choices, style)
// wxBitmapComboBox(parent, id, value, pos, size, n, choices, style)
::ComboBox(parent, id, value, pos, size, n, choices, style | DD_NO_CHECK_ICON)
{
SetFont(Slic3r::GUI::wxGetApp().normal_font());
#ifdef _WIN32
#if 0 //#ifdef _WIN32
// Workaround for ignoring CBN_EDITCHANGE events, which are processed after the content of the combo box changes, so that
// the index of the item inside CBN_EDITCHANGE may no more be valid.
EnableTextChangedEvents(false);
@@ -75,11 +76,12 @@ BitmapComboBox::BitmapComboBox(wxWindow* parent,
#endif /* _WIN32 */
}
#if 0
BitmapComboBox::~BitmapComboBox()
{
}
#ifdef _WIN32
//#ifdef _WIN32
int BitmapComboBox::Append(const wxString& item)
{