cheng/wallet
0
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updating wxWidgets - more carefully this time

Browse Source
This commit is contained in:
Cheng 2023-09-17 14:34:29 +10:00
parent 4f77dc9951
commit 70100fbc61
No known key found for this signature in database
GPG Key ID: 571C3A9C3B9E6FCA
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/stdafx.h
View File

@ -71,6 +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_STD_STRING_CONV_IN_WXSTRING == 1, "want wxString to conform to std::string");
static_assert(wxUSE_SECRETSTORE >0, "need wxSecretStore to actually work"); 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 // The api may be there, but will always return false if wxUSE_SECRETSTORE is zero
static_assert(wxUSE_STD_DEFAULT == 1 && wxUSE_STL==1);
std::span<uint8_t>& operator^=(std::span<byte>&, byte *); std::span<uint8_t>& operator^=(std::span<byte>&, byte *);
#ifndef wxHAS_IMAGES_IN_RESOURCES #ifndef wxHAS_IMAGES_IN_RESOURCES
#include "rho.xpm" //Defines the icon AAArho on linux #include "rho.xpm" //Defines the icon AAArho on linux
@ -88,7 +89,7 @@ inline wxString _wx(const char* sz) { return wxString::FromUTF8Unchecked(sz); }
// it provides an array spaceship operator that solves the inconsistency // it provides an array spaceship operator that solves the inconsistency
// problem in a better way. Spaceship compares of arrays in my code are // problem in a better way. Spaceship compares of arrays in my code are
// no longer ill formed. // no longer ill formed.
static_assert(wxMAJOR_VERSION == 3 && wxMINOR_VERSION == 2 && wxRELEASE_NUMBER == 0 && wxSUBRELEASE_NUMBER == 1 && wxVERSION_STRING == wxT("wxWidgets 3.2.0"), "expecting wxWidgets 3.2.0"); 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");
#include "rotime.h" #include "rotime.h"
#include "slash6.h" #include "slash6.h"
#include "ISqlite3.h" #include "ISqlite3.h"

2
wxWidgets

@ -1 +1 @@
Subproject commit 2648eb4da156a751a377cfe96b91faa03e535c10 Subproject commit 24f3e551d4cf583573eeb838d04a3c7c3b3a6121