From b63cf77dd30150c34e6bbb59e305a0199dfd5667 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 19 Nov 2020 13:04:57 +0100 Subject: [PATCH] Fix persistent classes build without implicit wxString encoding Ensure that all headers in wx/persist can be compiled with wxNO_IMPLICIT_WXSTRING_ENCODING defined. --- include/wx/persist/bookctrl.h | 4 ++-- include/wx/persist/splitter.h | 4 ++-- include/wx/persist/treebook.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wx/persist/bookctrl.h b/include/wx/persist/bookctrl.h index 6b48ebe0b4..cf3397e3ed 100644 --- a/include/wx/persist/bookctrl.h +++ b/include/wx/persist/bookctrl.h @@ -18,9 +18,9 @@ // 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 diff --git a/include/wx/persist/splitter.h b/include/wx/persist/splitter.h index 46979d673f..7c9e6584f4 100644 --- a/include/wx/persist/splitter.h +++ b/include/wx/persist/splitter.h @@ -18,10 +18,10 @@ // 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. -#define wxPERSIST_SPLITTER_POSITION "Position" +#define wxPERSIST_SPLITTER_POSITION wxASCII_STR("Position") // ---------------------------------------------------------------------------- // wxPersistentSplitter: supports saving/restoring splitter position diff --git a/include/wx/persist/treebook.h b/include/wx/persist/treebook.h index f3026642f4..379447fdab 100644 --- a/include/wx/persist/treebook.h +++ b/include/wx/persist/treebook.h @@ -19,11 +19,11 @@ // 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 // 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 ',' // ----------------------------------------------------------------------------