diff --git a/src/stdafx.h b/src/stdafx.h index 82ed699..c8feed3 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -71,7 +71,7 @@ static_assert(wxUSE_STD_CONTAINERS == 1, "wxWidgets api out of date"); static_assert(wxUSE_STD_STRING_CONV_IN_WXSTRING == 1, "want wxString to conform to std::string"); static_assert(wxUSE_SECRETSTORE >0, "need wxSecretStore to actually work"); // The api may be there, but will always return false if wxUSE_SECRETSTORE is zero -static_assert(wxUSE_STD_DEFAULT == 1 && wxUSE_STL==1); +//static_assert(wxUSE_STD_DEFAULT == 1 && wxUSE_STL==1); std::span& operator^=(std::span&, byte *); #ifndef wxHAS_IMAGES_IN_RESOURCES #include "rho.xpm" //Defines the icon AAArho on linux @@ -88,7 +88,12 @@ inline wxString _wx(const char* sz) { return wxString::FromUTF8Unchecked(sz); } // it provides an array spaceship operator that solves the inconsistency // problem in a better way. Spaceship compares of arrays in my code are // no longer ill formed. -static_assert(wxMAJOR_VERSION == 3 && wxMINOR_VERSION == 2 && wxRELEASE_NUMBER == 2 && wxSUBRELEASE_NUMBER == 1 && wxVERSION_STRING == wxT("wxWidgets 3.2.2.1"), "expecting wxWidgets 3.2.2.1"); +static_assert(wxMAJOR_VERSION == 3, "expecting wxWidgets wxWidgets 3.2.0"); +static_assert(wxMINOR_VERSION == 2, "expecting wxWidgets wxWidgets 3.2.0"); +static_assert(wxRELEASE_NUMBER == 0, "expecting wxWidgets wxWidgets 3.2.0"); +static_assert(wxSUBRELEASE_NUMBER == 1, "expecting wxWidgets wxWidgets 3.2.0"); +static_assert(wxVERSION_STRING == wxT("wxWidgets 3.2.0"), "expecting wxWidgets wxWidgets 3.2.0"); +// static_assert(wxMAJOR_VERSION == 3 && wxMINOR_VERSION == 2 && wxRELEASE_NUMBER == 0 && wxSUBRELEASE_NUMBER == 1 && wxVERSION_STRING == wxT("wxWidgets 3.2.0"), "expecting wxWidgets wxWidgets 3.2.0"); #include "rotime.h" #include "slash6.h" #include "ISqlite3.h" diff --git a/wxWidgets b/wxWidgets index 8ef067c..78cd5a0 160000 --- a/wxWidgets +++ b/wxWidgets @@ -1 +1 @@ -Subproject commit 8ef067c7317b302068f1b774c92c5250052c2a53 +Subproject commit 78cd5a04e6b87a0d3643ba03c8f28ccc1ce2f051