From caf463bbd2be4c6db215027789c7b3c34b2b6cbf Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Sun, 21 Jan 2024 20:47:11 -0500 Subject: [PATCH] Pass KiBitmapBundle instead of KiBitmap to the pin property comboboxes Related https://gitlab.com/kicad/code/kicad/-/issues/16698 --- eeschema/dialogs/dialog_pin_properties.cpp | 3 ++- eeschema/widgets/pin_shape_combobox.cpp | 2 +- eeschema/widgets/pin_type_combobox.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eeschema/dialogs/dialog_pin_properties.cpp b/eeschema/dialogs/dialog_pin_properties.cpp index 0ede9c1db8..442cb6f392 100644 --- a/eeschema/dialogs/dialog_pin_properties.cpp +++ b/eeschema/dialogs/dialog_pin_properties.cpp @@ -150,7 +150,8 @@ DIALOG_PIN_PROPERTIES::DIALOG_PIN_PROPERTIES( SYMBOL_EDIT_FRAME* parent, LIB_PIN const std::vector& orientationIcons = PinOrientationIcons(); for ( unsigned ii = 0; ii < orientationNames.GetCount(); ii++ ) - m_choiceOrientation->Insert( orientationNames[ii], KiBitmap( orientationIcons[ii] ), ii ); + m_choiceOrientation->Insert( orientationNames[ii], KiBitmapBundle( orientationIcons[ii] ), + ii ); // We can't set the tab order through wxWidgets due to shortcomings in their mnemonics // implementation on MSW diff --git a/eeschema/widgets/pin_shape_combobox.cpp b/eeschema/widgets/pin_shape_combobox.cpp index 32c887ceba..74ae31b76f 100644 --- a/eeschema/widgets/pin_shape_combobox.cpp +++ b/eeschema/widgets/pin_shape_combobox.cpp @@ -53,7 +53,7 @@ PinShapeComboBox::PinShapeComboBox( wxWindow* parent, if( bitmap == BITMAPS::INVALID_BITMAP ) Append( text ); else - Insert( text, KiBitmap( bitmap ), ii ); + Insert( text, KiBitmapBundle( bitmap ), ii ); } } diff --git a/eeschema/widgets/pin_type_combobox.cpp b/eeschema/widgets/pin_type_combobox.cpp index 9b247febfc..686b9eac75 100644 --- a/eeschema/widgets/pin_type_combobox.cpp +++ b/eeschema/widgets/pin_type_combobox.cpp @@ -53,7 +53,7 @@ PinTypeComboBox::PinTypeComboBox( wxWindow* parent, if( bitmap == BITMAPS::INVALID_BITMAP ) Append( text ); else - Insert( text, KiBitmap( bitmap ), ii ); + Insert( text, KiBitmapBundle( bitmap ), ii ); } }