Support ellipsizing of markup text in wxDVC

Fix wxDataViewTextRenderer to at least partially respect ellipsize mode
when using markup text. Generic implementation only supports
wxELLIPSIZE_END and wxELLIPSIZE_NONE at the moment, but the wxOSX and
wxGTK ones have full support.
This commit is contained in:
Václav Slavík
2016-10-19 16:52:23 +02:00
committed by Václav Slavík
parent 92a1f643ba
commit 58fc33d7c2
4 changed files with 31 additions and 9 deletions

View File

@@ -11,9 +11,9 @@
#define _WX_GENERIC_PRIVATE_MARKUPTEXT_H_
#include "wx/defs.h"
#include "wx/gdicmn.h"
class WXDLLIMPEXP_FWD_CORE wxDC;
class WXDLLIMPEXP_FWD_CORE wxRect;
class wxMarkupParserOutput;
@@ -84,10 +84,14 @@ public:
// The meaning of the flags here is different than in the overload above:
// they're passed to DrawItemText() and Render_ShowAccels is not supported
// here.
//
// Currently the only supported ellipsize modes are wxELLIPSIZE_NONE and
// wxELLIPSIZE_END, the others are treated as wxELLIPSIZE_END.
void RenderItemText(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int rendererFlags);
int rendererFlags,
wxEllipsizeMode ellipsizeMode);
private:
wxString m_markup;