From 0a3720beffcef68ae6037e124163865a5d2f1e06 Mon Sep 17 00:00:00 2001 From: tm Date: Sun, 28 May 2017 16:05:31 +0200 Subject: [PATCH] Handle wxST_ELLIPSIZE_XXX styles in wxStaticText XRC handler Add forgotten/missing styles. See #17850. --- docs/changes.txt | 1 + src/xrc/xh_sttxt.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/docs/changes.txt b/docs/changes.txt index fda8bba530..3518cfdb8b 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -135,6 +135,7 @@ All (GUI): - Extend wxStyledTextCtrl::FindText() to return end position of matched text (NewPagodi). - Fix adding/removing items to/from wxRearrangeList. +- Handle wxST_ELLIPSIZE_XXX styles in wxStaticText XRC handler (tm). wxGTK: diff --git a/src/xrc/xh_sttxt.cpp b/src/xrc/xh_sttxt.cpp index 7bd50c72a5..c03d67b936 100644 --- a/src/xrc/xh_sttxt.cpp +++ b/src/xrc/xh_sttxt.cpp @@ -34,6 +34,9 @@ wxStaticTextXmlHandler::wxStaticTextXmlHandler() XRC_ADD_STYLE(wxALIGN_CENTRE); XRC_ADD_STYLE(wxALIGN_CENTER_HORIZONTAL); XRC_ADD_STYLE(wxALIGN_CENTRE_HORIZONTAL); + XRC_ADD_STYLE(wxST_ELLIPSIZE_START); + XRC_ADD_STYLE(wxST_ELLIPSIZE_MIDDLE); + XRC_ADD_STYLE(wxST_ELLIPSIZE_END); AddWindowStyles(); }