Blame wx316_bitmaps.patch
|
 |
4ec596d |
From 342c4b588f2f069a2df2157ac166237a54277b3a Mon Sep 17 00:00:00 2001
|
|
|
4ec596d |
From: Ian McInerney <ian.s.mcinerney@ieee.org>
|
|
|
4ec596d |
Date: Fri, 8 Apr 2022 01:27:52 +0100
|
|
|
4ec596d |
Subject: [PATCH 2/2] Call the proper wxBitmap constructor for XPM data
|
|
|
4ec596d |
|
|
|
4ec596d |
wxBitmap back to at least 3.0.0 did not have a constructor for an XPM
|
|
|
4ec596d |
image that took a size parameter, it would only take the XPM data
|
|
|
4ec596d |
itself.
|
|
|
4ec596d |
|
|
|
4ec596d |
I don't know how this compiled until now, but it doesn't anymore when
|
|
|
4ec596d |
the size is included and built against wx 3.1.6 in Fedora.
|
|
|
4ec596d |
---
|
|
|
4ec596d |
src/MixerBoard.cpp | 2 +-
|
|
|
4ec596d |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
4ec596d |
|
|
|
4ec596d |
diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp
|
|
|
4ec596d |
index 54b5f146c..7fe816154 100644
|
|
|
4ec596d |
--- a/src/MixerBoard.cpp
|
|
|
4ec596d |
+++ b/src/MixerBoard.cpp
|
|
|
4ec596d |
@@ -1307,7 +1307,7 @@ void MixerBoard::LoadMusicalInstruments()
|
|
|
4ec596d |
wxMemoryDC dc;
|
|
|
4ec596d |
|
|
|
4ec596d |
for (const auto &data : table) {
|
|
|
4ec596d |
- auto bmp = std::make_unique<wxBitmap>(data.bitmap,24);
|
|
|
4ec596d |
+ auto bmp = std::make_unique<wxBitmap>(data.bitmap);
|
|
|
4ec596d |
dc.SelectObject(*bmp);
|
|
|
4ec596d |
AColor::Bevel(dc, false, bev);
|
|
|
4ec596d |
mMusicalInstruments.push_back(std::make_unique<MusicalInstrument>(
|
|
|
4ec596d |
--
|
|
|
4ec596d |
2.35.1
|
|
|
4ec596d |
|