forked from cheng/wallet
updated to 3.2.4
This commit is contained in:
parent
8bf4bc083d
commit
e14148d4f5
10
src/stdafx.h
10
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
|
// 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, "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.0");
|
static_assert(wxMINOR_VERSION == 2, "expecting wxWidgets wxWidgets 3.2.4");
|
||||||
static_assert(wxRELEASE_NUMBER == 2, "expecting wxWidgets wxWidgets 3.2.0");
|
static_assert(wxRELEASE_NUMBER == 4, "expecting wxWidgets wxWidgets 3.2.4");
|
||||||
static_assert(wxSUBRELEASE_NUMBER == 0, "expecting wxWidgets wxWidgets 3.2.0");
|
static_assert(wxSUBRELEASE_NUMBER == 0, "expecting wxWidgets wxWidgets 3.2.4");
|
||||||
static_assert(wxVERSION_STRING == L"wxWidgets 3.2.2", "expecting wxWidgets wxWidgets 3.2.0");
|
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");
|
// 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 "rotime.h"
|
||||||
#include "slash6.h"
|
#include "slash6.h"
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 73809b8550d3919a95c65f07f94ea91f339b5487
|
Subproject commit 5fd97439acaa39c443fe9a852d5806f5cb435a55
|
Loading…
Reference in New Issue
Block a user