|
|
1501b8 |
From 7cff6237dacf97be00204de0455c15733948bba9 Mon Sep 17 00:00:00 2001
|
|
|
1501b8 |
From: dghart <dghart@users.sourceforge.net>
|
|
|
1501b8 |
Date: Tue, 29 Mar 2022 16:56:54 +0100
|
|
|
1501b8 |
Subject: [PATCH] Compilation fix for wxWidgets >3.1.5
|
|
|
1501b8 |
|
|
|
1501b8 |
---
|
|
|
1501b8 |
Configure.cpp | 7 ++++++-
|
|
|
1501b8 |
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
1501b8 |
|
|
|
1501b8 |
diff --git a/Configure.cpp b/Configure.cpp
|
|
|
1501b8 |
index b6af5dd..471414f 100644
|
|
|
1501b8 |
--- a/Configure.cpp
|
|
|
1501b8 |
+++ b/Configure.cpp
|
|
|
1501b8 |
@@ -141,7 +141,12 @@ Configure::DetectFixedDevices(); // Now there's an ini, add to it any detectabl
|
|
|
1501b8 |
wxDEFINE_EVENT(WizardCommandEvent, wxCommandEvent);
|
|
|
1501b8 |
#endif
|
|
|
1501b8 |
|
|
|
1501b8 |
-NoConfigWizard::NoConfigWizard(wxWindow* parent, int id, const wxString& title, const wxString& configFPath) : wxWizard(parent, id, title, wizardbitmap), m_configFPath(configFPath)
|
|
|
1501b8 |
+NoConfigWizard::NoConfigWizard(wxWindow* parent, int id, const wxString& title, const wxString& configFPath)
|
|
|
1501b8 |
+#if wxVERSION_NUMBER > 3105
|
|
|
1501b8 |
+ : wxWizard(parent, id, title, wxBitmapBundle::FromBitmap(wizardbitmap)), m_configFPath(configFPath)
|
|
|
1501b8 |
+#else
|
|
|
1501b8 |
+ : wxWizard(parent, id, title, wizardbitmap), m_configFPath(configFPath)
|
|
|
1501b8 |
+#endif
|
|
|
1501b8 |
{
|
|
|
1501b8 |
m_Next = m_btnNext;
|
|
|
1501b8 |
|
|
|
1501b8 |
--
|
|
|
1501b8 |
2.37.2
|
|
|
1501b8 |
|