haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ian McInerney 2021-03-24 13:28:48 +00:00
parent e409b04538
commit 2da2b00560
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/build_version.cpp
View File

@ -108,8 +108,8 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief )
aMsg << eol; aMsg << eol;
aMsg << "Platform: " << wxGetOsDescription() << ", " aMsg << "Platform: " << wxGetOsDescription() << ", "
// TODO (ISM): Remove OSX conditional once our wx fork is running released 3.1.5 // TODO (ISM): Readd conditional once our wx fork and flatpaks are running released 3.1.5
#if wxCHECK_VERSION( 3, 1, 5 ) && !defined( __WXOSX__ ) #if 0 && wxCHECK_VERSION( 3, 1, 5 )
<< platform.GetBitnessName() << ", " << platform.GetBitnessName() << ", "
#else #else
<< platform.GetArchName() << ", " << platform.GetArchName() << ", "

4
common/dialog_about/AboutDialog_main.cpp
View File

@ -100,8 +100,8 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
wxPlatformInfo platformInfo; wxPlatformInfo platformInfo;
libVersion << "Platform: " << wxGetOsDescription() << ", " libVersion << "Platform: " << wxGetOsDescription() << ", "
// TODO (ISM): Remove OSX conditional once our wx fork is running released 3.1.5 // TODO (ISM): Readd conditional once our wx fork and flatpaks are running released 3.1.5
#if wxCHECK_VERSION( 3, 1, 5 ) && !defined( __WXOSX__ ) #if 0 && wxCHECK_VERSION( 3, 1, 5 )
<< platformInfo.GetBitnessName(); << platformInfo.GetBitnessName();
#else #else
<< platformInfo.GetArchName(); << platformInfo.GetArchName();