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

Fix persistent classes build without implicit wxString encoding

Browse Source 
Ensure that all headers in wx/persist can be compiled with
wxNO_IMPLICIT_WXSTRING_ENCODING defined.
This commit is contained in:
Vadim Zeitlin
2020-11-19 13:04:57 +01:00
parent d67c7c485a
commit b63cf77dd3
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/persist/bookctrl.h
View File

@@ -18,9 +18,9 @@
// string constants used by wxPersistentBookCtrl // string constants used by wxPersistentBookCtrl
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define wxPERSIST_BOOK_KIND "Book" #define wxPERSIST_BOOK_KIND wxASCII_STR("Book")
#define wxPERSIST_BOOK_SELECTION "Selection" #define wxPERSIST_BOOK_SELECTION wxASCII_STR("Selection")
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxPersistentBookCtrl: supports saving/restoring book control selection // wxPersistentBookCtrl: supports saving/restoring book control selection

4
include/wx/persist/splitter.h
View File

@@ -18,10 +18,10 @@
// string constants used by wxPersistentSplitter // string constants used by wxPersistentSplitter
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define wxPERSIST_SPLITTER_KIND "Splitter" #define wxPERSIST_SPLITTER_KIND wxASCII_STR("Splitter")
// Special position value of -1 means the splitter is not split at all. // Special position value of -1 means the splitter is not split at all.
#define wxPERSIST_SPLITTER_POSITION "Position" #define wxPERSIST_SPLITTER_POSITION wxASCII_STR("Position")
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxPersistentSplitter: supports saving/restoring splitter position // wxPersistentSplitter: supports saving/restoring splitter position

4
include/wx/persist/treebook.h
View File

@@ -19,11 +19,11 @@
// string constants used by wxPersistentTreeBookCtrl // string constants used by wxPersistentTreeBookCtrl
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define wxPERSIST_TREEBOOK_KIND "TreeBook" #define wxPERSIST_TREEBOOK_KIND wxASCII_STR("TreeBook")
// this key contains the indices of all expanded nodes in the tree book // this key contains the indices of all expanded nodes in the tree book
// separated by wxPERSIST_TREEBOOK_EXPANDED_SEP // separated by wxPERSIST_TREEBOOK_EXPANDED_SEP
#define wxPERSIST_TREEBOOK_EXPANDED_BRANCHES "Expanded" #define wxPERSIST_TREEBOOK_EXPANDED_BRANCHES wxASCII_STR("Expanded")
#define wxPERSIST_TREEBOOK_EXPANDED_SEP ',' #define wxPERSIST_TREEBOOK_EXPANDED_SEP ','
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------