From 2da2b00560e989af0eaf054f78ee7e7eec664b68 Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Wed, 24 Mar 2021 13:28:48 +0000 Subject: [PATCH] wxPython ruins everything... They really should just use a released version of wxWidgets in their released versions and not some random commit from the development tree. --- common/build_version.cpp | 4 ++-- common/dialog_about/AboutDialog_main.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/build_version.cpp b/common/build_version.cpp index 1b2b8401ca..2bf477fd81 100644 --- a/common/build_version.cpp +++ b/common/build_version.cpp @@ -108,8 +108,8 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief ) aMsg << eol; aMsg << "Platform: " << wxGetOsDescription() << ", " -// TODO (ISM): Remove OSX conditional once our wx fork is running released 3.1.5 -#if wxCHECK_VERSION( 3, 1, 5 ) && !defined( __WXOSX__ ) +// TODO (ISM): Readd conditional once our wx fork and flatpaks are running released 3.1.5 +#if 0 && wxCHECK_VERSION( 3, 1, 5 ) << platform.GetBitnessName() << ", " #else << platform.GetArchName() << ", " diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp index d15440da0f..2f2eec6d44 100644 --- a/common/dialog_about/AboutDialog_main.cpp +++ b/common/dialog_about/AboutDialog_main.cpp @@ -100,8 +100,8 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf wxPlatformInfo platformInfo; libVersion << "Platform: " << wxGetOsDescription() << ", " -// TODO (ISM): Remove OSX conditional once our wx fork is running released 3.1.5 -#if wxCHECK_VERSION( 3, 1, 5 ) && !defined( __WXOSX__ ) +// TODO (ISM): Readd conditional once our wx fork and flatpaks are running released 3.1.5 +#if 0 && wxCHECK_VERSION( 3, 1, 5 ) << platformInfo.GetBitnessName(); #else << platformInfo.GetArchName();