Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge branch 'string-art-ids'"

Browse Source 
This reverts commit 8c9ba23eae, reversing
changes made to 5192feb38e.

Upcoming commits will try to work around the issues with art IDs related
to wxNO_IMPLICIT_WXSTRING_ENCODING in a different way.
This commit is contained in:
Vadim Zeitlin
2020-08-23 02:31:29 +02:00
parent 825fd01beb
commit 30b37b610d
14 changed files with 160 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/artprov.cpp
View File

@@ -21,12 +21,6 @@
#include "wx/artprov.h"
#define wxART_MAKE_CLIENT_ID(id) \
extern WXDLLIMPEXP_DATA_CORE(const wxArtClient) id = wxASCII_STR(#id "_C");
#define wxART_MAKE_ART_ID(id) \
extern WXDLLIMPEXP_DATA_CORE(const wxArtID) id = wxASCII_STR(#id);
#include "wx/artids.h"
#ifndef WX_PRECOMP
#include "wx/list.h"
#include "wx/log.h"