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

Modify how we print the wx version compat macros

This commit is contained in:
Ian McInerney 2023-04-12 18:26:58 +01:00
parent 871f7e05a5
commit 73a1e63e8e
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/build_version.cpp
View File

@ -207,7 +207,14 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief )
} }
aMsg << indent4 << "wxWidgets: " << wxVERSION_NUM_DOT_STRING << " ("; aMsg << indent4 << "wxWidgets: " << wxVERSION_NUM_DOT_STRING << " (";
aMsg << __WX_BO_UNICODE __WX_BO_STL __WX_BO_WXWIN_COMPAT_2_8 ")"; aMsg << __WX_BO_UNICODE __WX_BO_STL;
// wx changed compatibility macros in 3.3, adding the 3.0 macro and removing the 2.8 macro
#if wxCHECK_VERSION( 3, 3, 0 )
aMsg << __WX_BO_WXWIN_COMPAT_3_0 ")";
#else
aMsg << __WX_BO_WXWIN_COMPAT_2_8 ")";
#endif
// Get the GTK+ version where possible. // Get the GTK+ version where possible.
#ifdef __WXGTK__ #ifdef __WXGTK__