From e14148d4f5feeb4d36f2b5daf9a3b830c6c6d2c8 Mon Sep 17 00:00:00 2001 From: Cheng Date: Mon, 19 Feb 2024 12:10:39 +0000 Subject: [PATCH] updated to 3.2.4 --- src/stdafx.h | 10 +++++----- wxWidgets | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/stdafx.h b/src/stdafx.h index 7540985..ee0964b 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -89,11 +89,11 @@ 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, "expecting wxWidgets wxWidgets 3.2.0"); -static_assert(wxMINOR_VERSION == 2, "expecting wxWidgets wxWidgets 3.2.0"); -static_assert(wxRELEASE_NUMBER == 2, "expecting wxWidgets wxWidgets 3.2.0"); -static_assert(wxSUBRELEASE_NUMBER == 0, "expecting wxWidgets wxWidgets 3.2.0"); -static_assert(wxVERSION_STRING == L"wxWidgets 3.2.2", "expecting wxWidgets wxWidgets 3.2.0"); +static_assert(wxMAJOR_VERSION == 3, "expecting wxWidgets wxWidgets 3.2.4"); +static_assert(wxMINOR_VERSION == 2, "expecting wxWidgets wxWidgets 3.2.4"); +static_assert(wxRELEASE_NUMBER == 4, "expecting wxWidgets wxWidgets 3.2.4"); +static_assert(wxSUBRELEASE_NUMBER == 0, "expecting wxWidgets wxWidgets 3.2.4"); +static_assert(wxVERSION_STRING == L"wxWidgets 3.2.4", "expecting wxWidgets wxWidgets 3.2.4"); // 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" diff --git a/wxWidgets b/wxWidgets index 73809b8..5fd9743 160000 --- a/wxWidgets +++ b/wxWidgets @@ -1 +1 @@ -Subproject commit 73809b8550d3919a95c65f07f94ea91f339b5487 +Subproject commit 5fd97439acaa39c443fe9a852d5806f5cb435a55