Luigi Baldoni
81ab9b5187
- Added 0001-Compilation-fixes-for-wxWidgets-3.1.6.patch, 0001-Compilation-fix-for-wxWidgets-3.1.5.patch, 0001-Fix-a-wx-assert-complaining-that-a-panel-was-being-a.patch, 0001-Fix-a-wxAssert-when-showing-the-Command-line-termina.patch, and 0001-Prevent-a-wx-build-warning-about-wxPATH_NORM_ALL-bei.patch to fix build with wxWidgets 3.2 OBS-URL: https://build.opensuse.org/request/show/999180 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/4pane?expand=0&rev=20
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From 7cff6237dacf97be00204de0455c15733948bba9 Mon Sep 17 00:00:00 2001
|
|
From: dghart <dghart@users.sourceforge.net>
|
|
Date: Tue, 29 Mar 2022 16:56:54 +0100
|
|
Subject: [PATCH] Compilation fix for wxWidgets >3.1.5
|
|
|
|
---
|
|
Configure.cpp | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Configure.cpp b/Configure.cpp
|
|
index b6af5dd..471414f 100644
|
|
--- a/Configure.cpp
|
|
+++ b/Configure.cpp
|
|
@@ -141,7 +141,12 @@ Configure::DetectFixedDevices(); // Now there's an ini, add to it any detectabl
|
|
wxDEFINE_EVENT(WizardCommandEvent, wxCommandEvent);
|
|
#endif
|
|
|
|
-NoConfigWizard::NoConfigWizard(wxWindow* parent, int id, const wxString& title, const wxString& configFPath) : wxWizard(parent, id, title, wizardbitmap), m_configFPath(configFPath)
|
|
+NoConfigWizard::NoConfigWizard(wxWindow* parent, int id, const wxString& title, const wxString& configFPath)
|
|
+#if wxVERSION_NUMBER > 3105
|
|
+ : wxWizard(parent, id, title, wxBitmapBundle::FromBitmap(wizardbitmap)), m_configFPath(configFPath)
|
|
+#else
|
|
+ : wxWizard(parent, id, title, wizardbitmap), m_configFPath(configFPath)
|
|
+#endif
|
|
{
|
|
m_Next = m_btnNext;
|
|
|
|
--
|
|
2.37.2
|
|
|